Release 21 (devel -> main)

See merge request ChaoticByte/drinks-manager!20

.gitignore

@@ -1,7 +1,7 @@
 /data/*
 /data/logs/*
 /data/tls/*
-/data/static/*
+/data/django_static/*
 /data/profilepictures/*
 /data/archive/*
 !/data/logs/

README.md

@@ -1,4 +1,4 @@
-# Drinks Manager (Season 3)
+# Drinks Manager
 
 Note: This software is tailored to my own needs.
 I probably won't accept feature requests, and don't recommend you

app/templates/footer.html

@@ -2,6 +2,6 @@
 <footer class="footer-container">
     <div class="flex flex-row flex-center flex-wrap footer">
         <div>Version {{ app_version }}</div>
-        <div>Copyright (C) 2021, Julian Müller (ChaoticByte)</div>
+        <div>Copyright (C) 2021-2024, Julian Müller (ChaoticByte)</div>
     </div>
 </footer>

data/Caddyfile

@@ -17,7 +17,11 @@
 		}
 		# static files
 		file_server /static/* {
-			root {$DATADIR}/static/..
+			root {$ROOTDIR}
+		}
+		# django static files
+		file_server /django_static/* {
+			root {$DATADIR}/django_static/..
 		}
 		# favicon
 		redir /favicon.ico /static/favicon.ico

project/settings.py

@@ -149,8 +149,8 @@ LOCALE_PATHS = [
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
-STATIC_URL = "static/"
+STATIC_URL = "django_static/"
-STATIC_ROOT = BASE_DIR / "data" / "static"
+STATIC_ROOT = BASE_DIR / "data" / "django_static"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field

requirements.txt

@@ -1,4 +1,4 @@
-Django~=4.1
+Django~=4.2
-psycopg2~=2.9.5
+psycopg2~=2.9
-uvicorn~=0.20.0
+uvicorn[standard]~=0.27
 PyYAML~=6.0

scripts/_bootstrap.py

@@ -131,6 +131,7 @@ if __name__ == "__main__":
         ["./venv/bin/python3", "./manage.py", "migrate", "--noinput"], env=os.environ).wait()
     # Caddy configuration via env
     environment_caddy = os.environ
+    environment_caddy["ROOTDIR"] = str(base_directory.absolute())
     environment_caddy["DATADIR"] = str(data_directory.absolute())
     environment_caddy["CADDY_HOSTS"] = ", ".join(config["caddy"]["hosts"])
     environment_caddy["HTTP_PORT"] = str(config["caddy"]["http_port"])

start.sh

@@ -11,6 +11,6 @@ chmod -c -R g-w,o-rwx .gitignore
 
 export PYTHONPATH="$basedir"
 export DJANGO_SETTINGS_MODULE="project.settings"
-export APP_VERSION="20"
+export APP_VERSION="21"
 
 exec ./scripts/_bootstrap.py "$@"

static/css/main.css

@@ -19,14 +19,15 @@
     --font-family: "Inter";
     --color: #fafafa;
     --color-error: #ff682c;
-    --bg-page-color: #222222;
+    --bg-page: linear-gradient(#18151a, #060a0e);
-    --bg-color: #4e4e4e;
+    --bg-color: #ffffff2c;
-    --bg-hover-color: #636363;
+    --bg-hover-color: #ffffff50;
-    --bg-color2: #383838;
+    --bg-color2: #ffffff44;
-    --bg-hover-color2: #4a4a4a;
+    --bg-dropdown-color: #3a3a3f;
-    --border-color: #808080;
+    --bg-dropdown-hover-color: #59595c;
+    --border-color: #ffffff67;
     --bg-globalmessage: #161616;
-    --border-radius: .5rem;
+    --border-radius: .25rem;
 }
 
 /* General */
@@ -37,7 +38,8 @@ body {
     width: 100vw;
     min-height: 100vh;
     font-family: var(--font-family);
-    background: var(--bg-page-color);
+    font-size: 17px;
+    background: var(--bg-page);
     color: var(--color);
     overflow-x: hidden;
 }
@@ -47,7 +49,7 @@ a {
 }
 
 h1 {
-    font-size: 1.8rem;
+    font-size: 28px;
 }
 
 h1, h2, h3, h4 {
@@ -66,9 +68,9 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 input[type="text"], input[type="password"], input[type="number"], select {
-    padding: .6rem .8rem;
+    padding: .5rem .8rem;
     text-align: center;
-    font-size: 1rem;
+    font-size: 16px;
     color: var(--color);
     border: none;
     outline: none;
@@ -82,7 +84,7 @@ select {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
-    height: 2.5rem;
+    height: 2.2rem;
     background-image: url("/static/material-icons/arrow-drop-down.svg");
     background-repeat: no-repeat;
     background-position: right;
@@ -165,11 +167,7 @@ th {
     flex-direction: row;
     margin-top: 1rem;
     width: 94%;
-    gap: 1rem;
+    gap: 2rem;
-}
-
-.userinfo {
-    font-size: 1.05rem;
 }
 
 .userinfo > span {
@@ -224,7 +222,7 @@ main {
 }
 
 .footer > div {
-    font-size: .95rem;
+    font-size: 16px;
     margin-top: .15rem;
     margin-bottom: .15rem;
 }
@@ -302,8 +300,8 @@ main {
     text-align: center !important;
     background: var(--bg-color);
     color: var(--color);
-    font-size: 1rem;
+    font-size: 16px;
-    padding: .6rem .8rem;
+    padding: .5rem .8rem;
     outline: none;
     border: none;
     border-bottom: 1px solid var(--border-color);
@@ -338,8 +336,8 @@ main {
 .appform > .forminput {
     width: 100%;
     flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: space-between;
-    align-items: center;
+    align-items: flex-end;
     flex-wrap: wrap;
     gap: 1rem;
 }
@@ -366,30 +364,28 @@ main {
 }
 
 .dropdownlist {
+    margin-top: 3rem;
     position: absolute;
     display: flex;
     flex-direction: column;
     pointer-events: none;
-    border-radius: var(--border-radius) !important;
+    gap: .5rem;
-    z-index: 200;
-    margin-top: 3.2rem;
     opacity: 0%;
-    transition: opacity 100ms;
-    box-shadow: 0 .25rem 1rem #00000090;
 }
 
 .dropdownchoice {
-    border-radius: 0 !important;
+    z-index: 200;
+    border-radius: var(--border-radius) !important;
     margin: 0;
     text-align: center;
     justify-content: center;
-    background: var(--bg-color2) !important;
+    background: var(--bg-dropdown-color) !important;
-    backdrop-filter: none !important;
     width: initial;
+    box-shadow: 0 0 1.5rem #00000090;
 }
 
 .dropdownchoice:hover {
-    background: var(--bg-hover-color2) !important;
+    background: var(--bg-dropdown-hover-color) !important;
 }
 
 .dropdownlist :first-child {
@@ -409,7 +405,7 @@ main {
 }
 
 .customnumberinput {
-    height: 2.5rem;
+    height: 2.2rem;
 }
 
 .customnumberinput button {
@@ -477,7 +473,7 @@ main {
 .userlist > li > div {
     flex-grow: 1;
     text-align: center;
-    padding: .8rem 1.1rem;
+    padding: .7rem 1.1rem;
 }
 
 .loginform {
@@ -505,7 +501,7 @@ main {
 .drinks-list > li > .button {
     width: 100%;
     justify-content: space-between;
-    padding: .8rem 1.1rem;
+    padding: .7rem 1.1rem;
 }
 
 /* Statistics */
@@ -525,6 +521,18 @@ main {
     width: 16rem;
 }
 
+/* Blur */
+
+@supports (backdrop-filter: blur()) {
+    :root {
+        --bg-dropdown-color: var(--bg-color);
+        --bg-dropdown-hover-color: var(--bg-hover-color);
+    }
+    .dropdownchoice {
+        backdrop-filter: blur(32px);
+    }
+}
+
 /* Responsive */
 
 @media only screen and (max-width: 1200px) {

static/css/simple-keyboard_dark.css

@@ -6,6 +6,7 @@
     max-width: 100%;
     background: transparent;
     font-family: "Inter";
+    font-size: 16px;
 }
 .simple-keyboard.darkTheme .hg-button {
     height: 50px;