Home Explore Help
Register Sign In
dasimmet
/
bootstrap_captive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

better result display

Tobias Simetsreiter 4 years ago
parent
01fda845fd
commit
92a54f14a9
6 changed files with 28 additions and 13 deletions
Unified View Show Diff Stats
  1. 6 0
      src/bootstrap_captive/form/23-wifi.py
  2. 7 3
      src/bootstrap_captive/form/42-systemd.json
  3. 1 1
      src/bootstrap_captive_server.service
  4. 10 5
      src/http/index.html
  5. 1 1
      src/http/portal.js
  6. 3 3
      src/main.py

+ 6 - 0
src/bootstrap_captive/form/23-wifi.py
View File 

@@ -33,6 +33,12 @@ def submit_form(inp, form):
 
     inp_conf = inp["wifi_config"]
 
     inp_conf = inp["wifi_config"]
 
     ssid = inp_conf["ssid"].replace('"','\"')
 
     ssid = inp_conf["ssid"].replace('"','\"')
 
     pw = inp_conf["password"].replace('"','\"')
 
     pw = inp_conf["password"].replace('"','\"')
 
+
 
+    if pw == "":
 
+        resp["ok"] = False,
 
+        resp["err"] = "Password cannot be empty!"
 
+        return resp
 
+
 
     with open(wifi_file) as fd:
 
     with open(wifi_file) as fd:
 
         wifi_conf = fd.read()
 
         wifi_conf = fd.read()

+ 7 - 3
src/bootstrap_captive/form/42-systemd.json
View File 

@@ -31,7 +31,8 @@
 
                 "restart",
 
                 "restart",
 
                 "start",
 
                 "start",
 
                 "stop"
 
                 "stop"
 
-            ]
 
+            ],
 
+            "default": "status"
 
         }
 
         }
 
     },
 
     },
 
     "form": [
 
     "form": [
 
@@ -47,7 +48,10 @@
 
         {
 
         {
 
             "key": "action",
 
             "key": "action",
 
             "type": "radiobuttons",
 
             "type": "radiobuttons",
 
-            "activeClass": "btn-success"
 
+            "activeClass": "btn-success active"
 
         }
 
         }
 
-    ]
 
+    ],
 
+    "value": {
 
+        "action": "status"
 
+    }
 
 }
 
 }

+ 1 - 1
src/bootstrap_captive_server.service
View File 

@@ -8,7 +8,7 @@ Type=simple
 
 Restart=always
 
 Restart=always
 
 RestartSec=1
 
 RestartSec=1
 
 User=root
 
 User=root
 
-ExecStart=/usr/local/bin/bootstrap_captive server
 
+ExecStart=/usr/local/bin/bootstrap_captive server -p 80 -s 443
 
 
 
 [Install]
 
 [Install]
 
 WantedBy=multi-user.target
 
 WantedBy=multi-user.target

+ 10 - 5
src/http/index.html
View File 

@@ -9,17 +9,22 @@
 
    <title>Raspi Bootstrap Captive</title>
 
    <title>Raspi Bootstrap Captive</title>
 
  </head>
 
  </head>
 
  <body>
 
  <body>
 
-   <div class="container-fluid">
 
-     <h1>Welcome to Raspi Bootstrap Captive<h1>
 
+   <div class="container">
 
+     <h1>Welcome to Raspi Bootstrap Captive</h1>
 
      <div class="progress" style="height: 30px;">
 
      <div class="progress" style="height: 30px;">
 
        <div id="progress_bar" class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
 
        <div id="progress_bar" class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
 
      </div>
 
      </div>
 
-     <pre id="error_box"></pre>
 
-     <div class="form-group">
 
+     <div class="row">
 
+       <pre id="error_box"></pre>
 
+     </div>
 
+     <div class="row">
 
+       <button onclick="window.location.reload(true)" class="btn btn-info btn-lg form-control">Reload</button>
 
+     </div>
 
+     <div class="row">
 
        <div id="form_div">
 
        <div id="form_div">
 
        </div>
 
        </div>
 
      </div>
 
      </div>
 
-     <div class="form-group">
 
+     <div class="row">
 
        <button onclick="portal.disablePortal()" class="btn btn-warning btn-lg form-control">Disable Portal</button>
 
        <button onclick="portal.disablePortal()" class="btn btn-warning btn-lg form-control">Disable Portal</button>
 
      </div>
 
      </div>
 
    </div>
 
    </div>

+ 1 - 1
src/http/portal.js
View File 

@@ -108,7 +108,7 @@ portal = new function(){
 
                         if (resp.ok){
 
                         if (resp.ok){
 
                             getId("error_box").innerText = resp.out;
 
                             getId("error_box").innerText = resp.out;
 
                         } else {
 
                         } else {
 
-                            getId("error_box").innerText = resp.err;
 
+                            getId("error_box").innerText = "Out:\n" + resp.out + "\nErr:\n" + resp.err;
 
                         }
 
                         }
 
                     }
 
                     }
 
                 }
 
                 }

+ 3 - 3
src/main.py
View File 

@@ -21,8 +21,8 @@ def parser():
 
     p_server.set_defaults(func=com_server)
 
     p_server.set_defaults(func=com_server)
 
     p_server.add_argument("-b", "--bind", default="")
 
     p_server.add_argument("-b", "--bind", default="")
 
     p_server.add_argument("-c", "--certfile", default="./server.pem")
 
     p_server.add_argument("-c", "--certfile", default="./server.pem")
 
-    p_server.add_argument("-p", "--port", type=int, default=80)
 
-    p_server.add_argument("-s", "--ssl_port", type=int, default=443)
 
+    p_server.add_argument("-p", "--port", type=int, default=4583)
 
+    p_server.add_argument("-s", "--ssl_port", type=int, default=0)
 
     p_server.add_argument("-n", "--portal_name", default="portal.raspi.tsimnet.eu")
 
     p_server.add_argument("-n", "--portal_name", default="portal.raspi.tsimnet.eu")
 
 
 
     p_unpack = sub.add_parser("unpack")
 
     p_unpack = sub.add_parser("unpack")
 
@@ -37,7 +37,7 @@ def parser():
 
     p_install.set_defaults(func=com_install)
 
     p_install.set_defaults(func=com_install)
 
     p_install.add_argument("-i", "--install_dir", default="/opt/eu.tsimnet.git/dasimmet/bootstrap_captive")
 
     p_install.add_argument("-i", "--install_dir", default="/opt/eu.tsimnet.git/dasimmet/bootstrap_captive")
 
 
 
-    p_update = sub.add_parser("install")
 
+    p_update = sub.add_parser("update")
 
     p_update.set_defaults(func=com_update)
 
     p_update.set_defaults(func=com_update)
 
     p_update.add_argument("-i", "--install_dir", default="/opt/eu.tsimnet.git/dasimmet/bootstrap_captive")
 
     p_update.add_argument("-i", "--install_dir", default="/opt/eu.tsimnet.git/dasimmet/bootstrap_captive")