.drone.yml

@@ -17,7 +17,6 @@ steps:
     - cd /drone/src/resources/public/
     - rm -f /drone/src/resources/public/*.gz
     - rm -f /drone/src/resources/public/webfonts/*.gz
-    - ls -la 
     - gzip *.css *.js *.html *.png -k
     - gzip ./webfonts/*.woff2 -k
     - tar -czvf release.tar.gz *.gz ./webfonts/*.gz 

src/weecfg/core.cljs

@@ -13,6 +13,7 @@
 (defonce form-data (atom {:server "" :device-id "" :wifi-ssid "" :wifi-key ""}))
 (defonce device-id-regex #"[A-Za-z0-9]{4}")
 (defonce alpha-numeric-regex #"[A-Za-z0-9]")
+(defonce ssid-regex #"^[!#;].|[+\[\]\"\t\s].*$")
 
 ; spec validation definitions
 (s/def ::boolean-type boolean?)
@@ -20,7 +21,7 @@
 (s/def ::alpha-numeric-type (s/and string? #(re-matches alpha-numeric-regex %)))
 (s/def ::ssid-size-limit #(<= (count %) 32))
 (s/def ::default-size-limit #(<= (count %) 50))
-(s/def ::wifi-ssid-type (s/and string?  ::ssid-size-limit))
+(s/def ::wifi-ssid-type (s/and string? #(re-matches ssid-regex %) ::ssid-size-limit))
 (s/def ::device-id-type (s/and string? #(re-matches device-id-regex %)))
 (s/def ::wifi-key-type (s/and string? ::default-size-limit))
 (s/def ::server-type (s/and string? ::default-size-limit))
@@ -40,13 +41,12 @@
     (:path (reitit/match-by-name router route params))
     (:path (reitit/match-by-name router route))))
 
-; Custom validation error messages, instead of standard cryptic spec formats.
 (defn validation-message [errors default]
   (let [pred  (:cljs.spec.alpha/spec errors)]
     (case pred
       :cljs.core/string? "Sorry value must be a string!"
       :weecfg.core/size-test "Sorry value to long!"
-      :weecfg.core/wifi-ssid-type "Sorry ssid invalid to long!"
+      :weecfg.core/wifi-ssid-type "Sorry ssid invalid!"
       :weecfg.core/wifi-key-type "Invalid wifi key"
       :weecfg.core/device-id-type "Device is to short or invalid format."
       (or (str default pred) (str "Error not handled " (str pred))))))
@@ -103,7 +103,9 @@
                 (swap! form-errors "success"))}))
 
 
-;simple input form, dynamically generated from edn file
+;simple input form
+
+
 (defn config-form []
   (let [form-fields (atom [])]
     (load-form form-fields)
@@ -133,30 +135,28 @@
     [:p "Device will reboot in a few seconds and connect to your wifi."]]])
 
 (defn about-page []
-  [:div.items-center.jutify-center
+  [:div.w-50
    [:div [:h1.m-4 "About Page"]
-    [:p "Device configuration page built using "
-     [:a {:href "https://gitlab.com/olymk2/weecfg" :title "weecfg"} "weecfg"]
-     " set up your device wifi connection and other device specific settings."]
+    [:p "Sample app, demoing using ajax calls and reagent to render the page with some simple route from reitit, basically enought to get you started on your clojurescript journey."]
     [:a.link {:href (path-for :index)} "Back"]]])
 
-; given a browser route load the relevant defn handler
+; give a browser route load the relevant defn handler
 (defn page-for [route]
   "Map your route keys to pages here"
   (print route)
   (case route
     :index (var home-page)
-    ;:error #'404-page
+    ;:error #'home-page
     :success (success-page)
     :about (var about-page)
     (var home-page)))
 
-; default page html wraps the current page elements
+; default page wrapper html
 (defn current-page []
   (fn []
     (let [page (:current-page (session/get :route))]
-      [:div.bg-green.flex.justify-center.items-center.h-100.w-100
-       [:div..w-75.w-50-m
+      [:div.bg-green.flex.justify-center.items-center.h-100
+       [:div.w-35
         [:h2.w-100
          [:a.link.fr.black.pt3.pb3 {:href (path-for :about)} [:i.fas.fa-question-circle]]
          [:a.athelas.f3.link.white-70.hover-white.no-underline.flex.items-center.pa3