Skip to content

Commit

Permalink
Merge pull request #8 from iKAN2025/main
Browse files Browse the repository at this point in the history
Make Frontend Cleaner & Basis for API Layer For Profile Setup
  • Loading branch information
jm1021 authored Jul 4, 2024
2 parents 2b616aa + 01c03d1 commit 10a3e42
Show file tree
Hide file tree
Showing 5 changed files with 578 additions and 315 deletions.
1 change: 0 additions & 1 deletion _includes/nav/flask.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
<td><a href="{{site.baseurl}}/profile">Profile</a></td>
<td><a href="{{site.baseurl}}/scrum">Scrum</a></td>
<td><a href="{{site.baseurl}}/admin">Admin</a></td>
<td><a href="{{site.baseurl}}/logout">Logout</a></td>
</tr>
</table>
9 changes: 5 additions & 4 deletions _includes/nav/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<td><a href="{{site.baseurl}}/navigation/csp">CSP</a></td>
<td><a href="{{site.baseurl}}/navigation/csa">CSA</a></td>
<td><a href="{{site.baseurl}}/README-4-GHPages">README</a></td>
<td id="loginArea"><a href="{{site.baseurl}}/navigation/backend">Login</a></td>
<td id="loginArea"><a href="{{site.baseurl}}/login>Login</a></td>
</tr>
</table>
Expand All @@ -72,14 +72,15 @@
<button class="dropbtn">${data.name}</button>
<div class="dropdown-content">
<a href="#" onclick="logout()">Logout</a>
<a href="{{site.baseurl}}/navigation/profile">Profile</a>
<a href="{{site.baseurl}}/navigation/friends">Friends</a>
<a href="{{site.baseurl}}/create">Create User</a>
<a href="{{site.baseurl}}/profile">Profile</a>
<a href="{{site.baseurl}}/flaskhome">Flask Information</a>
</div>
</div>
`;
} else {
// User is not authenticated, then "Login" link is shown
loginArea.innerHTML = '<a href="{{site.baseurl}}/navigation/backend">Login</a>';
loginArea.innerHTML = '<a href="{{site.baseurl}}/login">Login</a>';
}
})
.catch(err => { // General error handler
Expand Down
4 changes: 3 additions & 1 deletion navigation/admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ layout: base
title: Admin
permalink: /admin
search_exclude: true
---
---
{% include nav/flask.html %}

Loading

0 comments on commit 10a3e42

Please sign in to comment.