3208: Renamed to news-feed

os2display · Dec 15, 2024 · 20051a4 · 20051a4
1 parent 36ba2d6
commit 20051a4
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 60 deletions.
diff --git a/src/social-news/social-news-admin.json → build/news-feed-admin.json b/src/social-news/social-news-admin.json → build/news-feed-admin.json
@@ -1,20 +1,20 @@
 [
   {
-    "key": "social-news-form-1",
+    "key": "news-feed-form-1",
     "input": "header",
     "text": "Skabelon: Instagram feed",
     "name": "header1",
     "formGroupClasses": "h4 mb-3"
   },
   {
-    "key": "social-news-form-2",
+    "key": "news-feed-form-2",
     "input": "header-h3",
     "text": "Opsæt feed",
     "name": "header2",
     "formGroupClasses": "h5 mb-3"
   },
   {
-    "key": "social-news-form-3",
+    "key": "news-feed-form-3",
     "input": "feed",
     "text": "Opsæt feed",
     "name": "feeds",
@@ -23,7 +23,7 @@
     "singleSelect": true
   },
   {
-    "key": "social-news-form-entry-duration",
+    "key": "news-feed-form-entry-duration",
     "input": "input",
     "name": "entryDuration",
     "type": "number",
@@ -33,15 +33,15 @@
     "required": true
   },
   {
-    "key": "social-news-form-readmore",
+    "key": "news-feed-form-readmore",
     "input": "input",
     "label": "Læs mere tekst",
     "helpText": "Hvis den ikke overskrives, står der \"Læs hele nyheden\"",
     "name": "readMore",
     "formGroupClasses": "mb-3"
   },
   {
-    "key": "social-news-max-entries",
+    "key": "news-feed-max-entries",
     "input": "input",
     "name": "maxEntries",
     "type": "number",

diff --git a/build/news-feed-config-develop.json b/build/news-feed-config-develop.json
@@ -0,0 +1,14 @@
+{
+  "title": "Nyheder",
+  "icon": "",
+  "id": "01JEWPAFF93YSF418TH72W1SBA",
+  "description": "Mulighed for at vise nyhedsindhold.",
+  "resources": {
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed.js?ts=1734240677134",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/news-feed-admin.json?ts=1734240677134",
+    "schema": "",
+    "assets": [],
+    "options": {},
+    "content": {}
+  }
+}
diff --git a/build/news-feed-config-main.json b/build/news-feed-config-main.json
@@ -0,0 +1,14 @@
+{
+  "title": "Nyheder",
+  "icon": "",
+  "id": "01JEWPAFF93YSF418TH72W1SBA",
+  "description": "Mulighed for at vise nyhedsindhold.",
+  "resources": {
+    "component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed.js?ts=1734240677134",
+    "admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/news-feed-admin.json?ts=1734240677134",
+    "schema": "",
+    "assets": [],
+    "options": {},
+    "content": {}
+  }
+}
diff --git a/build/social-news.js → build/news-feed.js b/build/social-news.js → build/news-feed.js
diff --git a/build/social-news-config-develop.json b/build/social-news-config-develop.json
diff --git a/build/social-news-config-main.json b/build/social-news-config-main.json
diff --git a/src/index.js b/src/index.js
@@ -29,7 +29,7 @@ import Video from "./video/video";
 import Travel from "./travel/travel";
 import VimeoPlayer from "./vimeo-player/vimeo-player";
 import "./index.css";
-import SocialNews from "./social-news/social-news";
+import NewsFeed from "./news-feed/news-feed";
 
 export const renderScreen = (screen) => {
   const gridTemplateAreas = {
@@ -159,9 +159,9 @@ export const renderSlide = (slide) => {
           executionId="SLIDE_ID"
         />
       );
-    case "social-news":
+    case "news-feed":
       return (
-        <SocialNews
+        <NewsFeed
           content={slide.content}
           slide={slide}
           run="1234"

diff --git a/build/social-news-admin.json → src/news-feed/news-feed-admin.json b/build/social-news-admin.json → src/news-feed/news-feed-admin.json
@@ -1,29 +1,29 @@
 [
   {
-    "key": "social-news-form-1",
+    "key": "news-feed-form-1",
     "input": "header",
     "text": "Skabelon: Instagram feed",
     "name": "header1",
     "formGroupClasses": "h4 mb-3"
   },
   {
-    "key": "social-news-form-2",
+    "key": "news-feed-form-2",
     "input": "header-h3",
     "text": "Opsæt feed",
     "name": "header2",
     "formGroupClasses": "h5 mb-3"
   },
   {
-    "key": "social-news-form-3",
+    "key": "news-feed-form-3",
     "input": "feed",
     "text": "Opsæt feed",
     "name": "feeds",
-    "supportedFeedOutputType": "social-news",
+    "supportedFeedOutputType": "rss",
     "formGroupClasses": "mb-3",
     "singleSelect": true
   },
   {
-    "key": "social-news-form-entry-duration",
+    "key": "news-feed-form-entry-duration",
     "input": "input",
     "name": "entryDuration",
     "type": "number",
@@ -33,14 +33,15 @@
     "required": true
   },
   {
-    "key": "social-news-form-readmore",
+    "key": "news-feed-form-readmore",
     "input": "input",
-    "text": "Læs mere tekst",
+    "label": "Læs mere tekst",
+    "helpText": "Hvis den ikke overskrives, står der \"Læs hele nyheden\"",
     "name": "readMore",
     "formGroupClasses": "mb-3"
   },
   {
-    "key": "social-news-max-entries",
+    "key": "news-feed-max-entries",
     "input": "input",
     "name": "maxEntries",
     "type": "number",
@@ -49,6 +50,15 @@
     "helpText": "Her kan du skrive maksimalt antal nyheder, der skal vises.",
     "formGroupClasses": "mb-3"
   },
+  {
+    "key": "rss-form-4",
+    "multipleImages": false,
+    "input": "image",
+    "name": "fallbackImage",
+    "label": "Fallback-billede",
+    "helpText": "Dette billede kan vises, hvis nyheden mangler et billede.",
+    "formGroupClasses": "mb-3"
+  },
   {
     "key": "form-media-contain",
     "input": "checkbox",

diff --git a/src/social-news/social-news-config.json → src/news-feed/news-feed-config.json b/src/social-news/social-news-config.json → src/news-feed/news-feed-config.json
@@ -4,8 +4,8 @@
   "id": "01JEWPAFF93YSF418TH72W1SBA",
   "description": "Mulighed for at vise nyhedsindhold.",
   "resources": {
-    "component": "https://display-templates.local.itkdev.dk/build/social-news.js",
-    "admin": "https://display-templates.local.itkdev.dk/build/social-news-admin.json",
+    "component": "https://display-templates.local.itkdev.dk/build/news-feed.js",
+    "admin": "https://display-templates.local.itkdev.dk/build/news-feed-admin.json",
     "schema": "",
     "assets": [],
     "options": {},

diff --git a/src/social-news/social-news.js → src/news-feed/news-feed.js b/src/social-news/social-news.js → src/news-feed/news-feed.js
@@ -7,10 +7,10 @@ import localizedFormat from "dayjs/plugin/localizedFormat";
 import QRCode from "qrcode";
 import { getFirstMediaUrlFromField, ThemeStyles } from "../slide-util";
 import "../global-styles.css";
-import "./social-news.scss";
+import "./news-feed.scss";
 
 /**
- * Social news slide.
+ * News feed slide.
  *
  * @param {object} props Props.
  * @param {object} props.slide The slide.
@@ -20,7 +20,7 @@ import "./social-news.scss";
  * @param {string} props.executionId Unique id for the instance.
  * @returns {JSX.Element} The component.
  */
-function SocialNews({ slide, content, run, slideDone, executionId }) {
+function NewsFeed({ slide, content, run, slideDone, executionId }) {
   dayjs.extend(localizedFormat);
   dayjs.extend(relativeTime);
 
@@ -122,7 +122,7 @@ function SocialNews({ slide, content, run, slideDone, executionId }) {
   return (
     <>
       {currentPost && (
-        <div className="template-social-news">
+        <div className="template-news-feed">
           <div className="media-section">
             <div
               className={`image ${mediaContain ? "media-contain" : ""}`}
@@ -162,7 +162,7 @@ function SocialNews({ slide, content, run, slideDone, executionId }) {
   );
 }
 
-SocialNews.propTypes = {
+NewsFeed.propTypes = {
   run: PropTypes.string.isRequired,
   slideDone: PropTypes.func.isRequired,
   slide: PropTypes.shape({
@@ -203,4 +203,4 @@ SocialNews.propTypes = {
   executionId: PropTypes.string.isRequired,
 };
 
-export default SocialNews;
+export default NewsFeed;
diff --git a/src/social-news/social-news.scss → src/news-feed/news-feed.scss b/src/social-news/social-news.scss → src/news-feed/news-feed.scss
@@ -1,4 +1,4 @@
-.template-social-news {
+.template-news-feed {
   display: grid;
   height: 100%;
   width: 100%;

diff --git a/src/slides.js b/src/slides.js
@@ -1472,8 +1472,8 @@ const slides = [
     },
   },
   {
-    id: "slide25-social-news",
-    type: "social-news",
+    id: "slide25-news-feed",
+    type: "news-feed",
     themeFile: "themes/aarhus.css",
     // Disable dark mode for slide.
     darkModeEnabled: false,

diff --git a/webpack.config.js b/webpack.config.js
@@ -44,9 +44,9 @@ const entry = devMode
         "./src/instagram-feed/instagram-feed.js"
       ),
       iframe: path.resolve(__dirname, "./src/iframe/iframe.js"),
-      "social-news": path.resolve(
+      "news-feed": path.resolve(
         __dirname,
-        "./src/social-news/social-news.js"
+        "./src/news-feed/news-feed.js"
       ),
       table: path.resolve(__dirname, "./src/table/table.js"),
       video: path.resolve(__dirname, "./src/video/video.js"),