Merge pull request #261 from os2display/feature/template-v3

Refactored how templates are handled

Author: tuj

.gitignore

@@ -1,7 +1,7 @@
-/repos
+# Ignore custom templates folder.
+/assets/shared/custom-templates/*
 
-/public/admin
-/public/client
+# Ignore release json file.
 /public/release.json
 
 ###> symfony/framework-bundle ###

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 * Cleaned up Github Actions workflows.
 * Updated PHP dependencies.
 * Added Playwright github action.
+* Changed how templates are imported.
 
 ### NB! Prior to 3.x the project was split into separate repositories
 

assets/admin/app.jsx

@@ -7,7 +7,7 @@ import Container from "react-bootstrap/Container";
 import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
 import localStorageKeys from "./components/util/local-storage-keys";
-import RestrictedRoute from "./restricted-route";
+import RestrictedRoute from "./components/restricted-route";
 import Topbar from "./components/navigation/topbar/top-bar";
 import SideBar from "./components/navigation/sidebar/sidebar";
 import ScreenList from "./components/screen/screen-list";
@@ -32,14 +32,14 @@ import UserContext from "./context/user-context";
 import ListContext from "./context/list-context";
 import SharedPlaylists from "./components/playlist/shared-playlists";
 import Logout from "./components/user/logout";
-import AuthHandler from "./auth-handler";
+import AuthHandler from "./components/auth-handler";
 import LoadingComponent from "./components/util/loading-component/loading-component";
 import ModalProvider from "./context/modal-context/modal-provider";
 import UsersList from "./components/users/users-list";
 import ActivationCodeList from "./components/activation-code/activation-code-list";
 import ActivationCodeCreate from "./components/activation-code/activation-code-create";
 import ActivationCodeActivate from "./components/activation-code/activation-code-activate";
-import AdminConfigLoader from "./admin-config-loader.js";
+import AdminConfigLoader from "./components/util/admin-config-loader.js";
 import "react-toastify/dist/ReactToastify.css";
 import "./app.scss";
 import FeedSourcesList from "./components/feed-sources/feed-sources-list";

assets/admin/auth-handler.jsx assets/admin/components/auth-handler.jsxassets/admin/auth-handler.jsx renamed to assets/admin/components/auth-handler.jsx

@@ -1,7 +1,7 @@
 import { React, useContext } from "react";
 import PropTypes from "prop-types";
-import Login from "./components/user/login";
-import UserContext from "./context/user-context";
+import Login from "./user/login";
+import UserContext from "../context/user-context";
 
 /**
  * The auth handler wrapper.

assets/admin/error-boundary.jsx …sets/admin/components/error-boundary.jsxassets/admin/error-boundary.jsx renamed to assets/admin/components/error-boundary.jsx assets/admin/error-boundary.jsx renamed to assets/admin/components/error-boundary.jsx

@@ -1,7 +1,7 @@
 import { React, useContext } from "react";
 import PropTypes from "prop-types";
-import UserContext from "./context/user-context";
-import NoAccess from "./components/no-access/no-access";
+import UserContext from "../context/user-context";
+import NoAccess from "./no-access/no-access";
 
 /**
  * The restricted route wrapper.

assets/admin/error-boundary.scss …ets/admin/components/error-boundary.scssassets/admin/error-boundary.scss renamed to assets/admin/components/error-boundary.scss assets/admin/error-boundary.scss renamed to assets/admin/components/error-boundary.scss

@@ -18,7 +18,7 @@ import {
   displayError,
 } from "../util/list/toast-component/display-toast";
 import "./screen-list.scss";
-import AdminConfigLoader from "../../admin-config-loader.js";
+import AdminConfigLoader from "../util/admin-config-loader.js";
 
 /**
  * The screen list component.

assets/admin/restricted-route.jsx …ts/admin/components/restricted-route.jsxassets/admin/restricted-route.jsx renamed to assets/admin/components/restricted-route.jsx assets/admin/restricted-route.jsx renamed to assets/admin/components/restricted-route.jsx

@@ -18,7 +18,7 @@ import idFromUrl from "../util/helpers/id-from-url";
 import { api } from "../../redux/api/api.generated.ts";
 import { displayError } from "../util/list/toast-component/display-toast";
 import FormInput from "../util/forms/form-input";
-import AdminConfigLoader from "../../admin-config-loader.js";
+import AdminConfigLoader from "../util/admin-config-loader.js";
 
 /**
  * Displays screen status.

assets/admin/components/screen/screen-list.jsx

@@ -2,16 +2,15 @@ import { React, useEffect, useState } from "react";
 import { Button } from "react-bootstrap";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import ErrorBoundary from "../../../error-boundary";
+import ErrorBoundary from "../../error-boundary";
 import "./slide-preview.scss";
-import renderSlide from "../../../../shared/template/slide.jsx";
+import { renderSlide } from "../../../../shared/slide-utils/templates";
 
 /**
- * A remote component wrapper
+ * Slide live preview.
  *
  * @param {object} props Props.
  * @param {object} props.slide The slide.
- * @param {boolean} props.url The url for the remote component.
  * @param {object} props.mediaData Object of loaded media.
  * @param {object} props.themeData Object of theme data.
  * @param {string} props.orientation Display orientation or horizontal.
@@ -23,7 +22,7 @@ import renderSlide from "../../../../shared/template/slide.jsx";
  */
 function SlidePreview({
   slide,
-    templateData,
+  templateData,
   showPreview,
   orientation = "",
   closeButton = false,
@@ -147,7 +146,6 @@ function SlidePreview({
 SlidePreview.propTypes = {
   slide: PropTypes.shape({ content: PropTypes.shape({}).isRequired })
     .isRequired,
-  url: PropTypes.string.isRequired,
   mediaData: PropTypes.shape({
     "@id": PropTypes.string,
   }),