oly
/
weecfg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up drone build file.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Oliver Marks 2019-09-24 20:58:35 +01:00
parent 62bb39d493
commit 2d781a7f52
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -12,11 +12,11 @@ steps:
- name: compress - name: compress
image: alpine image: alpine
commands: commands:
- ls -la
- apk add gzip - apk add gzip
- cd /drone/src/resources/public/ - cd /drone/src/resources/public/
- rm /drone/src/resources/public/*.gz - rm -f /drone/src/resources/public/*.js
- rm /drone/src/resources/public/webfonts/*.gz - rm -f /drone/src/resources/public/*.gz
- rm -f /drone/src/resources/public/webfonts/*.gz
- gzip *.css *.js *.html *.png -k - gzip *.css *.js *.html *.png -k
- gzip ./webfonts/*.woff2 -k - gzip ./webfonts/*.woff2 -k
- tar -czvf release.tar.gz *.gz ./webfonts/*.gz - tar -czvf release.tar.gz *.gz ./webfonts/*.gz

2
prod.cljs.edn
View File

@ -1,3 +1,3 @@
{:output-to "resources/public/main.js" {:output-to "resources/public/main.js"
:optimizations :advanced :optimizations :advanced
:main weecfg.core} :main weecfg.core}

12
resources/public/dev-main.js
View File

@ -1,12 +0,0 @@
var CLOSURE_UNCOMPILED_DEFINES = {"figwheel.repl.connect_url":"ws:\/\/localhost:9500\/figwheel-connect?fwprocess=839c36&fwbuild=dev"};
var CLOSURE_NO_DEPS = true;
if(typeof goog == "undefined") document.write('<script src="/cljs-out/dev/goog/base.js"></script>');
document.write('<script src="/cljs-out/dev/goog/deps.js"></script>');
document.write('<script src="/cljs-out/dev/cljs_deps.js"></script>');
document.write('<script>if (typeof goog == "undefined") console.warn("ClojureScript could not load :main, did you forget to specify :asset-path?");</script>');
document.write('<script>goog.require("figwheel.core");</script>');
document.write('<script>goog.require("figwheel.main");</script>');
document.write('<script>goog.require("figwheel.repl.preload");</script>');
document.write('<script>goog.require("devtools.preload");</script>');
document.write('<script>goog.require("process.env");</script>');
document.write('<script>goog.require("weecfg.core");</script>');

3
src/weecfg/core.cljs
View File

@ -12,12 +12,13 @@
(defonce form-title (atom "GASP Sensor setup")) (defonce form-title (atom "GASP Sensor setup"))
(defonce form-data (atom {:server "" :device-id "" :wifi-ssid "" :wifi-key ""})) (defonce form-data (atom {:server "" :device-id "" :wifi-ssid "" :wifi-key ""}))
(defonce device-id-regex #"[A-Za-z0-9]{4}") (defonce device-id-regex #"[A-Za-z0-9]{4}")
(defonce alpha-numeric-regex #"[A-Za-z0-9]")
(defonce ssid-regex #"^[!#;].|[+\[\]\"\t\s].*$") (defonce ssid-regex #"^[!#;].|[+\[\]\"\t\s].*$")
; spec validation definitions ; spec validation definitions
(s/def ::boolean-type boolean?) (s/def ::boolean-type boolean?)
(s/def ::integer-type int?) (s/def ::integer-type int?)
(s/def ::size-test #(<= (count %) 2)) (s/def ::alpha-numeric-type (s/and string? #(re-matches alpha-numeric-regex %)))
(s/def ::ssid-size-limit #(<= (count %) 32)) (s/def ::ssid-size-limit #(<= (count %) 32))
(s/def ::default-size-limit #(<= (count %) 50)) (s/def ::default-size-limit #(<= (count %) 50))
(s/def ::wifi-ssid-type (s/and string? #(re-matches ssid-regex %) ::ssid-size-limit)) (s/def ::wifi-ssid-type (s/and string? #(re-matches ssid-regex %) ::ssid-size-limit))