Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ar 849 added images to text image #87

Merged
merged 6 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"globals": {
"jest": "readonly",
"JSX": "readonly"
},
"plugins": ["react", "prettier", "only-warn"],
"extends": [
"airbnb",
Expand Down
4 changes: 2 additions & 2 deletions build/book-review-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/book-review-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/calendar-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/calendar-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion build/calendar.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/contacts-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/contacts-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/iframe-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/iframe-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
5 changes: 3 additions & 2 deletions build/image-text-admin.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions build/image-text-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/image-text-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion build/image-text.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/instagram-feed-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/instagram-feed-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/poster-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/poster-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion build/poster.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/rss-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/rss-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/slideshow-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/slideshow-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/table-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/table-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion build/table.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/travel-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/travel-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/video-config-develop.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
4 changes: 2 additions & 2 deletions build/video-config-main.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
20 changes: 20 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading