closer to logging out

Author: ernest-phillips

app/auth/auth.router.js

@@ -26,10 +26,8 @@ function createJwtToken(user) {
     });
 }
 //Login endpoint
-authRouter.get('/login.html', (req, res) => {
+authRouter.get('/login.html', (req, res) => {});
 
-
-});
 authRouter.post('/login', localPassportMiddleware, (request, response) => {
     const user = request.user.serialize();
     const jwtToken = createJwtToken(user);
@@ -51,7 +49,14 @@ authRouter.post('/refresh', jwtPassportMiddleware, (request, response) => {
     });
 });
 
-authRouter.post('/logout', localPassportMiddleware, (req, res) => {
-            res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
-        });
-module.exports = {authRouter};
+authRouter.get('/logout', localPassportMiddleware, (req, res) => {
+    console.log("logging out")
+    res.header('Cache-Control', 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0');
+    res.json({
+        jwtToken,
+        user
+    })
+});
+module.exports = {
+    authRouter
+};

public/auth.page.js

@@ -1,13 +1,15 @@
 // All these modules are are defined in /public/utilities
 const RENDER = window.RENDER_MODULE;
-const HTTP = window.HTTP_MODULE;
-const CACHE = window.CACHE_MODULE;
+// const HTTP = window.HTTP_MODULE;
+// const CACHE = window.CACHE_MODULE;
 
 $(document).ready(onPageLoad);
 
 function onPageLoad() {
     $('#sign-up-form').submit(onSignUpSubmit);
     $('#login-form').submit(onLoginSubmit);
+    $('#logout-btn').on('click', onLogoutSubmit);
+
 }
 
 function onSignUpSubmit(event) {
@@ -55,4 +57,20 @@ function onLoginSubmit(event) {
             alert('Incorrect username or password. Please try again.');
         }
     });
+}
+
+function onLogoutSubmit(event) {
+    console.log("Logging out")
+    event.preventDefault();
+    HTTP.logoutUser({
+
+        onSuccess: response => {
+            const authenticatedUser = response.user;
+            console.log(authenticatedUser);
+            authenticatedUser.jwtToken = response.jwtToken;
+            CACHE.deleteAuthenticatedUserFromCache(authenticatedUser);
+            alert('Please come again');
+            window.open('/', '_self');
+        }
+    })
 }

public/css/main.css

@@ -364,7 +364,7 @@ max-width:370px;
 }
 
 .tt-dropdown-menu {
-    width: 422px;
+    width: 100%;
     margin-top: 3px;
     padding: 8px 0;
     background-color: #fff;
@@ -396,10 +396,9 @@ max-width:370px;
     text-align: left;
 }
 
-
-/* .twitter-typeahead {
-    width: 100%;
-} */
+.twitter-typeahead {
+    width: 75%;
+}
 
 
 /* Date Navigation */

public/home.html

@@ -17,7 +17,8 @@
     <header class="header">
         <div class="logo">Fit-Journal</div>
         <nav class="nav-login">
-            <a id="logout-btn" href="">Log Out</a>
+            <a href="" id="logout-btn" type="submit">Log Out</a>
+
         </nav>
     </header>
 
@@ -91,9 +92,11 @@ <h4 class="add-ex js-addEx"><a href="#">Add Exercise</a></h4>
     <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
     <script src="/moment.js"></script>
     <script src="/utilities/cache.module.js"></script>
+    <script src="/auth.page.js"></script>
     <!-- <script src="../utilities/render.module.js"></script> -->
     <script src="/utilities/http.module.js"></script>
     <script src="/index.page.js"></script>
+
     <script src="/utilities/index.js"></script>
     <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     <script src="https://twitter.github.io/typeahead.js/releases/latest/typeahead.bundle.js"></script>

public/home.js

@@ -16,7 +16,7 @@ function onPageLoad() {
     //     });
     // }
     { /* <nav class="nav-login"><a id="logout-btn" href="">Log Out</a> </nav> */ }
-    $('body').on('click', '#logout-btn', onLogoutBtnClick());
+
     // $('#workout-list').on('click', '#delete-workout-btn', onDeleteWorkoutBtnClick);
     // $('#workout-list').on('click', '#workout-card', onWorkoutCardClick);
 }

public/search.html

@@ -30,7 +30,7 @@
             </div>
             <div class="set-wkout">
                 <form action="/api/workout" class="js-setworkOut" method="POST">
-                    <h3 class="exerciseName "></h3>
+                    <h3 class="exerciseName"></h3>
                     <div class="set-input">
                         <label id="reps-lbl" for="POST-reps">Number of reps:</label>
                         <input id="POST-reps" type="text" name="reps">

public/search.js

@@ -58,7 +58,8 @@ function clearInput() {
 function selectExercise() {
     $('.search-btn').on('click', function() {
         let searchVal = $('.search-ex').val();
-        $('.exerciseName').html(`${searchVal}`);
+        console.log(searchVal)
+            // $('.exerciseName').append(`${searchVal}`);
     });
 
 }
@@ -67,8 +68,7 @@ function showSetAdd() {
 
 }
 
-function
-// save to workout
+
 
 
 function onPageLoad() {

public/utilities/http.module.js

@@ -7,6 +7,7 @@ window.HTTP_MODULE = {
     createWorkout,
     updateWorkout,
     deleteWorkout,
+    logoutUser
 
 };
 
@@ -61,14 +62,12 @@ function loginUser(options) {
 
 function logoutUser(options) {
     console.log("logout user called")
-    axios.post('')
-        .then()
-        .catch()
     const {
         userData,
         onSuccess,
         onError
     } = options;
+
     $.ajax({
         type: 'POST',
         url: '/api/auth/logout',