ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 5.0 (devel -> main) #25

Merged
ChaoticByte merged 7 commits from devel into main 2022-05-16 11:53:52 +00:00
Conversation 4 Commits 7 Files changed 14 +51 -72
6 changed files with 51 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9406bbad97 - Show all commits

2
application/app/templates/baseLayout.html
View file

@ -22,9 +22,7 @@
{% if user.is_authenticated %}
<div class="userPanel">
{% include "userPanel.html" %}
</div>
{% endif %}

55
application/app/templates/userPanel.html
View file

@ -1,31 +1,36 @@
{% load i18n %}
<div class="dropDownMenu" id="dropDownMenu">
<button class="dropDownButton" id="dropDownMenuButton">
<div>
{% if user.first_name != "" %}
{% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
{% else %}
{% translate "User" %}: {{ user.username }}
{% endif %}
&nbsp;-&nbsp;
{% if user.balance < 0.01 %}
<span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
{% else %}
<span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
{% endif %}
</div>
</button>
<div class="dropDownList">
<a class="button dropDownChoice" id="navBarBtnHome" href="/">Home</a>
<a class="button dropDownChoice" id="navBarBtnHistory" href="/history">{% translate "History" %}</a>
<a class="button dropDownChoice" id="navBarBtnStatistics" href="/statistics">{% translate "Statistics" %}</a>
<a class="button dropDownChoice" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a>
{% if user.is_superuser %}
<a class="button dropDownChoice" href="/admin/">Admin Panel</a>
<div class="userPanel">
<div class="userInfo">
{% if user.first_name != "" %}
{% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
{% else %}
<a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
{% translate "User" %}: {{ user.username }}
{% endif %}
<a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
&nbsp;-&nbsp;
{% if user.balance < 0.01 %}
<span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
{% else %}
<span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
{% endif %}
</div>
<div class="horizontalButtonList">
<a class="button" id="navBarBtnHome" href="/">Home</a>
<a class="button" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a>
<div class="dropDownMenu" id="dropDownMenu">
<button class="dropDownButton" id="dropDownMenuButton">
<div>{% translate "Account" %}</div>
</button>
<div class="dropDownList">
<a class="button dropDownChoice" id="navBarBtnHistory" href="/history">{% translate "History" %}</a>
<a class="button dropDownChoice" id="navBarBtnStatistics" href="/statistics">{% translate "Statistics" %}</a>
{% if user.is_superuser %}
<a class="button dropDownChoice" href="/admin/">Admin Panel</a>
{% else %}
<a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
{% endif %}
<a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
</div>
</div>
</div>
</div>

8
static/css/deposit.css
View file

@ -1,11 +1,3 @@
#depositAmount {
width: 10rem;
}
main {
margin-top: 0;
}
@media only screen and (max-width: 700px) {
main {
margin-top: -15vh;
}
}

1
static/css/login.css
View file

@ -54,7 +54,6 @@ main > h1 {
flex-direction: column;
justify-content: start;
align-items: center;
margin-top: 10vh;
}
.passwordOverlay > form {
min-width: unset;

49
static/css/main.css
View file

@ -58,20 +58,23 @@ main {
align-items: center;
flex-grow: 1;
width: 100%;
margin-top: calc(-14rem + 2vh);
margin-top: 2rem;
}
.userPanel {
width: 100%;
display: flex;
flex-direction: row;
justify-content: center;
align-items: flex-start;
min-width: fit-content;
align-items: center;
margin-top: 1rem;
pointer-events: none;
font-size: 1rem;
width: 90%;
}
.userPanel > div {
margin: 0 1rem;
.userInfo span {
font-size: 1.1rem;
}
.userPanel > .horizontalButtonList {
margin-left: auto;
margin-right: 0;
}
.userBalanceWarn {
color: var(--color-error);
@ -118,25 +121,19 @@ main > h1 {
box-shadow: none;
text-align: center;
justify-content: center;
pointer-events: all;
}
.dropDownButton, .dropDownChoice {
font-size: 1rem;
}
.dropDownButton > div::after {
content: '\25BC';
display: inline-block;
transition: transform 100ms;
padding: 0 .3rem;
}
.dropDownList {
position: absolute;
display: flex;
flex-direction: column;
pointer-events: none;
border-radius: var(--glass-corner-radius) !important;
backdrop-filter: var(--glass-blur);
z-index: 200;
margin-top: .5rem;
margin-top: 3.2rem;
opacity: 0%;
transition: opacity 100ms;
}
@ -166,12 +163,6 @@ main > h1 {
visibility: visible;
pointer-events: visible;
}
.dropDownVisible > .dropDownButton > div::after {
transform: rotate(180deg);
}
.userPanel .dropDownButton, .userPanel .dropDownChoice {
font-size: 1.1rem;
}
/* FOOTER */
.footer {
z-index: 990;
@ -215,8 +206,8 @@ tr:nth-child(2n+2) {
}
/*
Rounded corners on table cells apparently don't work with
Firefox (91), so Firefox users won't have rounded corners
on tables. Won't fix that by myself.
Firefox, so Firefox users won't have rounded corners
on tables. Can't fix that by myself.
*/
table tr:first-child th:first-child {
border-top-left-radius: var(--glass-corner-radius);
@ -285,7 +276,6 @@ form .button, form button {
align-items: center;
justify-content: center;
font-family: var(--font-family);
font-size: .9rem;
text-decoration: none;
text-align: center !important;
background: var(--glass-bg);
@ -341,7 +331,9 @@ input[type="text"], input[type="password"], input[type="number"] {
flex-direction: row;
align-items: flex-end;
justify-content: space-between;
width: 100%;
}
.horizontalButtonList > .button, .horizontalButtonList > button, .horizontalButtonList > div {
margin: 0 .5rem;
}
.errorText {
margin-top: 1rem;
@ -365,8 +357,9 @@ h1 {
justify-content: start;
align-items: center;
}
.userPanel > div {
margin: 0;
margin-bottom: .5rem;
.userPanel > .horizontalButtonList {
margin-right: 0;
margin-left: 0;
margin-top: .5rem;
}
}

8
static/css/order.css
View file

@ -1,11 +1,3 @@
main {
margin-top: 0;
}
form {
width: 22rem;
}
@media only screen and (max-width: 700px) {
main {
margin-top: -15vh;
}
}