Skip to content

Commit ea39eb8

Browse files
turegjorupturegjorup
committed
Merge branch 'release/2.0.0'
2 parents dcfe1ff + 01fcb8c commit ea39eb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2762
-3503
lines changed

‎CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [2.0.0] - 2024-04-09
8+
9+
- [#151](https://github.com/os2display/display-templates/pull/151)
10+
- Built slideshow.
11+
- [#150](https://github.com/os2display/display-templates/pull/150)
12+
- Fixed slideshow fades and timings.
13+
- [#148](https://github.com/os2display/display-templates/pull/148)
14+
- Changed theme load following API change.
15+
- Fixed path issue in #141.
16+
- [#141](https://github.com/os2display/display-templates/pull/141)
17+
- Improve build for local development
18+
- [#146](https://github.com/os2display/display-templates/pull/146)
19+
- Fixed issue where image-text image cycle is not restarting when only on slide is displayed.
20+
- Fixed issue with slideshow default duration being 5000 s.
21+
722
## [1.3.1] - 2023-10-26
823

924
- [#145](https://github.com/os2display/display-templates/pull/145)

‎README.md

+43-6
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ example content for the different templates.
1212
`index.html` serves a local setup for working with the templates.
1313

1414
```bash
15-
docker-compose run --rm node yarn
16-
docker-compose up -d
15+
docker compose pull
16+
docker compose run --rm node yarn
17+
docker compose up --detach
1718
```
1819

1920
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 = {}`:
4647
To build the templates for production
4748

4849
```bash
49-
docker-compose run --rm node yarn build
50+
docker compose run --rm node yarn install
51+
docker compose run --rm node yarn build
5052
```
5153

5254
To continually build components when files change
5355

5456
```bash
55-
docker-compose run --rm node yarn build-watch
57+
docker compose run --rm node yarn build-watch
5658
```
5759

5860
The compiled files will be placed in `build/`. These should be committed to
5961
git repository, to enable Remote Components to load them in the clients.
6062

63+
### Build base URL
64+
65+
The default base build URLs,
66+
`https://raw.githubusercontent.com/os2display/display-templates/develop/build/`
67+
and
68+
`https://raw.githubusercontent.com/os2display/display-templates/main/build/`,
69+
respectively, can be overridden via environment variables:
70+
71+
Override both with same value:
72+
73+
```sh
74+
docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL="http://$(docker compose port nginx 80)/build/" node yarn build
75+
```
76+
77+
Override "develop" base URL only:
78+
79+
```sh
80+
docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL_DEVELOP="http://$(docker compose port nginx 80)/build/" node yarn build
81+
```
82+
83+
Override "main" base URL only:
84+
85+
```sh
86+
docker compose run --rm --env DEPLOYMENT_BUILD_BASE_URL_MAIN="http://$(docker compose port nginx 80)/build/" node yarn build
87+
```
88+
89+
The default behavoir is equivalent to
90+
91+
```sh
92+
docker compose run --rm \
93+
--env DEPLOYMENT_BUILD_BASE_URL_DEVELOP="https://raw.githubusercontent.com/os2display/display-templates/develop/build/" \
94+
--env DEPLOYMENT_BUILD_BASE_URL_MAIN="https://raw.githubusercontent.com/os2display/display-templates/main/build/" \
95+
node yarn build
96+
```
97+
6198
### Linting
6299

63100
```bash
64-
docker-compose run --rm node yarn check-coding-standards
101+
docker compose run --rm node yarn check-coding-standards
65102
```
66103

67104
```bash
68-
docker-compose run --rm node yarn apply-coding-standards
105+
docker compose run --rm node yarn apply-coding-standards
69106
```
70107

71108
### Tests

‎build/book-review-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FP2SME0ENTXWF362XHM6Z1B4",
55
"description": "Skabelon til anmeldelser.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1677590005936",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/book-review-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FP2SME0ENTXWF362XHM6Z1B4",
55
"description": "Skabelon til anmeldelser.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1677590005936",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/book-review.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/calendar-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FRJPF4XATRN8PBZ35XN84PS6",
55
"description": "Mulighed for at vise et kalenderfeed.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1679479409437",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1679479409437",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/calendar-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FRJPF4XATRN8PBZ35XN84PS6",
55
"description": "Mulighed for at vise et kalenderfeed.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1679479409437",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1679479409437",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/calendar.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/contacts-config-develop.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
55
"description": "Skabelon til kontakter.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1677590005936",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1705317070424",
99
"schema": "",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/contacts-config-main.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
55
"description": "Skabelon til kontakter.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1677590005936",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1705317070424",
99
"schema": "",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/contacts.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/iframe-config-develop.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FQBJQ2M3544ZKAADPWBXHY71",
55
"description": "Skabelon til iFrame.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1677590005936",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1705317070424",
99
"schema": "",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/iframe-config-main.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FQBJQ2M3544ZKAADPWBXHY71",
55
"description": "Skabelon til iFrame.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1677590005936",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1705317070424",
99
"schema": "",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/iframe.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/image-text-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
55
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1680079550081",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1680079550081",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/image-text-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
55
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1680079550081",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1680079550081",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/image-text.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/instagram-feed-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FTZC0RKJYHG4JVZG5K709G46",
55
"description": "Mulighed for at vise instagram indhold.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1677590005936",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/instagram-feed-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FTZC0RKJYHG4JVZG5K709G46",
55
"description": "Mulighed for at vise instagram indhold.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1677590005936",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/instagram-feed.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/poster-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FWJZQ25A1868V63CWYYHQFKQ",
55
"description": "Mulighed for at vise plakat indhold.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1697172577053",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1697172577053",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/poster-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FWJZQ25A1868V63CWYYHQFKQ",
55
"description": "Mulighed for at vise plakat indhold.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1697172577053",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1697172577053",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/poster.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/rss-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FQC300GGWCA7A8H0SXY6P9FG",
55
"description": "Mulighed for at vise et rss feed.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1692122329501",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1692122329501",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/rss-config-main.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FQC300GGWCA7A8H0SXY6P9FG",
55
"description": "Mulighed for at vise et rss feed.",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1692122329501",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1692122329501",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1705317070424",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1705317070424",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-schema.json?ts=1705317070424",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

‎build/rss.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/slideshow-config-develop.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"id": "01FP2SNSC9VXD10ZKXQR819NS9",
55
"description": "Skabelon til slideshow af billeder med forskellige effekter",
66
"resources": {
7-
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1677590005936",
8-
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1677590005936",
9-
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json",
7+
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1712147079931",
8+
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1712147079931",
9+
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json?ts=1712147079931",
1010
"assets": [],
1111
"options": {},
1212
"content": {}
1313
}
14-
}
14+
}

0 commit comments

Comments
 (0)