done with shit

jackbader · Oct 11, 2017 · 100b830 · 100b830
1 parent 0b0a192
commit 100b830
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 20 deletions.
diff --git a/public/createItem.html b/public/createItem.html
@@ -48,7 +48,7 @@
           <ul id="nav-mobile" class="right hide-on-med-and-down">
             <li class="firstNavItem"></li>
             <li class="secondNavItem"></li>
-            <li><a href="userProfile.html"><i class="material-icons prefix">account_circle</i></a></li>
+            <li><a id='profileButton'><i class="material-icons prefix">account_circle</i></a></li>
           </ul>
         </div>
       </nav>

diff --git a/public/item.html b/public/item.html
@@ -42,7 +42,7 @@
             <li class = "firstNavItem"></li>
             <li class = "secondNavItem"></li>
             <li class = "editNavItem"></li>
-            <li><a href="userProfile.html"><i class="material-icons prefix">account_circle</i></a></li>
+            <li><a id='profileButton'><i class="material-icons prefix">account_circle</i></a></li>
           </ul>
         </div>
       </nav>

diff --git a/public/itemEdit.html b/public/itemEdit.html
@@ -43,7 +43,7 @@
       <ul id="nav-mobile" class="right hide-on-med-and-down">
         <li class="firstNavItem"></li>
         <li class="secondNavItem"></li>
-        <li><a href="userProfile.html"><i class="material-icons prefix">account_circle</i></a></li>
+        <li><a id='profileButton'><i class="material-icons prefix">account_circle</i></a></li>
       </ul>
     </div>
   </nav>

diff --git a/public/js/main.js b/public/js/main.js
@@ -4,22 +4,6 @@ $(document).ready(() => {
 
   $('#myInput').val('')
 
-  $('#profileButton').click(function() {
-
-
-    $.getJSON('/token')
-      .done((data) => {
-        if (data.hasToken === false) {
-          Materialize.toast('You must be logged in to view that!', 3000);
-        } else {
-          window.location.href = `/userProfile.html?id=${data.cookies.userId}`;
-        }
-        console.log(data.hasToken)
-      })
-
-    console.log('test')
-  })
-
 
   const slick = function () {
     $.getJSON('/items')

diff --git a/public/js/nav.js b/public/js/nav.js
@@ -4,6 +4,22 @@ $(document).ready(() => {
 
   console.log('ready test')
 
+  $('#profileButton').click(function() {
+
+
+    $.getJSON('/token')
+      .done((data) => {
+        if (data.hasToken === false) {
+          Materialize.toast('You must be logged in to view that!', 3000);
+        } else {
+          window.location.href = `/userProfile.html?id=${data.cookies.userId}`;
+        }
+        console.log(data.hasToken)
+      })
+
+    console.log('test')
+  })
+
   $.getJSON('/token')
     .done((data) => {
       const $firstNavItems = $('.firstNavItem');

diff --git a/public/stylesheets/userSignIn.css b/public/stylesheets/userSignIn.css
@@ -3,3 +3,7 @@ body {
   width: 100%;
   /*background-color: red;*/
 }
+
+nav {
+  background-color: #6BBA54 !important;
+}
diff --git a/public/stylesheets/userSignup.css b/public/stylesheets/userSignup.css
@@ -3,3 +3,7 @@ body {
   width: 100%;
   /*background-color: red;*/
 }
+
+nav {
+  background-color: #6BBA54 !important;
+}
diff --git a/public/userProfile.html b/public/userProfile.html
@@ -47,6 +47,7 @@
         <ul id="nav-mobile" class="right hide-on-med-and-down">
           <li class="firstNavItem"></li>
           <li class="secondNavItem"></li>
+          <li><a id='profileButton'><i class="material-icons prefix">account_circle</i></a></li>
         </ul>
       </div>
     </nav>

diff --git a/public/userSignUp.html b/public/userSignUp.html
@@ -22,6 +22,7 @@
 
     <!-- my js -->
   <script src = "js/signup.js"></script>
+  <script src = "js/nav.js"></script>
 
           <!--Import Google Icon Font-->
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -40,6 +41,9 @@
       <div class="nav-wrapper">
         <a href="index.html" class="brand-logo">Logo</a>
         <ul id="nav-mobile" class="right hide-on-med-and-down">
+          <li class="firstNavItem"></li>
+          <li class="secondNavItem"></li>
+          <li><a id='profileButton'><i class="material-icons prefix">account_circle</i></a></li>
         </ul>
       </div>
     </nav>

diff --git a/routes/token.js b/routes/token.js
@@ -41,10 +41,11 @@ router.post('/token', (req, res, next) => {
 
   knex('users')
     .where('email', email)
+    .orWhere('username', email)
     .first()
     .then((row) => {
       if (!row) {
-        throw boom.create(400, 'Bad email or password');
+        throw Materialize.toast('Bad email or password', 3000);
       }
 
       user = camelizeKeys(row);