logging middleware added

main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"os"
+	"net"
+	"time"
 	"strconv"
 	"strings"
 	"sync"
@@ -18,12 +20,76 @@ const (
 )
 
 var (
+	debug = false
 	templates = make(map[string]*template.Template)
 	AppVersion = "development"
 	counterFile = "/data/counter.txt"
 	mu sync.Mutex
 )
 
+type responseWriter struct {
+    http.ResponseWriter
+    statusCode int
+}
+
+func (rw *responseWriter) WriteHeader(code int) {
+    rw.statusCode = code
+    rw.ResponseWriter.WriteHeader(code)
+}
+
+func newResponseWriter(w http.ResponseWriter) *responseWriter {
+    return &responseWriter{w, http.StatusOK} // Default 200 OK
+}
+
+func LoggingMiddleware(next http.Handler) http.Handler {
+    return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+        start := time.Now()
+        
+        // ResponseWriter einpacken
+        rw := newResponseWriter(w)
+        
+        // Den nächsten Handler ausführen
+        next.ServeHTTP(rw, r)
+        
+        // Log-Daten sammeln
+        duration := time.Since(start)
+        clientIP := getClientIP(r) // Deine Funktion von vorhin
+        
+        // Format: IP - - [Datum] "Method Path Proto" Status Duration
+        log.Printf("%s - - [%s] \"%s %s %s\" %d %v\n",
+            clientIP,
+            time.Now().Format("02/Jan/2006:15:04:05 -0700"),
+            r.Method,
+            r.URL.Path,
+            r.Proto,
+            rw.statusCode,
+            duration,
+        )
+    })
+}
+
+func getClientIP(r *http.Request) string {
+    // 1. Prüfe den X-Forwarded-For Header (Standard für Proxies)
+    xForwardedFor := r.Header.Get("X-Forwarded-For")
+    if xForwardedFor != "" {
+        // Der Header kann eine Liste von IPs sein (Client, Proxy1, Proxy2)
+        // Die erste IP in der Liste ist die echte Client-IP
+        ips := strings.Split(xForwardedFor, ",")
+        return strings.TrimSpace(ips[0])
+    }
+
+    // 2. Fallback auf X-Real-IP (oft von Traefik/Nginx gesetzt)
+    xRealIP := r.Header.Get("X-Real-IP")
+    if xRealIP != "" {
+        return xRealIP
+    }
+
+    // 3. Letzter Ausweg: Die direkte IP (wird in deinem Fall die Traefik-IP sein)
+    // RemoteAddr enthält oft auch den Port (z.B. "127.0.0.1:1234")
+    ip, _, _ := net.SplitHostPort(r.RemoteAddr)
+    return ip
+}
+
 // Diese Funktion wird nur intern aufgerufen, wenn der Mutex bereits gesperrt ist
 func getCount() int {
 	data, err := os.ReadFile(counterFile)
@@ -76,7 +142,7 @@ func loadTemplates() {
 }
 
 func generatePassword() string {
-	log.Printf("called generatePassword\n")
+	if debug { log.Printf("called generatePassword\n") }
 	password := make([]byte, passwordLength)
 	_, err := rand.Read(password)
 	if err != nil {
@@ -90,7 +156,7 @@ func generatePassword() string {
 }
 
 func passwordHandler(w http.ResponseWriter, r *http.Request) {
-    log.Printf("called passwordHandler\n")
+    if debug { log.Printf("called passwordHandler\n") }
     password := generatePassword()
     currentCount := GetPasswordCount()
     response := map[string]interface{}{
@@ -107,14 +173,14 @@ func passwordHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("called passwordHandler\n")
+	if debug { log.Printf("called passwordHandler\n") }
 	password := generatePassword()
 	w.Header().Set("Content-Type", "text/plain")
 	w.Write([]byte(password))
 }
 
 func indexHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL)
+	if debug { log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL) }
 	password := generatePassword()
 	//password := "load..."
 	data := struct {
@@ -122,7 +188,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	}{
 		Password: password,
 	}
-	log.Printf("prepare template for index\n")
+	if debug { log.Printf("prepare template for index\n") }
 	err := templates["index.html"].ExecuteTemplate(w, "base.html", data)
 	if err != nil {
 		log.Printf("Fehler beim Rendern des Templates: %v", err)
@@ -131,7 +197,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func helpHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("call helpHandler\n")
+	if debug { log.Printf("call helpHandler\n") }
 	err := templates["help.html"].ExecuteTemplate(w, "base.html", nil)
 	if err != nil {
 		log.Printf("Fehler beim Rendern des Templates: %v", err)
@@ -141,14 +207,19 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 
 func main() {
     loadTemplates()
-	fs := http.FileServer(http.Dir("static"))
-	http.Handle("/static/", http.StripPrefix("/static/", fs))
+    mux := http.NewServeMux()
     
-	http.HandleFunc("/", indexHandler)
-	http.HandleFunc("/api/password", passwordAPIHandler)
-	http.HandleFunc("/json/password", passwordHandler)
-	http.HandleFunc("/help", helpHandler)
+    fs := http.FileServer(http.Dir("static"))
+    mux.Handle("/static/", http.StripPrefix("/static/", fs))
+
+    mux.HandleFunc("/", indexHandler)
+    mux.HandleFunc("/api/password", passwordAPIHandler)
+    mux.HandleFunc("/json/password", passwordHandler)
+    mux.HandleFunc("/help", helpHandler)
+
+    loggingRouter := LoggingMiddleware(mux)
 
     log.Println("Server läuft auf http://localhost:8080")
-	log.Fatal(http.ListenAndServe(":8080", nil))
+    
+    log.Fatal(http.ListenAndServe(":8080", loggingRouter))
 }

static/style.css

@@ -1,6 +1,7 @@
 :root {
   --bg-color: #f5f5f5;
   --text-color: #333;
+  --highlight-color: #1d4ed8;
   --container-bg: white;
   --button-bg: #007BFF;
   --button-hover: #0056b3;
@@ -14,6 +15,7 @@
 .dark {
   --bg-color: #121212;
   --text-color: #e0e0e0;
+  --highlight-color: #fcf803;
   --container-bg: #1e1e1e;
   --button-bg: #2a7df4;
   --button-hover: #1a5fb4;
@@ -72,42 +74,21 @@ footer {
     display: flex;
     align-items: center;
     gap: 8px;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-    font-size: 13px;
-    color:x#4b5563;
-}
-
-.label {
-    font-weight: 500;
-}
-
-/* Die Badges (Status-Pillen) */
-.value {
-    padding: 2px 8px;
-    border-radius: 12px;
-    font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
-    font-weight: 600;
-    font-size: 11px;
-}
-
-.badge-blue {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    border: 1px solid var(--border-color);
-}
-
-.badge-gray {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    border: 1px solid var(border-color);
-}
-
-.claim {
     font-family: monospace; /* Monospace sieht für Versionen oft "technischer" aus */
-    font-size: 12px;
+    font-size: 13px;
     color:var(--text-color);
 }
 
+@keyframes pulse {
+    0% { transform: scale(1); color: var(--shadow-color); }
+    50% { transform: scale(1.2); color: var(--highlight-color); font-weight: bold; }
+    100% { transform: scale(1); color: var(--shadow-color); }
+}
+
+.counter-update {
+    animation: pulse 0.4s ease-out;
+}
+
 #password {
   font-family: 'Courier New', Courier, monospace;
   font-size: 1.2rem;

templates/base.html

@@ -50,15 +50,13 @@
 <footer>
     <div class="footer-container">
         <div class="footer-item">
-            <span class="label">Passwörter generiert:</span>
-            <span id="global-counter" class="value badge-blue">{{getPassCount}}</span>
+            Passwörter generiert: <span id="global-counter">{{getPassCount}}</span>
         </div>
         <div class="footer-item">
-            <span class="label">Version:</span>
-            <span class="value badge-gray">{{getAppVersion}}</span>
+            Version: {{getAppVersion}}
         </div>
         <div class="footer-item">
-            <span class="claim">made with golang and ♥️ </span>
+            made with golang and ♥️
         </div>
     </div>
 </footer>

templates/index.html

@@ -25,10 +25,13 @@
             
                // Counter im Footer aktualisieren
                // Wir suchen das Element mit der Klasse 'badge-blue' (oder gib ihm eine ID)
-               const counterElement = document.querySelector(".badge-blue");
+               const counterElement = document.getElementById("global-counter");
                if (counterElement) {
-                   //counterElement.innerText = data.count;
                    document.getElementById("global-counter").innerText = data.count;
+                   // Animation triggern
+                   counterElement.classList.remove("counter-update"); // Vorherige Animation zurücksetzen
+                   void counterElement.offsetWidth;                 // Trick, um CSS-Reflow zu erzwingen
+                   counterElement.classList.add("counter-update");
                }
         })
         .catch(error => console.error("Fehler:", error));
@@ -40,7 +43,7 @@
 <div class="container">
     <a href="/help" class="help-link">?</a>
     <a href="https://gitea.scu.si/Florian.Walther/Web-Password" class="code-link">Sourcecode</a>
-    <h1>Generiertes Passwort</h1>
+    <h1>Passwort Generator</h1>
     <div id="password">{{ .Password }}</div>
     <div class="buttons">
         <button class="copy-button" onclick="copyToClipboard()">In Zwischenablage kopieren</button>