From dfbf1293cb1a7c2a60c8655a6d39a60650c1ede9 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 10 Aug 2021 20:32:49 +1000
Subject: [PATCH] Simpler gallery

- use splide.js
- iterate though a directory automatically
---
 __pycache__/main.cpython-38.pyc               | Bin 0 -> 912 bytes
 _includes/app_carousel.html                   |  61 ------------------
 _includes/carousel.html                       |  27 ++++++++
 _includes/carousel_end.html                   |  14 ----
 _includes/carousel_start.html                 |  14 ----
 _includes/index_carousel.html                 |  49 --------------
 .../{carousel_img.html => splide_image.html}  |   6 +-
 docs/app/app.md                               |   4 +-
 .../screenshots => appgallery}/screen_1.jpg   | Bin
 .../screenshots => appgallery}/screen_10.jpg  | Bin
 .../screenshots => appgallery}/screen_11.jpg  | Bin
 .../screenshots => appgallery}/screen_12.jpg  | Bin
 .../screenshots => appgallery}/screen_13.jpg  | Bin
 .../screenshots => appgallery}/screen_14.jpg  | Bin
 .../screenshots => appgallery}/screen_2.jpg   | Bin
 .../screenshots => appgallery}/screen_3.jpg   | Bin
 .../screenshots => appgallery}/screen_4.jpg   | Bin
 .../screenshots => appgallery}/screen_5.jpg   | Bin
 .../screenshots => appgallery}/screen_6.jpg   | Bin
 .../screenshots => appgallery}/screen_7.jpg   | Bin
 .../screenshots => appgallery}/screen_8.jpg   | Bin
 .../screenshots => appgallery}/screen_9.jpg   | Bin
 .../{index => indexgallery}/bom_add_item.png  | Bin
 .../{index => indexgallery}/build_details.png | Bin
 .../{index => indexgallery}/build_outputs.png | Bin
 .../category_params.png                       | Bin
 .../category_subcats.png                      | Bin
 .../{index => indexgallery}/part_admin.png    | Bin
 .../{index => indexgallery}/part_category.png | Bin
 .../{index => indexgallery}/part_stock.png    | Bin
 .../part_suppliers.png                        | Bin
 .../{index => indexgallery}/stock_item.png    | Bin
 .../stock_location.png                        | Bin
 .../stock_location_2.png                      | Bin
 .../{index => indexgallery}/suppliers.png     | Bin
 docs/index.md                                 |   4 +-
 main.py                                       |  28 ++++++++
 mkdocs.yml                                    |   4 +-
 38 files changed, 67 insertions(+), 144 deletions(-)
 create mode 100644 __pycache__/main.cpython-38.pyc
 delete mode 100644 _includes/app_carousel.html
 create mode 100644 _includes/carousel.html
 delete mode 100644 _includes/carousel_end.html
 delete mode 100644 _includes/carousel_start.html
 delete mode 100644 _includes/index_carousel.html
 rename _includes/{carousel_img.html => splide_image.html} (50%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_1.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_10.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_11.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_12.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_13.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_14.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_2.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_3.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_4.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_5.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_6.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_7.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_8.jpg (100%)
 rename docs/assets/images/{app/screenshots => appgallery}/screen_9.jpg (100%)
 rename docs/assets/images/{index => indexgallery}/bom_add_item.png (100%)
 rename docs/assets/images/{index => indexgallery}/build_details.png (100%)
 rename docs/assets/images/{index => indexgallery}/build_outputs.png (100%)
 rename docs/assets/images/{index => indexgallery}/category_params.png (100%)
 rename docs/assets/images/{index => indexgallery}/category_subcats.png (100%)
 rename docs/assets/images/{index => indexgallery}/part_admin.png (100%)
 rename docs/assets/images/{index => indexgallery}/part_category.png (100%)
 rename docs/assets/images/{index => indexgallery}/part_stock.png (100%)
 rename docs/assets/images/{index => indexgallery}/part_suppliers.png (100%)
 rename docs/assets/images/{index => indexgallery}/stock_item.png (100%)
 rename docs/assets/images/{index => indexgallery}/stock_location.png (100%)
 rename docs/assets/images/{index => indexgallery}/stock_location_2.png (100%)
 rename docs/assets/images/{index => indexgallery}/suppliers.png (100%)
 create mode 100644 main.py

diff --git a/__pycache__/main.cpython-38.pyc b/__pycache__/main.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..00b6e4b4fba7fa4f15cce274ec1c5ae5827ec03d
GIT binary patch
literal 912
zcmaJ=v2NQi5Is_qEE`FNG;om)g;ozWiVhu$APA6*MTQz(j0A>i(lQN+Qb^fJ40(!y
zrepuW9`j3FJM|Yj6g?_NoGd-yj^gR=-Mt6t>+Ws~(8At+oKb*Z?(*C)2Pfzz!oY!(
z6#DL@DamM`65t+ZOXz!?^q}Ma#ws}P5ZmBVt2h%w;xZd^U>^D@y4lB2!2}^WUBVq%
z5Dp08oxf=Dv8sXo%C$@|lrSMHT6$}2sGnIy90d0&So;f_zydeoenJ<lgq2^>H93RJ
z?hhz~?=T`f;EiQiu`?WbNA$<aTQxQ~a1U#&CUAvWTqT@;ZbcjWBFd>&Q5>bxlu{*8
zK8oTrjbdX&8I5ErOe9rQjzv`Hd?vZzk(qu&6`mk0<N46opl&h!KxT0w%$#)#m0+9{
z$qVLAEXTfP-o}Rn<+|Kkkb77`Mb_jey<$Ch08~2^ikoX$jyu%S?t4pa9!TG>2Wf}#
z=kWB?g;X=4N-e}Yx5q^mOVurIZR^NU8s=GXe2ArnVF-Z2`~w#wsl-62S@$T-hjD6-
zyEXlK@ojDk&<QQgjb%k#j<q9T!@<CbGZ<Jl$)&Ol2Y{+rFIKmxMN#1D9p46zVp%p8
zTG%F5h+&!QTkY1d4U{^+7Q7~-o0!t>v$d`5Isx9z0R{+m=mBLOCG;=z_h_56>HO{g
zxuAr877ulf`gzD#zeb$LVNSlyuq}pLsul_;Bl->AI!y22VVgy6<joWR`rR|2En0Y#
R<$RioWA}s9SRvV={{SY#+`<3=

literal 0
HcmV?d00001

diff --git a/_includes/app_carousel.html b/_includes/app_carousel.html
deleted file mode 100644
index 263c31e..0000000
--- a/_includes/app_carousel.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% with image_count=14 %}
-{% include "carousel_start.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_1.jpg", alt="App screenshot", active=True%}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_2.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_3.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_4.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_5.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_6.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_7.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_8.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_9.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_10.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_11.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_12.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_13.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="app/screenshots/screen_14.jpg", alt="App screenshot" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% include "carousel_end.html" %}
\ No newline at end of file
diff --git a/_includes/carousel.html b/_includes/carousel.html
new file mode 100644
index 0000000..937eaeb
--- /dev/null
+++ b/_includes/carousel.html
@@ -0,0 +1,27 @@
+<div class='splide'>
+    <div class='splide__track'>
+        <ul class='splide__list'>
+            {% for img in listimages(directory) %}
+            {% with src=img %}
+            {% include "splide_image.html" %}
+            {% endwith %}
+            {% endfor %}
+        </ul>
+    </div>
+</div>
+
+<script>
+	document.addEventListener( 'DOMContentLoaded', function () {
+		new Splide(
+            '.splide', {
+                type: 'loop',
+                perPage: 2,
+                autoplay: true,
+                pagination: false,
+                // cover: true,
+                height: '25rem',
+                focus: 'center',
+            }
+        ).mount();
+	} );
+</script>
\ No newline at end of file
diff --git a/_includes/carousel_end.html b/_includes/carousel_end.html
deleted file mode 100644
index c0319df..0000000
--- a/_includes/carousel_end.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-    </div>
-
-    <!-- Left and right controls -->
-      <a class="left carousel-control" href="#image-carousel" data-slide="prev">
-        <span class="fas fa-chevron-left"></span>
-        <span class="sr-only">Previous</span>
-      </a>
-      <a class="right carousel-control" href="#image-carousel" data-slide="next">
-        <span class="fas fa-chevron-right"></span>
-        <span class="sr-only">Next</span>
-      </a>
-    </div>
-  </div>
\ No newline at end of file
diff --git a/_includes/carousel_start.html b/_includes/carousel_start.html
deleted file mode 100644
index a1368d2..0000000
--- a/_includes/carousel_start.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="container carousel-container">
-    <div id="image-carousel" class="carousel slide" data-ride="carousel">
-
-      <!-- Indicators -->
-      <ol class="carousel-indicators">
-
-        {% for idx in range(image_count) %}
-        <li data-target="#image-carousel" data-slide-to="{{ idx }}" {% if idx == 0 %}class="active"{% endif %}></li>
-        {% endfor %}
-      </ol>
-  
-      <!-- Wrapper for slides -->
-      <div class="carousel-inner">
-  
diff --git a/_includes/index_carousel.html b/_includes/index_carousel.html
deleted file mode 100644
index e2f5529..0000000
--- a/_includes/index_carousel.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% with image_count=11 %}
-{% include "carousel_start.html" %}
-{% endwith %}
-
-{% with src="index/part_category.png", min_height="400px", max_height="400px", alt="Part Categories", active=True %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/part_stock.png", min_height="400px", max_height="400px", alt="Part Stock" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/part_suppliers.png", min_height="400px", max_height="400px", alt="Part Suppliers" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/stock_item.png", min_height="400px", max_height="400px", alt="Stock Item" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/stock_location.png", min_height="400px", max_height="400px", alt="Stock Location" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/stock_location_2.png", min_height="400px", max_height="400px", alt="Stock Location" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/suppliers.png", min_height="400px", max_height="400px", alt="Suppliers" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/part_admin.png", min_height="400px", max_height="400px", alt="Admin Interface" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/category_params.png", min_height="400px", max_height="400px", alt="Part Parameters" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/build_outputs.png", min_height="400px", max_height="400px", alt="Build Orders" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% with src="index/bom_add_item.png", min_height="400px", max_height="400px", alt="Bill of Materials" %}
-{% include "carousel_img.html" %}
-{% endwith %}
-
-{% include "carousel_end.html" %}
\ No newline at end of file
diff --git a/_includes/carousel_img.html b/_includes/splide_image.html
similarity index 50%
rename from _includes/carousel_img.html
rename to _includes/splide_image.html
index 45d5680..fbf32ac 100644
--- a/_includes/carousel_img.html
+++ b/_includes/splide_image.html
@@ -10,6 +10,6 @@
 {% set img_url = assets  + '/images/' + src %}
 {% endif %}
 
-<div class='item{% if active %} active{% endif %}'>
-    <img class='center' src='{{ img_url }}' alt='{{ alt }}' style='{% if min_height %}min-height: {{ min_height }}; {% endif %}{% if max_height %}max-height: {{ max_height }}; {% endif %}'>
-</div>
\ No newline at end of file
+<li class='splide__slide'>
+    <img src='{{ img_url }}'>
+</li>
diff --git a/docs/app/app.md b/docs/app/app.md
index 72a200e..9591b68 100644
--- a/docs/app/app.md
+++ b/docs/app/app.md
@@ -2,7 +2,9 @@
 title: InvenTree Mobile App
 ---
 
-{% include "app_carousel.html" %}
+{% with directory="appgallery" %}
+{% include "carousel.html" %}
+{% endwith %}
 
 -----
 
diff --git a/docs/assets/images/app/screenshots/screen_1.jpg b/docs/assets/images/appgallery/screen_1.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_1.jpg
rename to docs/assets/images/appgallery/screen_1.jpg
diff --git a/docs/assets/images/app/screenshots/screen_10.jpg b/docs/assets/images/appgallery/screen_10.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_10.jpg
rename to docs/assets/images/appgallery/screen_10.jpg
diff --git a/docs/assets/images/app/screenshots/screen_11.jpg b/docs/assets/images/appgallery/screen_11.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_11.jpg
rename to docs/assets/images/appgallery/screen_11.jpg
diff --git a/docs/assets/images/app/screenshots/screen_12.jpg b/docs/assets/images/appgallery/screen_12.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_12.jpg
rename to docs/assets/images/appgallery/screen_12.jpg
diff --git a/docs/assets/images/app/screenshots/screen_13.jpg b/docs/assets/images/appgallery/screen_13.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_13.jpg
rename to docs/assets/images/appgallery/screen_13.jpg
diff --git a/docs/assets/images/app/screenshots/screen_14.jpg b/docs/assets/images/appgallery/screen_14.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_14.jpg
rename to docs/assets/images/appgallery/screen_14.jpg
diff --git a/docs/assets/images/app/screenshots/screen_2.jpg b/docs/assets/images/appgallery/screen_2.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_2.jpg
rename to docs/assets/images/appgallery/screen_2.jpg
diff --git a/docs/assets/images/app/screenshots/screen_3.jpg b/docs/assets/images/appgallery/screen_3.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_3.jpg
rename to docs/assets/images/appgallery/screen_3.jpg
diff --git a/docs/assets/images/app/screenshots/screen_4.jpg b/docs/assets/images/appgallery/screen_4.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_4.jpg
rename to docs/assets/images/appgallery/screen_4.jpg
diff --git a/docs/assets/images/app/screenshots/screen_5.jpg b/docs/assets/images/appgallery/screen_5.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_5.jpg
rename to docs/assets/images/appgallery/screen_5.jpg
diff --git a/docs/assets/images/app/screenshots/screen_6.jpg b/docs/assets/images/appgallery/screen_6.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_6.jpg
rename to docs/assets/images/appgallery/screen_6.jpg
diff --git a/docs/assets/images/app/screenshots/screen_7.jpg b/docs/assets/images/appgallery/screen_7.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_7.jpg
rename to docs/assets/images/appgallery/screen_7.jpg
diff --git a/docs/assets/images/app/screenshots/screen_8.jpg b/docs/assets/images/appgallery/screen_8.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_8.jpg
rename to docs/assets/images/appgallery/screen_8.jpg
diff --git a/docs/assets/images/app/screenshots/screen_9.jpg b/docs/assets/images/appgallery/screen_9.jpg
similarity index 100%
rename from docs/assets/images/app/screenshots/screen_9.jpg
rename to docs/assets/images/appgallery/screen_9.jpg
diff --git a/docs/assets/images/index/bom_add_item.png b/docs/assets/images/indexgallery/bom_add_item.png
similarity index 100%
rename from docs/assets/images/index/bom_add_item.png
rename to docs/assets/images/indexgallery/bom_add_item.png
diff --git a/docs/assets/images/index/build_details.png b/docs/assets/images/indexgallery/build_details.png
similarity index 100%
rename from docs/assets/images/index/build_details.png
rename to docs/assets/images/indexgallery/build_details.png
diff --git a/docs/assets/images/index/build_outputs.png b/docs/assets/images/indexgallery/build_outputs.png
similarity index 100%
rename from docs/assets/images/index/build_outputs.png
rename to docs/assets/images/indexgallery/build_outputs.png
diff --git a/docs/assets/images/index/category_params.png b/docs/assets/images/indexgallery/category_params.png
similarity index 100%
rename from docs/assets/images/index/category_params.png
rename to docs/assets/images/indexgallery/category_params.png
diff --git a/docs/assets/images/index/category_subcats.png b/docs/assets/images/indexgallery/category_subcats.png
similarity index 100%
rename from docs/assets/images/index/category_subcats.png
rename to docs/assets/images/indexgallery/category_subcats.png
diff --git a/docs/assets/images/index/part_admin.png b/docs/assets/images/indexgallery/part_admin.png
similarity index 100%
rename from docs/assets/images/index/part_admin.png
rename to docs/assets/images/indexgallery/part_admin.png
diff --git a/docs/assets/images/index/part_category.png b/docs/assets/images/indexgallery/part_category.png
similarity index 100%
rename from docs/assets/images/index/part_category.png
rename to docs/assets/images/indexgallery/part_category.png
diff --git a/docs/assets/images/index/part_stock.png b/docs/assets/images/indexgallery/part_stock.png
similarity index 100%
rename from docs/assets/images/index/part_stock.png
rename to docs/assets/images/indexgallery/part_stock.png
diff --git a/docs/assets/images/index/part_suppliers.png b/docs/assets/images/indexgallery/part_suppliers.png
similarity index 100%
rename from docs/assets/images/index/part_suppliers.png
rename to docs/assets/images/indexgallery/part_suppliers.png
diff --git a/docs/assets/images/index/stock_item.png b/docs/assets/images/indexgallery/stock_item.png
similarity index 100%
rename from docs/assets/images/index/stock_item.png
rename to docs/assets/images/indexgallery/stock_item.png
diff --git a/docs/assets/images/index/stock_location.png b/docs/assets/images/indexgallery/stock_location.png
similarity index 100%
rename from docs/assets/images/index/stock_location.png
rename to docs/assets/images/indexgallery/stock_location.png
diff --git a/docs/assets/images/index/stock_location_2.png b/docs/assets/images/indexgallery/stock_location_2.png
similarity index 100%
rename from docs/assets/images/index/stock_location_2.png
rename to docs/assets/images/indexgallery/stock_location_2.png
diff --git a/docs/assets/images/index/suppliers.png b/docs/assets/images/indexgallery/suppliers.png
similarity index 100%
rename from docs/assets/images/index/suppliers.png
rename to docs/assets/images/indexgallery/suppliers.png
diff --git a/docs/index.md b/docs/index.md
index 5bbde43..84dd7ea 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,6 +12,8 @@ hide:
 
 --------------
 
-{% include "index_carousel.html" %}
+{% with directory="indexgallery" %}
+{% include "carousel.html" %}
+{% endwith %}
 
 --------------
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..4da2d6a
--- /dev/null
+++ b/main.py
@@ -0,0 +1,28 @@
+import os
+from posixpath import dirname
+
+def define_env(env):
+
+    @env.macro
+    def listimages(subdir):
+        """
+        Return a listing of all asset files in the provided subdir
+        """
+
+        here = os.path.dirname(__file__)
+
+        directory = os.path.join(here, 'docs', 'assets', 'images', subdir)
+
+        assets = []
+
+        allowed = [
+            '.png',
+            '.jpg',
+        ]
+
+        for asset in os.listdir(directory):
+
+            if any([asset.endswith(x) for x in allowed]):
+                assets.append(os.path.join(subdir, asset))
+
+        return assets
diff --git a/mkdocs.yml b/mkdocs.yml
index cfa7b91..64b0084 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -29,6 +29,7 @@ extra_css:
   - stylesheets/regular.css
   - stylesheets/solid.css
   - stylesheets/bootstrap.css
+  - https://cdn.jsdelivr.net/npm/@splidejs/splide@latest/dist/css/splide.min.css
 extra_javascript:
   - javascripts/extra.js
   - javascripts/fontawesome.js
@@ -37,6 +38,7 @@ extra_javascript:
   - javascripts/solid.js
   - https://code.jquery.com/jquery-3.6.0.js
   - https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.js
+  - https://cdn.jsdelivr.net/npm/@splidejs/splide@latest/dist/js/splide.min.js
 
 # Navigation
 nav:
@@ -156,4 +158,4 @@ extra:
       name: InvenTree on Docker
 
 use_directory_urls: true
-strict: true
+strict: false