restructured bunch of files to use currentUser from res.locals.curren…

…tUser
nickangtc · Sep 20, 2016 · b769418 · b769418
1 parent e45e0d8
commit b769418
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/controllers/auth.js b/controllers/auth.js
@@ -31,13 +31,13 @@ router.post('/signup', function (req, res) {
       password: req.body.password
     }
   }).spread(function (user, created) {
-    if (created) {
+    if (created) { // new user created
       console.log('created new account');
       passport.authenticate('local', {
         successRedirect: '/',
         successFlash: 'Account created. You\'re now logged in. Welcome :)'
       })(req, res);
-    } else {
+    } else { // not created
       req.flash('error', 'Email already exists');
       res.redirect('/signup');
     }

diff --git a/index.js b/index.js
@@ -54,12 +54,12 @@ app.use('/', require('./controllers/auth'));
 // READ: get homepage
 app.get('/', function (req, res) {
   console.log('GET / request received');
-  if (req.user) {
-    res.render('index', { user: req.user });
-  } else if (req.user === undefined) {
-    res.render('index', {user: ''});
-  }
-  // res.render('index', { user: req.user });
+  res.render('index');
+  // if (req.user) {
+  //   res.render('index', { user: req.user });
+  // } else if (req.user === undefined) {
+  //   res.render('index', {user: ''});
+  // }
 });
 
 // READ: get user's starred urls (user must be logged in)
@@ -81,7 +81,7 @@ app.get('/users/:id/stars', isLoggedIn, function (req, res) {
 // READ: get user profile (user must be logged in)
 app.get('/users/:id', isLoggedIn, function (req, res) {
   console.log('GET /users/id request received');
-  res.render('user_profile', { user: req.user });
+  res.render('user_profile');
 });
 
 // UPDATE: update user profile (user must be logged in)
@@ -107,7 +107,7 @@ app.get('/users/:id/edit', isLoggedIn, function (req, res) {
   console.log('GET /users/id/edit request received');
   console.log('id:', req.params.id);
   // render user_profile_edit
-  res.render('user_profile_edit', { user: req.user });
+  res.render('user_profile_edit');
 });
 
 // DESTROY: delete user account
@@ -118,7 +118,7 @@ app.delete('/users/:id', function (req, res) {
 // ============ ROUTES for Saving/deleting urls =============
 
 // GET: used for checking if user is logged in
-app.get('/stars/update', function (req, res) {
+app.get('/stars/update', isLoggedIn, function (req, res) {
   if (req.user === undefined) {
     res.json({
       status: false
@@ -131,13 +131,14 @@ app.get('/stars/update', function (req, res) {
 });
 
 // CREATE/DESTROY: savedUrls
-app.post('/stars/update', function (req, res) {
+app.post('/stars/update', isLoggedIn, function (req, res) {
   console.log('STAR REQ.BODY', req.body);
   console.log('REQ.USER:', req.user);
 
   if (req.user === undefined) {
     res.json({
       status: 'error'
+      // ^ don't change this value - frontend dependence
     });
   } else {
     // update star table with data and userid

diff --git a/static/js/main.js b/static/js/main.js
@@ -173,7 +173,7 @@ $(document).ready(function () {
           $(thatStarBtn).removeClass('starred');
           console.log('thatStarBtn after:', $(thatStarBtn));
           // change star glyphicon to star-empty
-          starGlyph = $(thatStarBtn).children()[0];
+          starGlyph = $(thatStarBtn).vchildren()[0];
           $(starGlyph).addClass('glyphicon-star-empty').removeClass('glyphicon-star');
         }
       }

diff --git a/views/layout.ejs b/views/layout.ejs
@@ -49,20 +49,20 @@
           <ul class="nav navbar-nav navbar-right">
             <!-- Saved urls button -->
             <li>
-              <% var user = user || 'register' %>
-              <% if (typeof user === 'object') { %>
-              <a href="/users/<%= user.id %>/stars">Saved
-                  <% } else if (user === 'register') { %>
+
+              <% if (currentUser) { %>
+              <a href="/users/<%= currentUser.id %>/stars">Saved
+                  <% } else if (!currentUser) { %>
                     <a href="/signup">Saved
                   <% } %>
                 <span class="glyphicon glyphicon-star"></span>
               </a>
             </li>
             <!-- New / Login button -->
             <li>
-              <% if (typeof user === 'object') { %>
-                <a href="/users/<%= user.id %>"> <%= user.firstName %>
-              <% } else if (user === 'register') { %>
+              <% if (currentUser) { %>
+                <a href="/users/<%= currentUser.id %>"> <%= currentUser.firstName %>
+              <% } else if (!currentUser) { %>
                 <a href="/signup"> New/Login
               <% } %>
                 <span class="glyphicon glyphicon-user"></span>

diff --git a/views/user_profile.ejs b/views/user_profile.ejs
@@ -3,7 +3,7 @@
     <div class="col-sm-12">
       <h2>Your account</h2>
 
-      <a href="/users/<%= user.id %>/edit">
+      <a href="/users/<%= currentUser.id %>/edit">
         <p>edit account info</p>
       </a>
 

diff --git a/views/user_profile_edit.ejs b/views/user_profile_edit.ejs
@@ -2,15 +2,15 @@
   <div class="row">
     <div class="col-sm-12">
       <h2>Edit profile</h2>
-      <form action="/users/<%= user.id %>?_method=PUT" method="POST">
+      <form action="/users/<%= currentUser.id %>?_method=PUT" method="POST">
         <div>
-          First name: <input type="text" name="firstName" value="<%= user.firstName %>" required>
+          First name: <input type="text" name="firstName" value="<%= currentUser.firstName %>" required>
         </div>
         <div>
-          Last name: <input type="text" name="lastName" value="<%= user.lastName %>" required>
+          Last name: <input type="text" name="lastName" value="<%= currentUser.lastName %>" required>
         </div>
         <div>
-          Email: <input type="email" name="email" value="<%= user.email %>" required>
+          Email: <input type="email" name="email" value="<%= currentUser.email %>" required>
         </div>
 
         <button type="submit">Save changes</button>