tidy up .gitignore, .dockerignore and add templates

.dockerignore

@@ -1,3 +1,4 @@
+.git/
 feed/
 media/
 prayer-generator
@@ -5,4 +6,4 @@ prayer-generator
 !prayer-generator/license
 grocery-transactions
 files/
-
+*.db

.gitignore

@@ -2,4 +2,4 @@ media/
 .env
 __pycache__/
 files/
-.db
+*.db

docker-compose.yml

@@ -13,7 +13,7 @@ services:
     restart: always
 
   util-sqlpage:
-    image: lovasoa/sqlpage
+    image: lovasoa/sqlpage:latest
     hostname: util-sqlpage
     volumes:
       - /etc/timezone:/etc/timezone:ro
@@ -21,13 +21,28 @@ services:
       - ./util-sqlpage/:/var/www/
       - ./util-sqlpage.json:/etc/sqlpage/sqlpage.json
       - ./util-sqlpage/sqlpage/migrations:/etc/sqlpage/migrations
+      # spinner support
       - ./util-sqlpage/sqlpage/templates:/etc/sqlpage/templates
     networks:
       - traefik
     restart: always
 
+  util-pyapi:
+    image: util-pyapi
+    hostname: util-pyapi
+    build:
+      context: .
+      dockerfile: rest/Dockerfile
+    volumes:
+      - ./util-sqlpage/util.db:/usr/src/app/util.db:ro
+    expose:
+      - 6772
+    networks:
+      - traefik
+    restart: always
+
   home-sqlpage:
-    image: lovasoa/sqlpage
+    image: lovasoa/sqlpage:latest
     hostname: home-sqlpage
     volumes:
       - ./home-sqlpage/:/var/www/
@@ -71,7 +86,7 @@ services:
     restart: always
 
   grocery:
-    image: lovasoa/sqlpage
+    image: lovasoa/sqlpage:latest
     hostname: grocery-sqlpage
     volumes:
       - ./grocery-transactions/sqlpage:/var/www/
@@ -98,21 +113,6 @@ services:
       - traefik
     restart: always
 
-  util-pyapi:
-    image: util-pyapi
-    hostname: util-pyapi
-    build:
-      context: .
-      dockerfile: rest/Dockerfile
-    volumes:
-      - ./util-sqlpage/util.db:/usr/src/app/util.db:ro
-      - ./files:/usr/src/app/rest/static/files
-    expose:
-      - 6772
-    networks:
-      - traefik
-    restart: always
-
 networks:
   traefik:
     external: true

util-sqlpage/sqlpage/templates/loader-start.handlebars

@@ -0,0 +1,6 @@
+<div {{#if id}}id="{{id}}"{{/if}} class="sqlpage-loader-start">
+  <div class="sqlpage-loader-container">
+    <span class="{{default spinner "spinner-border"}}
+      {{#if size}}spinner-border-{{size}}{{/if}}
+      {{#if color}}text-{{color}}{{/if}}">
+    </span>

util-sqlpage/sqlpage/templates/loader-stop.handlebars

@@ -0,0 +1,3 @@
+  </div>
+</div>
+<div class="sqlpage-loader-stop"></div>

util-sqlpage/sqlpage/templates/progress.handlebars

@@ -0,0 +1,42 @@
+<div class="sqlpage-progress-container">
+  <div class="progress {{~#if size}} progress-{{size}}{{/if}}">
+    <div
+      id="sqlpage-loading-{{default stage "progress"}}"
+      class="progress-bar
+      {{~#if (not percent)}} progress-bar-indeterminate{{/if}}
+      {{~#if color}} bg-{{color}}{{/if}}"
+      role="progressbar"
+      aria-valuenow="{{percent}}"
+      {{~#if percent}}style="width: {{percent}}%; display: block"{{/if}} 
+      aria-valuemin="0" aria-valuemax="100"
+      {{~#if stage}}aria-label="{{stage}}"{{/if}}>
+    </div>
+  </div>
+  {{~#if stage}}
+    <br>
+    <label for="sqlpage-loading-{{default stage "progress"}}">{{stage}}</label>
+  {{/if}}
+</div>
+{{#each_row}}
+{{#if (or percent stage)}}
+  <div class="sqlpage-progress-container">
+    <div class="progress {{~#if ../size}} progress-{{../size}}{{/if}}">
+      <div
+        id="sqlpage-loading-{{default stage "progress"}}"
+        class="progress-bar
+        {{~#if (not percent)}} progress-bar-indeterminate{{/if}}
+        {{~#if ../color}} bg-{{../color}}{{/if}}"
+        role="progressbar"
+        aria-valuenow="{{percent}}"
+        {{~#if percent}}style="width: {{percent}}%; display: block"{{/if}} 
+        aria-valuemin="0" aria-valuemax="100"
+        {{~#if stage}}aria-label="{{stage}}"{{/if}}>
+      </div>
+    </div>
+    {{~#if stage}}
+      <br>
+      <label for="sqlpage-loading-{{default stage "progress"}}">{{stage}}</label>
+    {{/if}}
+  </div>
+{{/if}}
+{{/each_row}}

util-sqlpage/sqlpage/templates/spinner-start.handlebars

@@ -0,0 +1,2 @@
+<div class="spinner-start">
+  <span class="{{class}}"></span>

util-sqlpage/sqlpage/templates/spinner-stop.handlebars

@@ -0,0 +1,2 @@
+</div>
+<div class="spinner-stop" />