From a44f8b445cd84e1e9acc2bea500a52fd1f13d4c2 Mon Sep 17 00:00:00 2001
From: Philipp Hofer <philipp@hofer.link>
Date: Wed, 1 Oct 2025 20:23:09 +0200
Subject: [PATCH 1/2] no ergo yet

---
 src/tera/mod.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/tera/mod.rs b/src/tera/mod.rs
index 11d68b5..3db88b2 100644
--- a/src/tera/mod.rs
+++ b/src/tera/mod.rs
@@ -2,7 +2,7 @@ use std::{fs::OpenOptions, io::Write};
 
 use chrono::{Datelike, Local};
 use rocket::{
-    Build, Data, FromForm, Request, Rocket, State, catch, catchers,
+    catch, catchers,
     fairing::{AdHoc, Fairing, Info, Kind},
     form::Form,
     fs::FileServer,
@@ -13,6 +13,7 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
+    Build, Data, FromForm, Request, Rocket, State,
 };
 use rocket_dyn_templates::Template;
 use serde::Deserialize;
@@ -20,7 +21,6 @@ use sqlx::SqlitePool;
 use tera::Context;
 
 use crate::{
-    SCHECKBUCH,
     model::{
         logbook::Logbook,
         notification::Notification,
@@ -28,6 +28,7 @@ use crate::{
         role::Role,
         user::{User, UserWithDetails},
     },
+    SCHECKBUCH,
 };
 
 pub(crate) mod admin;
@@ -64,7 +65,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
 
     let date = chrono::Utc::now();
     if date.month() <= 3 || date.month() >= 10 {
-        context.insert("show_quick_ergo_button", "yes");
+        //context.insert("show_quick_ergo_button", "yes");
     }
 
     context.insert("achievements", &Achievements::for_user(db, &user).await);
@@ -330,13 +331,11 @@ mod test {
 
         assert_eq!(response.status(), Status::Ok);
 
-        assert!(
-            response
-                .into_string()
-                .await
-                .unwrap()
-                .contains("Ruderassistent")
-        );
+        assert!(response
+            .into_string()
+            .await
+            .unwrap()
+            .contains("Ruderassistent"));
     }
 
     #[sqlx::test]

From 0338351eef4be0ad7057ce7c378195c8d069b0a0 Mon Sep 17 00:00:00 2001
From: Philipp Hofer <philipp@hofer.link>
Date: Wed, 1 Oct 2025 23:46:49 +0200
Subject: [PATCH 2/2] reduce npm warnings

---
 frontend/{tailwind.config.cjs => tailwind.config.mjs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename frontend/{tailwind.config.cjs => tailwind.config.mjs} (94%)

diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.mjs
similarity index 94%
rename from frontend/tailwind.config.cjs
rename to frontend/tailwind.config.mjs
index 3510e01..410cc78 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.mjs
@@ -1,5 +1,5 @@
 /** @type {import('tailwindcss').Config} */
-const { colors } = require('tailwindcss/defaultTheme');
+import { colors } from 'tailwindcss/defaultTheme';
 
 export default {
   content: ["../templates/**/*.{html,tera,js}"],
@@ -41,5 +41,5 @@ export default {
   },
   plugins: [],
   darkMode: 'class',
-}
+};