Remove sleeps, remove todo files, fix mobile menu

josephspurrier · Mar 29, 2020 · a41a3e6 · a41a3e6
1 parent 13f2a59
commit a41a3e6
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 208 deletions.
diff --git a/src/app/api/static/app/src/component/Menu.js b/src/app/api/static/app/src/component/Menu.js
@@ -19,34 +19,49 @@ var View = {
             <strong>govueapp</strong>
           </m.route.Link>
 
-          <button class="button navbar-burger">
-            <span />
-            <span />
-            <span />
-          </button>
+          <a
+            id="mobile-navbar-top"
+            role="button"
+            class="navbar-burger burger"
+            aria-label="menu"
+            aria-expanded="false"
+            data-target="navbar-top"
+            onclick={() => {
+              const mob = document.getElementById("mobile-navbar-top");
+              const nav = document.getElementById("navbar-top");
+              mob.classList.toggle("is-active");
+              nav.classList.toggle("is-active");
+            }}
+          >
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+          </a>
         </div>
 
-        <div class="navbar-end">
-          <div class="navbar-item has-dropdown is-hoverable">
-            <a class="navbar-link">Menu</a>
+        <div id="navbar-top" class="navbar-menu">
+          <div class="navbar-end">
+            <div class="navbar-item has-dropdown is-hoverable">
+              <a class="navbar-link">Menu</a>
 
-            <div class="navbar-dropdown is-right">
-              <m.route.Link class="navbar-item" href="/login">
-                Login
-              </m.route.Link>
-              <m.route.Link class="navbar-item" href="/about">
-                About
-              </m.route.Link>
-              <hr class="navbar-divider" />
-              <a
-                class="dropdown-item"
-                onclick={() => {
-                  logout();
-                }}
-              >
-                Logout
-              </a>
-              <div class="navbar-item">v1.0.0</div>
+              <div class="navbar-dropdown is-right">
+                <m.route.Link class="navbar-item" href="/login">
+                  Login
+                </m.route.Link>
+                <m.route.Link class="navbar-item" href="/about">
+                  About
+                </m.route.Link>
+                <hr class="navbar-divider" />
+                <a
+                  class="dropdown-item"
+                  onclick={() => {
+                    logout();
+                  }}
+                >
+                  Logout
+                </a>
+                <div class="navbar-item">v1.0.0</div>
+              </div>
             </div>
           </div>
         </div>

diff --git a/src/app/api/static/app/src/index.js b/src/app/api/static/app/src/index.js
@@ -1,6 +1,4 @@
 import m, { route } from "mithril";
-import UserList from "./page/UserList";
-import UserForm from "./page/UserForm";
 import AboutPage from "./page/About";
 import LoginPage from "./page/Login";
 import RegisterPage from "./page/Register";
@@ -15,11 +13,6 @@ function isLoggedIn() {
     if (auth === undefined) {
       return false;
     }
-
-    //console.log("Cookie:", auth);
-    //let v = JSON.parse(auth);
-
-    //console.log("Auth:", v);
     return true;
   } catch (err) {
     console.log(err);
@@ -35,24 +28,12 @@ route(document.body, "/", {
       else m.route.set("/login");
     },
   },
-  "/list": {
-    onmatch: function () {
-      if (isLoggedIn()) return List;
-      else m.route.set("/login");
-    },
-  },
   "/notepad": {
     onmatch: function () {
       if (isLoggedIn()) return Notepad;
       else m.route.set("/login");
     },
   },
-  "/edit/:id": {
-    onmatch: function () {
-      if (isLoggedIn()) return Edit;
-      else m.route.set("/login");
-    },
-  },
   "/login": {
     onmatch: function () {
       if (isLoggedIn()) m.route.set("/");
@@ -84,12 +65,6 @@ var Notepad = {
   },
 };
 
-var List = {
-  view: function () {
-    return m(LayoutMain, m(UserList));
-  },
-};
-
 var Login = {
   view: function () {
     return m(LayoutMain, m(LoginPage));
@@ -101,9 +76,3 @@ var Register = {
     return m(LayoutMain, m(RegisterPage));
   },
 };
-
-var Edit = {
-  view: function (vnode) {
-    return m(LayoutMain, m(UserForm, vnode.attrs));
-  },
-};
diff --git a/src/app/api/static/app/src/page/Login.js b/src/app/api/static/app/src/page/Login.js
@@ -1,6 +1,5 @@
 import m from "mithril";
 import Submit from "../module/Submit";
-import Sleep from "../module/Sleep";
 import User from "../store/User";
 import Cookie from "js-cookie";
 import Flash from "../module/Flash";
@@ -13,27 +12,25 @@ var data = {
 function onsubmit(e) {
   Submit.start(e);
 
-  Sleep(500).then(() => {
-    User.login()
-      .then((data) => {
-        User.clear();
-        Submit.finish();
+  User.login()
+    .then((data) => {
+      User.clear();
+      Submit.finish();
 
-        const auth = {
-          accessToken: data.token,
-          loggedIn: true,
-        };
+      const auth = {
+        accessToken: data.token,
+        loggedIn: true,
+      };
 
-        Cookie.set("auth", auth);
+      Cookie.set("auth", auth);
 
-        Flash.success("Login successful.");
-        m.route.set("/");
-      })
-      .catch((err) => {
-        Submit.finish();
-        Flash.warning(err.response.message);
-      });
-  });
+      Flash.success("Login successful.");
+      m.route.set("/");
+    })
+    .catch((err) => {
+      Submit.finish();
+      Flash.warning(err.response.message);
+    });
 }
 
 var Page = {

diff --git a/src/app/api/static/app/src/page/Register.js b/src/app/api/static/app/src/page/Register.js
@@ -1,6 +1,5 @@
 import m from "mithril";
 import Submit from "../module/Submit";
-import Sleep from "../module/Sleep";
 import User from "../store/User";
 import Flash from "../module/Flash";
 
@@ -12,20 +11,18 @@ var data = {
 function onsubmit(e) {
   Submit.start(e);
 
-  Sleep(500).then(() => {
-    User.register()
-      .then(() => {
-        User.clear();
-        Submit.finish();
+  User.register()
+    .then(() => {
+      User.clear();
+      Submit.finish();
 
-        Flash.success("User registered.");
-        m.route.set("/login");
-      })
-      .catch((err) => {
-        Submit.finish();
-        Flash.warning(err.response.message);
-      });
-  });
+      Flash.success("User registered.");
+      m.route.set("/login");
+    })
+    .catch((err) => {
+      Submit.finish();
+      Flash.warning(err.response.message);
+    });
 }
 
 var Page = {

diff --git a/src/app/api/static/app/src/page/UserForm.js b/src/app/api/static/app/src/page/UserForm.js
diff --git a/src/app/api/static/app/src/page/UserList.js b/src/app/api/static/app/src/page/UserList.js
diff --git a/src/app/api/static/app/src/store/SampleUser.js b/src/app/api/static/app/src/store/SampleUser.js