From 9c1e6f0e9415f661499bd6e56741e6699b6a2e5b Mon Sep 17 00:00:00 2001
From: Tanishq Dubey <dubey@dws.rip>
Date: Tue, 5 Nov 2024 19:25:52 -0500
Subject: [PATCH] More frontend changes, ready for deploy

---
 .gitignore                    |  1 +
 docker-compose.yml            | 18 +++---------------
 templates/admin.html          |  1 +
 templates/admin_login.html    |  1 +
 templates/config_history.html |  1 +
 templates/index.html          |  1 +
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index e304d8d..b72b321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ lib64
 uploads/
 thumbnails/
 images/
+static/
 
 config.toml
 __pycache__/
diff --git a/docker-compose.yml b/docker-compose.yml
index ac623fd..b3af0c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,33 +2,21 @@ version: '3.8'
 
 services:
   web:
-    build: .
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.photos.rule=Host(`photos.dws.rip`)"
-      - "traefik.http.services.photos.loadbalancer.server.port=5000"
-      - "traefik.http.routers.photos.tls=true"
-      - "traefik.http.routers.photos.tls.certresolver=default"
+    image: git.dws.rip/dws/spectra:main
     volumes:
       - ./uploads:/app/uploads
       - ./thumbnails:/app/thumbnails
       - ./config.toml:/app/config.toml
       - ./photos.db:/app/photos.db
+      - ./static:/app/static
     environment:
       - PYTHONUNBUFFERED=1
       - FLASK_ENV=production
       - WORKERS=4
     restart: unless-stopped
-    networks:
-      - traefik-public
-      - default
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5000/"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
-
-networks:
-  traefik-public:
-    external: true
\ No newline at end of file
+      start_period: 40s
\ No newline at end of file
diff --git a/templates/admin.html b/templates/admin.html
index b4f57be..739ddc0 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -7,6 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Mono:wght@100..900&display=swap" rel="stylesheet">
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <style>
         body {
             margin: 0;
diff --git a/templates/admin_login.html b/templates/admin_login.html
index a41adb8..a117401 100644
--- a/templates/admin_login.html
+++ b/templates/admin_login.html
@@ -7,6 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Mono:wght@100..900&display=swap" rel="stylesheet">
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <style>
         body {
             margin: 0;
diff --git a/templates/config_history.html b/templates/config_history.html
index dc36e4a..3b3b5df 100644
--- a/templates/config_history.html
+++ b/templates/config_history.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Site Configuration History</title>
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <style>
         .config-entry {
             background: white;
diff --git a/templates/index.html b/templates/index.html
index 5a1fb11..9831fcb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,6 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Mono:wght@100..900&display=swap" rel="stylesheet">
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <style>
         body {
             margin: 0;