Merge branch 'release/2.0.0'

os2display · Apr 9, 2024 · ea39eb8 · ea39eb8
2 parents dcfe1ff + 01fcb8c
commit ea39eb8
Show file tree

Hide file tree

Showing 61 changed files with 2,762 additions and 3,503 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.0] - 2024-04-09
+
+- [#151](https://github.com/os2display/display-templates/pull/151)
+  - Built slideshow.
+- [#150](https://github.com/os2display/display-templates/pull/150)
+  - Fixed slideshow fades and timings.
+- [#148](https://github.com/os2display/display-templates/pull/148)
+  - Changed theme load following API change.
+  - Fixed path issue in #141.
+- [#141](https://github.com/os2display/display-templates/pull/141)
+  - Improve build for local development
+- [#146](https://github.com/os2display/display-templates/pull/146)
+  - Fixed issue where image-text image cycle is not restarting when only on slide is displayed.
+  - Fixed issue with slideshow default duration being 5000 s.
+
 ## [1.3.1] - 2023-10-26
 
 - [#145](https://github.com/os2display/display-templates/pull/145)

diff --git a/README.md b/README.md
@@ -12,8 +12,9 @@ example content for the different templates.
 `index.html` serves a local setup for working with the templates.
 
 ```bash
-docker-compose run --rm node yarn
-docker-compose up -d
+docker compose pull
+docker compose run --rm node yarn
+docker compose up --detach
 ```
 
 The docker setup serves the files in the `build/` (see build for production) folder as `display-templates.local.itkdev.dk/build/`.
@@ -46,26 +47,62 @@ Add it to `const entry = {}`:
 To build the templates for production
 
 ```bash
-docker-compose run --rm node yarn build
+docker compose run --rm node yarn install
+docker compose run --rm node yarn build
 ```
 
 To continually build components when files change
 
 ```bash
-docker-compose run --rm node yarn build-watch
+docker compose run --rm node yarn build-watch
 ```
 
 The compiled files will be placed in `build/`. These should be committed to
 git repository, to enable Remote Components to load them in the clients.
 
+### Build base URL
+
+The default base build URLs,
+`https://raw.githubusercontent.com/os2display/display-templates/develop/build/`
+and
+`https://raw.githubusercontent.com/os2display/display-templates/main/build/`,
+respectively, can be overridden via environment variables:
+
+Override both with same value:
+
+```sh
+docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL="http://$(docker compose port nginx 80)/build/" node yarn build
+```
+
+Override "develop" base URL only:
+
+```sh
+docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL_DEVELOP="http://$(docker compose port nginx 80)/build/" node yarn build
+```
+
+Override "main" base URL only:
+
+```sh
+docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL_MAIN="http://$(docker compose port nginx 80)/build/" node yarn build
+```
+
+The default behavoir is equivalent to
+
+```sh
+docker compose run --rm \
+    --env DEPLOYMENT_BUILD_BASE_URL_DEVELOP="https://raw.githubusercontent.com/os2display/display-templates/develop/build/" \
+    --env DEPLOYMENT_BUILD_BASE_URL_MAIN="https://raw.githubusercontent.com/os2display/display-templates/main/build/" \
+    node yarn build
+```
+
 ### Linting
 
 ```bash
-docker-compose run --rm node yarn check-coding-standards
+docker compose run --rm node yarn check-coding-standards
 ```
 
 ```bash
-docker-compose run --rm node yarn apply-coding-standards
+docker compose run --rm node yarn apply-coding-standards
 ```
 
 ### Tests

diff --git a/build/book-review-config-develop.json b/build/book-review-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FP2SME0ENTXWF362XHM6Z1B4",
   "description": "Skabelon til anmeldelser.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1677590005936",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/book-review-config-main.json b/build/book-review-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FP2SME0ENTXWF362XHM6Z1B4",
   "description": "Skabelon til anmeldelser.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1677590005936",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/book-review.js b/build/book-review.js
diff --git a/build/calendar-config-develop.json b/build/calendar-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1679479409437",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1679479409437",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/calendar-config-main.json b/build/calendar-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1679479409437",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1679479409437",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/calendar.js b/build/calendar.js
diff --git a/build/contacts-config-develop.json b/build/contacts-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
   "description": "Skabelon til kontakter.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1677590005936",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1705317070424",
     "schema": "",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/contacts-config-main.json b/build/contacts-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
   "description": "Skabelon til kontakter.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1677590005936",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1705317070424",
     "schema": "",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/contacts.js b/build/contacts.js
diff --git a/build/iframe-config-develop.json b/build/iframe-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FQBJQ2M3544ZKAADPWBXHY71",
   "description": "Skabelon til iFrame.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1677590005936",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1705317070424",
     "schema": "",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/iframe-config-main.json b/build/iframe-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FQBJQ2M3544ZKAADPWBXHY71",
   "description": "Skabelon til iFrame.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1677590005936",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1705317070424",
     "schema": "",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/iframe.js b/build/iframe.js
diff --git a/build/image-text-config-develop.json b/build/image-text-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FP2SNGFN0BZQH03KCBXHKYHG",
   "description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1680079550081",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1680079550081",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/image-text-config-main.json b/build/image-text-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FP2SNGFN0BZQH03KCBXHKYHG",
   "description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1680079550081",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1680079550081",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/image-text.js b/build/image-text.js
diff --git a/build/instagram-feed-config-develop.json b/build/instagram-feed-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FTZC0RKJYHG4JVZG5K709G46",
   "description": "Mulighed for at vise instagram indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1677590005936",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/instagram-feed-config-main.json b/build/instagram-feed-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FTZC0RKJYHG4JVZG5K709G46",
   "description": "Mulighed for at vise instagram indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1677590005936",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/instagram-feed.js b/build/instagram-feed.js
diff --git a/build/poster-config-develop.json b/build/poster-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1697172577053",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1697172577053",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/poster-config-main.json b/build/poster-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1697172577053",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1697172577053",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/poster.js b/build/poster.js
diff --git a/build/rss-config-develop.json b/build/rss-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FQC300GGWCA7A8H0SXY6P9FG",
   "description": "Mulighed for at vise et rss feed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1692122329501",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1692122329501",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/rss-config-main.json b/build/rss-config-main.json
@@ -4,11 +4,11 @@
   "id": "01FQC300GGWCA7A8H0SXY6P9FG",
   "description": "Mulighed for at vise et rss feed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1692122329501",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1692122329501",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1705317070424",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1705317070424",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-schema.json?ts=1705317070424",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}
diff --git a/build/rss.js b/build/rss.js
diff --git a/build/slideshow-config-develop.json b/build/slideshow-config-develop.json
@@ -4,11 +4,11 @@
   "id": "01FP2SNSC9VXD10ZKXQR819NS9",
   "description": "Skabelon til slideshow af billeder med forskellige effekter",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1677590005936",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1677590005936",
-    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1712147079931",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1712147079931",
+    "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json?ts=1712147079931",
     "assets": [],
     "options": {},
     "content": {}
   }
-}
+}