From: Clifton Palmer <clifton.james.palmer@protonmail.com>
Date: Sat, 25 May 2024 12:07:01 +0000 (-0500)
Subject: Updated version to 1.4.0
X-Git-Tag: 1.4.0
X-Git-Url: http://git.purplebirdman.com/web-gallery.git/commitdiff_plain/cf6768b36c026710fffa028c42d0b888c4562fee?ds=sidebyside;hp=b894dfe273580816b8c0b931e311351b5a026ea9

Updated version to 1.4.0

* Added CSS
---

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 57792bc..29c1032 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -6,13 +6,13 @@ networks:
         driver: overlay
 services:
     navigator:
-        image: cjpalmer/gallery-navigator:1.3.0
+        image: cjpalmer/gallery-navigator:1.4.0
         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:
-        image: cjpalmer/gallery-server:1.3.0
+        image: cjpalmer/gallery-server:1.4.0
         volumes:
         - gallery_data:/data/images
         depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index 84260b2..8f126f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,15 @@ version: '3'
 services:
     navigator:
         build: ./navigator
-        image: cjpalmer/gallery-navigator:1.3.0
+        image: cjpalmer/gallery-navigator:1.4.0
         volumes:
+#       - ./navigator/app:/app # dev testing
         - gallery_data_dev:/app/gallery
         environment:
             FLASK_DEBUG: 1
     server:
         build: ./server
-        image: cjpalmer/gallery-server:1.3.0
+        image: cjpalmer/gallery-server:1.4.0
         volumes:
         - gallery_data_dev:/data/images
         ports:
diff --git a/navigator/Dockerfile b/navigator/Dockerfile
index d8a4727..d5a99f3 100644
--- a/navigator/Dockerfile
+++ b/navigator/Dockerfile
@@ -14,5 +14,6 @@ RUN pip install -r requirements.txt
 
 COPY ./app/app.py     /app
 COPY ./app/templates/ /app/templates/
+COPY ./app/static/    /app/static/
 
 CMD ["flask", "run"]
diff --git a/navigator/app/app.py b/navigator/app/app.py
index 526d9b5..e6bc9b2 100644
--- a/navigator/app/app.py
+++ b/navigator/app/app.py
@@ -15,7 +15,10 @@ def render_gallery():
             if not gallery.is_file():
                 gallery_names.append(gallery.name)
     gallery_names.sort()
-    return render_template( 'gallery.html', galleries=gallery_names )
+    return render_template( 'gallery.html',
+        title="My Comics",
+        galleries=gallery_names
+        )
 
 def get_page_number_from_name(name):
     try:
@@ -50,6 +53,7 @@ def render_pages(gallery=None):
 
     # render!
     return render_template( 'pages.html',
+        title=gallery,
         gallery=gallery,
         description=description,
         pages=template_pages
@@ -76,7 +80,7 @@ def render_page(gallery=None, page_num=None):
 
         return render_template( 'page.html',
             gallery=gallery, page_num=page_num,
-            title=page_name, src=src, alt=page_name,
+            title='{} {}'.format(gallery, page_num), src=src, alt=page_name,
             prev_page_url=prev_page_url,
             next_page_url=next_page_url )
     else:
diff --git a/navigator/app/static/css/colors-1.css b/navigator/app/static/css/colors-1.css
new file mode 100644
index 0000000..7b04e4d
--- /dev/null
+++ b/navigator/app/static/css/colors-1.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #defcf9; 
+}
+	
+.second-color { 
+	background: #cadefc; 
+}
+
+.third-color { 
+	background: #c3bef0; 
+}
+
+.fourth-color { 
+	background: #cca8e9; 
+}
diff --git a/navigator/app/static/css/colors-2.css b/navigator/app/static/css/colors-2.css
new file mode 100644
index 0000000..125c0aa
--- /dev/null
+++ b/navigator/app/static/css/colors-2.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #8ef6e4; 
+}
+	
+.second-color { 
+	background: #9896f1; 
+}
+
+.third-color { 
+	background: #d59bf6; 
+}
+
+.fourth-color { 
+	background: #edb1f1; 
+}
diff --git a/navigator/app/static/css/colors-3.css b/navigator/app/static/css/colors-3.css
new file mode 100644
index 0000000..00ff5ba
--- /dev/null
+++ b/navigator/app/static/css/colors-3.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #87e5da; 
+}
+	
+.second-color { 
+	background: #92a4c0; 
+}
+
+.third-color { 
+	background: #f4adad; 
+}
+
+.fourth-color { 
+	background: #e58cdb; 
+}
diff --git a/navigator/app/static/css/colors-4.css b/navigator/app/static/css/colors-4.css
new file mode 100644
index 0000000..1f9f00c
--- /dev/null
+++ b/navigator/app/static/css/colors-4.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #d5def5; 
+}
+	
+.second-color { 
+	background: #8594e4; 
+}
+
+.third-color { 
+	background: #6643b5; 
+}
+
+.fourth-color { 
+	background: #430f58; 
+}
diff --git a/navigator/app/static/css/colors-5.css b/navigator/app/static/css/colors-5.css
new file mode 100644
index 0000000..ef22c9a
--- /dev/null
+++ b/navigator/app/static/css/colors-5.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #f8b595; 
+}
+	
+.second-color { 
+	background: #f67280; 
+}
+
+.third-color { 
+	background: #c06c84; 
+}
+
+.fourth-color { 
+	background: #6c5b7c; 
+}
diff --git a/navigator/app/static/css/colors-6.css b/navigator/app/static/css/colors-6.css
new file mode 100644
index 0000000..120c116
--- /dev/null
+++ b/navigator/app/static/css/colors-6.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #8aacff; 
+}
+	
+.second-color { 
+	background: #626fe6; 
+}
+
+.third-color { 
+	background: #6d42c7; 
+}
+
+.fourth-color { 
+	background: #e85b48; 
+}
diff --git a/navigator/app/static/css/colors-7.css b/navigator/app/static/css/colors-7.css
new file mode 100644
index 0000000..00ff5ba
--- /dev/null
+++ b/navigator/app/static/css/colors-7.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #87e5da; 
+}
+	
+.second-color { 
+	background: #92a4c0; 
+}
+
+.third-color { 
+	background: #f4adad; 
+}
+
+.fourth-color { 
+	background: #e58cdb; 
+}
diff --git a/navigator/app/static/css/colors-8.css b/navigator/app/static/css/colors-8.css
new file mode 100644
index 0000000..82d2434
--- /dev/null
+++ b/navigator/app/static/css/colors-8.css
@@ -0,0 +1,15 @@
+.first-color { 
+	background: #e7759a; 
+}
+	
+.second-color { 
+	background: #ffa35f; 
+}
+
+.third-color { 
+	background: #ba78cd; 
+}
+
+.fourth-color { 
+	background: #755da3; 
+}
diff --git a/navigator/app/static/css/colors.css b/navigator/app/static/css/colors.css
new file mode 120000
index 0000000..75ee676
--- /dev/null
+++ b/navigator/app/static/css/colors.css
@@ -0,0 +1 @@
+colors-1.css
\ No newline at end of file
diff --git a/navigator/app/static/css/index-1.css b/navigator/app/static/css/index-1.css
new file mode 100644
index 0000000..f4f84ef
--- /dev/null
+++ b/navigator/app/static/css/index-1.css
@@ -0,0 +1,36 @@
+a, p, li, h1, h2, h3, h4, h5, h6 {
+    font-family: "Monospace", sans-serif;
+    font-size: 18;
+    color: purple;
+}
+
+a {
+    font-size: 24;
+}
+
+li {
+    list-style-type: none;
+}
+
+#title {
+    font-weight: 700;
+    font-size: 70;
+}
+
+.titlecard { 
+    width: 512px;
+    border-radius: 16px;
+    padding: 32px;
+    margin:0 auto;
+}
+
+.card { 
+    border-radius: 16px;
+    padding: 32px;
+}
+
+.link { 
+    border-radius: 8px;
+    padding: 16px;
+    margin: 16px;
+}
diff --git a/navigator/app/static/css/index.css b/navigator/app/static/css/index.css
new file mode 120000
index 0000000..e74384d
--- /dev/null
+++ b/navigator/app/static/css/index.css
@@ -0,0 +1 @@
+index-1.css
\ No newline at end of file
diff --git a/navigator/app/templates/gallery.html b/navigator/app/templates/gallery.html
index 375ad57..916ebef 100644
--- a/navigator/app/templates/gallery.html
+++ b/navigator/app/templates/gallery.html
@@ -1,15 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Gallery</title>
+    <title>{{ title }}</title>
+    <link rel="stylesheet" type="text/css" href="static/css/colors.css" />
+    <link rel="stylesheet" type="text/css" href="static/css/index.css" />
 </head>
-<body>
-    <h1>Gallery</h1>
+<body class="first-color">
+    <div class="titlecard second-color">
+    <h1>{{ title }}</h1>
 
-    <ul id="navigation">
+    <ul class="card" id="navigation">
     {% for gallery in galleries %}
-        <li><a href="{{ gallery }}">{{ gallery }}</a></li>
+        <li class="link third-color"><a href="{{ gallery }}">{{ gallery }}</a></li>
     {% endfor %}
     </ul>
+    </div>
 </body>
 </html>
diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html
index f74770a..dee0c85 100644
--- a/navigator/app/templates/pages.html
+++ b/navigator/app/templates/pages.html
@@ -1,23 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Pages</title>
+    <title>{{ title }}</title>
+    <link rel="stylesheet" type="text/css" href="static/css/colors.css" />
+    <link rel="stylesheet" type="text/css" href="static/css/index.css" />
 </head>
-<body>
-    <h1>Pages</h1>
+<body class="first-color">
+    <div class="titlecard second-color">
+    <h1>{{ title }}</h1>
 
     {% if description %}
-    <p>
+    <p class="card second-color">
     {% autoescape false %}
     {{ description }}
     {% endautoescape %}
     </p>
     {% endif %}
 
-    <ul id="navigation">
+    <ul class="card second-color" id="navigation">
     {% for page in pages %}
-        <li><a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a></li>
+        <li class="link third-color"><a href="{{ gallery }}/{{ page.number }}">{{ page.number }}</a></li>
     {% endfor %}
     </ul>
+    </div>
 </body>
 </html>