Updated to version 1.5.0

* Refactored to put everything in header.html

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 29c1032f947453fb7c9ed67ad23835696b74941e..73cde4aeda85918524980204c76162369c071429 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -6,13 +6,13 @@ networks:
         driver: overlay
 services:
     navigator:
         driver: overlay
 services:
     navigator:

-        image: cjpalmer/gallery-navigator:1.4.0
+        image: cjpalmer/gallery-navigator:1.5.0

         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:
         volumes:
         - gallery_data:/app/gallery
         networks:
         - backend
     server:

-        image: cjpalmer/gallery-server:1.4.0
+        image: cjpalmer/gallery-server:1.5.0

         volumes:
         - gallery_data:/data/images
         depends_on:
         volumes:
         - gallery_data:/data/images
         depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
index 8f126f38f3a87e9ff9f468e29128913938518dcb..66109604f15645a513a70d7b91c5cdc287195e9d 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,15 @@ version: '3'
 services:
     navigator:
         build: ./navigator
 services:
     navigator:
         build: ./navigator

-        image: cjpalmer/gallery-navigator:1.4.0
+        image: cjpalmer/gallery-navigator:1.5.0

         volumes:
         volumes:

-#       - ./navigator/app:/app # dev testing
+        - ./navigator/app:/app # dev testing

         - gallery_data_dev:/app/gallery
         environment:
             FLASK_DEBUG: 1
     server:
         build: ./server
         - gallery_data_dev:/app/gallery
         environment:
             FLASK_DEBUG: 1
     server:
         build: ./server

-        image: cjpalmer/gallery-server:1.4.0
+        image: cjpalmer/gallery-server:1.5.0

         volumes:
         - gallery_data_dev:/data/images
         ports:
         volumes:
         - gallery_data_dev:/data/images
         ports:

diff --git a/navigator/app/app.py b/navigator/app/app.py
index e6bc9b23dc3c84fa8840f43bc91b386af50a59a4..50d8cf75c8c8f5d8633230af20dfbb2672bfe82a 100644 (file)
--- a/navigator/app/app.py
+++ b/navigator/app/app.py
@@ -4,9 +4,28 @@ import re
 
 app = Flask(__name__)
 gallery_root = "/app/gallery"
 
 app = Flask(__name__)
 gallery_root = "/app/gallery"

-gallery_desc_filename = "description.html"

 get_num_regex = re.compile(r'\d+')
 
 get_num_regex = re.compile(r'\d+')
 

+### helper functions ###
+
+def get_page_number_from_name(name):
+    try:
+        return int(get_num_regex.findall(name)[-1])
+    except IndexError:
+        print ("Index error on name " + name, flush=True)
+        return -1
+
+def get_file_text(filename):
+    file_text = None
+    try:
+        with open(filename, 'r') as file:
+            file_text = file.read()
+    except:
+        print("File not found:" + filename)
+    return file_text
+
+### routes ###
+

 @app.route('/')
 def render_gallery():
     gallery_names = []
 @app.route('/')
 def render_gallery():
     gallery_names = []


@@ -20,13 +39,6 @@ def render_gallery():
         galleries=gallery_names
         )
 
         galleries=gallery_names
         )
 

-def get_page_number_from_name(name):
-    try:
-        return int(get_num_regex.findall(name)[-1]) 
-    except IndexError:
-        print ("Index error on name " + name, flush=True)
-        return -1
-

 @app.route('/<gallery>')
 def render_pages(gallery=None):
     gallery_dir = gallery_root + "/" + gallery
 @app.route('/<gallery>')
 def render_pages(gallery=None):
     gallery_dir = gallery_root + "/" + gallery


@@ -42,20 +54,14 @@ def render_pages(gallery=None):
                     })
     template_pages = sorted(template_pages, key=lambda page: page['number'])
 
                     })
     template_pages = sorted(template_pages, key=lambda page: page['number'])
 

-    # get description for gallery (if available)
-    desc_filename = gallery_dir + "/" + gallery_desc_filename
-    description = None
-    try:
-        with open(desc_filename, 'r') as file:
-            description = file.read()
-    except:
-        print("Description file not found at " + desc_filename)
+    # get header for gallery (if available)
+    header_html = get_file_text(gallery_dir + "/header.html")

 
     # render!
     return render_template( 'pages.html',
         title=gallery,
         gallery=gallery,
 
     # render!
     return render_template( 'pages.html',
         title=gallery,
         gallery=gallery,

-        description=description,
+        header=header_html,

         pages=template_pages
         )
 
         pages=template_pages
         )
 

diff --git a/navigator/app/templates/pages.html b/navigator/app/templates/pages.html
index dee0c852ad2c838d860ae1aa52769a59a17e9292..27e02801aedc05e3212951ad5d48c24b5fab2717 100644 (file)
--- a/navigator/app/templates/pages.html
+++ b/navigator/app/templates/pages.html
@@ -7,14 +7,13 @@
 </head>
 <body class="first-color">
     <div class="titlecard second-color">
 </head>
 <body class="first-color">
     <div class="titlecard second-color">

-    <h1>{{ title }}</h1>

 
 

-    {% if description %}
-    <p class="card second-color">
+    {% if header %}
+    <div class="card second-color">

     {% autoescape false %}
     {% autoescape false %}

-    {{ description }}
+    {{ header }}

     {% endautoescape %}
     {% endautoescape %}

-    </p>
+    </div>

     {% endif %}
 
     <ul class="card second-color" id="navigation">
     {% endif %}
 
     <ul class="card second-color" id="navigation">