Refactored how templates are handled #261
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ import {MultiSelect} from "react-multi-select-component"; | |
| import UserContext from "../../context/user-context"; | ||
| import FormInput from "../util/forms/form-input"; | ||
| import {api} from "../../redux/api/api.generated.ts"; | ||
| import AdminConfigLoader from "../util/admin-config-loader.js"; | ||
| import {displayError} from "../util/list/toast-component/display-toast"; | ||
| import localStorageKeys from "../util/local-storage-keys"; | ||
| import LoginSidebar from "../navigation/login-sidebar/login-sidebar"; | ||
|
|
||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react"; | |
| import PropTypes from "prop-types"; | ||
| import Screen from "./components/screen.jsx"; | ||
| import ContentService from "./service/content-service"; | ||
| import ClientConfigLoader from "./util/client-config-loader.js"; | ||
| import logger from "./logger/logger"; | ||
| import "./app.scss"; | ||
| import fallback from "./assets/fallback.png"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,10 +3,10 @@ import PropTypes from "prop-types"; | |
| import "./region.scss"; | ||
| import { createGridArea } from "../../shared/grid-generator/grid-generator"; | ||
| import { TransitionGroup, CSSTransition } from "react-transition-group"; | ||
| import ErrorBoundary from "./error-boundary.jsx"; | ||
| import idFromPath from "../util/id-from-path"; | ||
| import logger from "../logger/logger"; | ||
| import Slide from "./slide.jsx"; | ||
|
|
||
| /** | ||
| * Region component. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ import Region from "./region.jsx"; | |
| import "./screen.scss"; | ||
| import logger from "../logger/logger"; | ||
| import TouchRegion from "./touch-region.jsx"; | ||
| import ClientConfigLoader from "../util/client-config-loader.js"; | ||
|
|
||
| /** | ||
| * Screen component. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ import {React} from "react"; | |
| import "./slide.scss"; | ||
| import ErrorBoundary from "./error-boundary.jsx"; | ||
| import logger from "../logger/logger"; | ||
| import { renderSlide } from "../../shared/slide-utils/templates.js"; | ||
|
|
||
| /** | ||
| * Slide component. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,11 +2,11 @@ import { React, useEffect, useState, createRef } from "react"; | |
| import PropTypes from "prop-types"; | ||
| import "./touch-region.scss"; | ||
| import { createGridArea } from "../../shared/grid-generator/grid-generator"; | ||
| import ErrorBoundary from "./error-boundary.jsx"; | ||
| import idFromPath from "../util/id-from-path"; | ||
| import IconClose from "../assets/icon-close.svg"; | ||
| import IconPointer from "../assets/icon-pointer.svg"; | ||
| import Slide from "./slide.jsx"; | ||
|
|
||
| /** | ||
| * Region component. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ import { | |
| import logger from "../logger/logger"; | ||
| import DataSync from "../data-sync/data-sync"; | ||
| import ScheduleService from "./schedule-service"; | ||
| import ClientConfigLoader from "../util/client-config-loader.js"; | ||
|
|
||
| /** | ||
| * ContentService. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import ReleaseLoader from "../util/release-loader"; | ||
| import ClientConfigLoader from "../util/client-config-loader.js"; | ||
| import defaults from "../util/defaults"; | ||
| import idFromPath from "../util/id-from-path"; | ||
| import appStorage from "../util/app-storage"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import Md5 from "crypto-js/md5"; | |
| import Base64 from "crypto-js/enc-base64"; | ||
| import isPublished from "../util/isPublished"; | ||
| import logger from "../logger/logger"; | ||
| import ClientConfigLoader from "../util/client-config-loader.js"; | ||
| import ScheduleUtils from "../util/schedule"; | ||
|
|
||
| /** | ||
|
|
@@ -138,7 +138,7 @@ class ScheduleService { | |
|
|
||
| // Update region. | ||
| this.regions[regionId].hash = hash; | ||
| this.regions[regionId].slide = slides; | ||
|
|
||
| if (newContent) { | ||
| // Send slides to region. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import logger from "../logger/logger"; | ||
| import appStorage from "../util/app-storage"; | ||
| import ClientConfigLoader from "../util/client-config-loader.js"; | ||
| import defaults from "../util/defaults"; | ||
| import statusService from "./status-service"; | ||
| import constants from "../util/constants"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| // Only fetch new config if more than 15 minutes have passed. | ||
| import appStorage from "./app-storage.js"; | ||
|
|
||
| const configFetchIntervalDefault = 15 * 60 * 1000; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "title": "Test", | ||
| "id": "01K2PREY1Q0XCTR9EK1YT5R4XK", | ||
| "options": {}, | ||
| "adminForm": [ | ||
| { | ||
| "key": "test-form-1", | ||
| "input": "header", | ||
| "text": "Skabelon: Test", | ||
| "formGroupClasses": "h4 mb-3" | ||
| }, | ||
| { | ||
| "key": "test-form-title", | ||
| "input": "input", | ||
| "name": "title", | ||
| "type": "text", | ||
| "label": "Overskrift", | ||
| "helpText": "Her kan du skrive overskrift.", | ||
| "formGroupClasses": "mb-3" | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import React, { useEffect } from "react"; | ||
tuj marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| import templateConfig from "./custom-template-example.json"; | ||
| import BaseSlideExecution from "../slide-utils/base-slide-execution.js"; | ||
| import { ThemeStyles } from "../slide-utils/slide-util.jsx"; | ||
|
|
||
| function id() { | ||
| return templateConfig.id; | ||
| } | ||
|
|
||
| function config() { | ||
| return templateConfig; | ||
| } | ||
|
|
||
| function renderSlide(slide, run, slideDone) { | ||
| return <CustomTemplateExample | ||
| slide={slide} | ||
| run={run} | ||
| slideDone={slideDone} | ||
| content={slide.content} | ||
| executionId={slide.executionId} | ||
| />; | ||
| } | ||
|
|
||
| /** | ||
| * @param {object} props Props. | ||
| * @param {object} props.slide The slide. | ||
| * @param {object} props.content The slide content. | ||
| * @param {boolean} props.run Whether or not the slide should start running. | ||
| * @param {Function} props.slideDone Function to invoke when the slide is done playing. | ||
| * @param {string} props.executionId Unique id for the instance. | ||
| * @returns {JSX.Element} The component. | ||
| */ | ||
| function CustomTemplateExample({ slide, content, run, slideDone, executionId }) { | ||
| const { duration = 15000 } = content; | ||
| const { title = "Default title" } = content; | ||
|
|
||
| const slideExecution = new BaseSlideExecution(slide, slideDone); | ||
|
|
||
| useEffect(() => { | ||
| if (run) { | ||
| slideExecution.start(duration); | ||
| } | ||
|
|
||
| return function cleanup() { | ||
| slideExecution.stop(); | ||
| }; | ||
| }, [run]); | ||
|
|
||
| return (<> | ||
| <div className="custom-template-example"> | ||
| <h1 className="title">{title}</h1> | ||
| </div> | ||
|
|
||
| <ThemeStyles id={executionId} css={slide?.theme?.cssStyles} /> | ||
| </>); | ||
| } | ||
|
|
||
| export default { id, config, renderSlide }; | ||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.