Merge pull request #89 from software-students-spring2024/logout

Logout UI change
software-students-spring2024 · Mar 4, 2024 · 4300845 · 4300845
2 parents 6696b17 + 7a73209
commit 4300845
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/static/css/style.css b/static/css/style.css
@@ -264,3 +264,13 @@ p a{
 #card-form textarea:focus {
   outline: none; 
 }
+
+.logout {
+  float: right;
+  background-color: #7d6f6b;
+  color: #FAFAFA;
+  font-size: 30px;
+  border-radius: 4px;
+  font-weight: bold;
+  padding: 20px;
+}
diff --git a/templates/base.html b/templates/base.html
@@ -8,8 +8,15 @@
     />
   </head>
   <body>
+
+    {% if isAuth %}
+        <a class="logout" href="{{ url_for('logout') }} " style="text-decoration:none">Logout</a>
+    {% endif %}
+
+
     <div class="container">
       <header>
+
         <a href="{{ url_for('home')}}" style="text-decoration:none">
           <h1>DIVE DEEPER</h1>
         </a>

diff --git a/templates/card.html b/templates/card.html
@@ -44,9 +44,6 @@ <h3 id="next-question"> START </h3>
             <button id="delete-card-button" class="button2" style="display: none">Delete Card</button>
         </form>
 
-        {% from 'macros.html' import logout %}
-        {{ logout() }}
-
     {% endif %}
 
 

diff --git a/templates/decks.html b/templates/decks.html
@@ -69,8 +69,6 @@ <h3> + </h3>
             })
         </script>
 
-        {% from 'macros.html' import logout %}
-        {{ logout() }}
     {% endif %}
 
 

diff --git a/templates/macros.html b/templates/macros.html