Merge pull request #87 from os2display/feature/ar-849-added-images-to…

…-text-image Feature/ar 849 added images to text image
os2display · Sep 23, 2022 · 95fcbc6 · 95fcbc6
2 parents dd70b8a + c97b8bf
commit 95fcbc6
Show file tree

Hide file tree

Showing 59 changed files with 273 additions and 98 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,4 +1,8 @@
 {
+  "globals": {
+    "jest": "readonly",
+    "JSX": "readonly"
+  },
   "plugins": ["react", "prettier", "only-warn"],
   "extends": [
     "airbnb",

diff --git a/build/book-review-config-develop.json b/build/book-review-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FP2SME0ENTXWF362XHM6Z1B4",
   "description": "Skabelon til anmeldelser.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/book-review-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/book-review-config-main.json b/build/book-review-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FP2SME0ENTXWF362XHM6Z1B4",
   "description": "Skabelon til anmeldelser.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/book-review-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/calendar-config-develop.json b/build/calendar-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/calendar-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/calendar-config-main.json b/build/calendar-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FRJPF4XATRN8PBZ35XN84PS6",
   "description": "Mulighed for at vise et kalenderfeed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/calendar-schema.json",
     "assets": [],
     "options": {},

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,8 +4,8 @@
   "id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
   "description": "Skabelon til kontakter.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/contacts-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/contacts-config-main.json b/build/contacts-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FPZ19YEHX7MQ5Q6ZS0WK0VEA",
   "description": "Skabelon til kontakter.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/contacts-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/iframe-config-develop.json b/build/iframe-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FQBJQ2M3544ZKAADPWBXHY71",
   "description": "Skabelon til iFrame.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/iframe-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/iframe-config-main.json b/build/iframe-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FQBJQ2M3544ZKAADPWBXHY71",
   "description": "Skabelon til iFrame.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/iframe-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/image-text-admin.json b/build/image-text-admin.json
@@ -31,10 +31,11 @@
   },
   {
     "key": "image-text-form-5",
-    "multipleImages": false,
+    "multipleImages": true,
     "input": "image",
     "name": "image",
-    "label": "Billede"
+    "label": "Billeder",
+    "helpText": "Hvis du tilføjer mere end et billede bliver de vist i (varighed / antal_billeder) sekunder hver."
   },
   {
     "key": "image-text-form-6",

diff --git a/build/image-text-config-develop.json b/build/image-text-config-develop.json
@@ -4,8 +4,8 @@
   "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=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/image-text-config-main.json b/build/image-text-config-main.json
@@ -4,8 +4,8 @@
   "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=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json",
     "assets": [],
     "options": {},

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,8 +4,8 @@
   "id": "01FTZC0RKJYHG4JVZG5K709G46",
   "description": "Mulighed for at vise instagram indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/instagram-feed-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/instagram-feed-config-main.json b/build/instagram-feed-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FTZC0RKJYHG4JVZG5K709G46",
   "description": "Mulighed for at vise instagram indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/instagram-feed-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/poster-config-develop.json b/build/poster-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/poster-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/poster-config-main.json b/build/poster-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FWJZQ25A1868V63CWYYHQFKQ",
   "description": "Mulighed for at vise plakat indhold.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/poster-schema.json",
     "assets": [],
     "options": {},

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,8 +4,8 @@
   "id": "01FQC300GGWCA7A8H0SXY6P9FG",
   "description": "Mulighed for at vise et rss feed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/rss-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/rss-config-main.json b/build/rss-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FQC300GGWCA7A8H0SXY6P9FG",
   "description": "Mulighed for at vise et rss feed.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/rss-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/slideshow-config-develop.json b/build/slideshow-config-develop.json
@@ -4,8 +4,8 @@
   "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=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/slideshow-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/slideshow-config-main.json b/build/slideshow-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FP2SNSC9VXD10ZKXQR819NS9",
   "description": "Skabelon til slideshow af billeder med forskellige effekter",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/slideshow-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/table-config-develop.json b/build/table-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FQBJFKM0YFX1VW5K94VBSNCP",
   "description": "Skabelon til tabel.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/table.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/table-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/table.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/table-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/table-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/table-config-main.json b/build/table-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FQBJFKM0YFX1VW5K94VBSNCP",
   "description": "Skabelon til tabel.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/table.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/table-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/table.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/table-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/table-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/table.js b/build/table.js
diff --git a/build/travel-config-develop.json b/build/travel-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FZD7K807VAKZ99BGSSCHRJM6",
   "description": "Skabelon til rejseplanen.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/travel-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/travel-config-main.json b/build/travel-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FZD7K807VAKZ99BGSSCHRJM6",
   "description": "Skabelon til rejseplanen.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/travel.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/travel-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/travel.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/travel-admin.json?ts=1663931637050",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/build/video-config-develop.json b/build/video-config-develop.json
@@ -4,8 +4,8 @@
   "id": "01FQBJFKM0YFX1VW5K94VBSNCC",
   "description": "Skabelon til video.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/video.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/video-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/video.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/video-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/video-schema.json",
     "assets": [],
     "options": {},

diff --git a/build/video-config-main.json b/build/video-config-main.json
@@ -4,8 +4,8 @@
   "id": "01FQBJFKM0YFX1VW5K94VBSNCC",
   "description": "Skabelon til video.",
   "resources": {
-    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/video.js?ts=1663582803896",
-    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/video-admin.json?ts=1663582803896",
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/video.js?ts=1663931637050",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/video-admin.json?ts=1663931637050",
     "schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/video-schema.json",
     "assets": [],
     "options": {},

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
     "react-router-dom": "^6.0.2",
     "react-svg-loader": "^3.0.3",
     "react-test-renderer": "^17.0.2",
+    "react-transition-group": "^4.4.5",
     "sass": "^1.42.1",
     "sass-loader": "^12.1.0",
     "style-loader": "^2.0.0",