Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

124 make top navbar #139

Merged
merged 16 commits into from
Sep 25, 2024
Merged

124 make top navbar #139

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5bd7ff3
adding support for glyphicons in index.html
croueAlec Sep 23, 2024
229d42b
adding navbar css file
croueAlec Sep 23, 2024
0a278a7
adding prototype navbar
croueAlec Sep 23, 2024
ade7abb
changed login and register buttons
croueAlec Sep 24, 2024
3cb7a4f
changed navbar color
croueAlec Sep 24, 2024
4111687
merge
croueAlec Sep 24, 2024
03a9714
merge 2
croueAlec Sep 24, 2024
3f47af9
clean navbar
Sep 25, 2024
3284df3
navbar mostly done, still needs settings and profile redirection. Pro…
croueAlec Sep 25, 2024
ae30780
added logic for log out button
croueAlec Sep 25, 2024
cdc6db0
removing empty css empty block
croueAlec Sep 25, 2024
b645419
changed wrapper ids and navbar indentation
croueAlec Sep 25, 2024
d5bc82c
changed naming norm for logout button id
croueAlec Sep 25, 2024
dbf72dc
changed px to rem in css
croueAlec Sep 25, 2024
a004935
removed #fecaca color :(
croueAlec Sep 25, 2024
726a44c
added rem
croueAlec Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion django/src/pages/templates/extends/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
<div id="wrapper">
<div id="bars-wrapper">
<div id="navbar-wrapper">
<nav class="navbar">
<b class="navbar-brand nav navbar-nav navbar-left">Johnny Depp</b>
{% if user.is_authenticated %}
<div class="container-dropdown">
<div class="dropdown">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
{{ user.username }} <span class="glyphicon glyphicon-picture"></span>
</button>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuButton">
<li><a class="dropdown-item" data-route href="#">Profile</a></li>
<li><a class="dropdown-item" data-route href="#">Settings</a></li>
<li><hr class="dropdown-divider"></li>
<li><button id="logout-button-navbar" class="dropdown-item fw-bold">Log out <span class="glyphicon glyphicon-log-out"></span></button></li>
</ul>
</div>
</div>
{% else %}
<ul id="navbar-list" class="list-group list-group-flush list-group-horizontal-sm list-unstyled nav navbar-nav navbar-right">
<li class="m-2"><a class="btn btn-sm btn-success rounded-pill rounded-5" data-route href="/login"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
<li class="m-2"><a class="btn btn-sm btn-outline-success rounded-pill rounded-5" data-route href="/register"><span class="glyphicon glyphicon-user"></span> Register</a></li>
</ul>
{% endif %}
</nav>
</div>

<div id="sidebar-wrapper" class="bg-light border toggled">
<div class="sidebar-heading">ft_transcendence</div>
<ul id="sidebar-list" class="list-group list-group-flush">
Expand Down Expand Up @@ -32,4 +58,8 @@
route(event.target.getAttribute('href'));
});
});

document.getElementById("logout-button-navbar").addEventListener("click", function (e) {
logout();
})
</script>
40 changes: 40 additions & 0 deletions nginx/src/css/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
.navbar {
background-color: #424242;
height: 4.2rem;
min-height: 3.75rem;
display: flex;
flex-direction: row;
}

.navbar-brand {
color: white;
padding-left: 5rem;
}

.div-navbar-profile {
display: inline;
padding-right: 4.5;
antoineverin marked this conversation as resolved.
Show resolved Hide resolved
}

#navbar-list {
list-style-type: none;
justify-content: center;
padding-right: 1.5rem;
}

.navbar-profile-button {
padding: 0.5rem 0.75rem;
}

.dropdown {
z-index: 1000;
right: 2.5rem;
}

.dropdown-item {
margin: 0;
}

.dropdown-toggle::after {
display: none;
}
2 changes: 2 additions & 0 deletions nginx/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-glyphicons.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/css/styles.css">
<link rel="stylesheet" type="text/css" href="/css/sidebar.css">
<link rel="stylesheet" type="text/css" href="/css/navbar.css">
<link rel="stylesheet" type="text/css" href="/css/games.css">
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico">
</head>
Expand Down
Loading