Display connect error messages, add noscript message

pietroglyph · Apr 7, 2019 · 2af9da0 · 2af9da0
1 parent 71a6fa9
commit 2af9da0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/fow-mini/data/index.html b/fow-mini/data/index.html
@@ -89,7 +89,15 @@ <h1 class="kernIn">FerryClock Guided Set Up</h1>
   <div id="stepsArea">
     <div class="step" id="welcomeStep">
       <h1>Welcome</h1>
-      <h3>We need some help connecting FerryClock so that we can get <i>sailing</i> in your local wireless network.</h3>
+      <h3 id="firstHeading">We need some help connecting FerryClock so that we can get <i>sailing</i> in your local wireless network.</h3>
+      <noscript>
+        <h3 id="noscriptWarning">This page won't work with JavaScript disabled.</h3>
+        <style>
+          #next,#firstHeading {
+            display: none;
+          }
+        </style>
+      </noscript>
       <button id="next" tabindex="1">Next&nbsp;&raquo;</button>
     </div>
     <div class="step hidden">
@@ -129,6 +137,7 @@ <h1>Connecting...</h1>
     </div>
     <div class="step hidden" id="failedStep">
       <h1>Whoah there! Connection failed!</h1>
+      <p>Error message was: <code id="errorMessage"></code></p>
       <p>You can review your connection information and try again.</p>
       <button class="split" id="redo" tabindex="9">Review info and retry</button>
     </div>

diff --git a/fow-mini/data/script.js b/fow-mini/data/script.js
@@ -197,6 +197,7 @@ window.onload = () => {
                         unhideAndFocus(successStep);
                     },
                         (failReason) => {
+                            document.querySelector("#errorMessage").textContent = failReason;
                             steps[nextIdx].classList.add("hidden");
                             unhideAndFocus(failedStep);
                         })

diff --git a/fow-mini/data/style.css b/fow-mini/data/style.css
@@ -173,7 +173,7 @@ html {
   button.danger:active {
     background-color: rgb(211, 0, 0);
   }
-  
+
   #back {
     width: 10%;
     padding-left: 10px;
@@ -276,6 +276,10 @@ html {
     width: 100%;
   }
 
+  #noscriptWarning {
+    animation: OpacityFadeIn 1s 4s both;
+  }
+
   .step>input {
     width: calc(100% - 24px);
     text-align: center;

diff --git a/fow-mini/lib/fow/ConnectionManager.cpp b/fow-mini/lib/fow/ConnectionManager.cpp
@@ -103,7 +103,7 @@ ConnectionManager::ConnectionManager(const String programName) : name(programNam
           connStatus = "Connection lost";
           break;
         case WL_DISCONNECTED :
-          connStatus = "No connection has been made";
+          connStatus = "Currently disconnected (check that SSID and password are correct)";
           break;
         default :
           connStatus = String("Other (") + WiFi.status() + ")";