Merge pull request #6 from sender-fm/23-add-new-internal-pages-v1.0.5

chore: [WIP] 🍰 Add New Internal Pages – Compatible To v1.0.5
sender-fm · Aug 12, 2021 · cec1615 · cec1615
2 parents 3fd9e69 + e33a303
commit cec1615
Show file tree

Hide file tree

Showing 24 changed files with 208 additions and 78 deletions.
diff --git a/branding/constants/emails.js b/branding/constants/emails.js
@@ -1,4 +1,8 @@
+// this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 export default {
-  SUPPORT: '[email protected]',
-  MODERATION: '[email protected]',
+  SUPPORT_EMAIL: '[email protected]',
+  MODERATION_EMAIL: '[email protected]',
+  // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails!
+  ORGANIZATION_LINK: 'https://sender.fm',
+  SUPPORT_LINK: 'https://sender.fm/support',
 }
diff --git a/branding/constants/links.js b/branding/constants/links.js
@@ -1,17 +1,134 @@
-// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+// this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+
+import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
+
+const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.made', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
+    headlineIdent: null, // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const DONATE = defaultPageParamsPages.DONATE.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.donate', // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.termsAndConditions', // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.code-of-conduct', // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const FAQ = defaultPageParamsPages.FAQ.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.faq', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.faq', // on null default is used, on empty string it's hidden
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
+
+  internalPage: {
+    // footerIdent: 'site.support', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.support', // on null default is used, on empty string it's hidden
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+    // in case internal page content is here 'branding/locales/html/'
+  },
+})
+
 export default {
   LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
 
-  // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
+  // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
-  SUPPORT: 'https://sender.fm/support', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
+  ORGANIZATION,
+  DONATE,
+  IMPRINT,
+  TERMS_AND_CONDITIONS,
+  CODE_OF_CONDUCT,
+  DATA_PRIVACY,
+  FAQ,
+  SUPPORT,
 
-  // on null or empty strings internal pages are used, see 'webapp/locales/html/'
-  ORGANIZATION: null,
-  DONATE: null,
-  IMPRINT: null,
-  TERMS_AND_CONDITIONS: null,
-  CODE_OF_CONDUCT: null,
-  DATA_PRIVACY: null,
-  FAQ: null,
+  FOOTER_LINK_LIST: [
+    ORGANIZATION,
+    TERMS_AND_CONDITIONS,
+    CODE_OF_CONDUCT,
+    DATA_PRIVACY,
+    FAQ,
+    DONATE,
+    IMPRINT,
+    SUPPORT,
+  ],
 }
diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin der Inhalt vom Verhaltenskodex.</p>
 <br>
 <p>Neu gebrandet …</p>
diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Das hier wäre der Inhalt der Datenschutzbestimmungen.</p>
 <br>
 <p>Neu gebrandet …</p>
diff --git a/branding/locales/html/de/donate.html b/branding/locales/html/de/donate.html
@@ -0,0 +1,6 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<p>Hier steht was zu den Spenden.</p>
+<br>
+<p>Neu gebrandet …</p>
diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Hier stehen die FAQs.</p>
 <br>
 <p>Neu gebrandet …</p>
diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>
   Offenlegung gem. §§ 24, 25 Mediengesetz sowie Anbieteridentifizierung gem. § 5/1 ECG.<br>
 </p>

diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html
@@ -1,31 +1,17 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
-<h1 class="h3-headline-big">
-  sender.fm
+<h1 class="h1-headline">
+  Press Play
 </h1>
-<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<p class="paragraph">
-  Hier wird sender.fm in Zukunft vorgestellt …
-</p>
-<p class="link">
-  <a href="/login" target="_blank">
-    Zum Login …
-  </a><br>
-</p>
-<br>
-<h3 class="h3-headline">
-  Unser Radio-Stream
-</h3>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
-<h4 class="h4-headline">
-  Sende-Wochenplan
-</h4>
-<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+<h3 class="h3-headline">
+  Sendeplan
+</h3>
+<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
 <br>
 
@@ -38,14 +24,20 @@ <h4 class="h4-headline">
     margin-bottom: 48px;
   }
 
+  .h1-headline {
+    font-size: 48px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
   .h3-headline-big {
     font-size: 64px;
     margin-top: 12px;
     margin-bottom: 8px;
   }
 
   .h3-headline {
-    font-size: 24px;
+    font-size: 32px;
     margin-top: 12px;
     margin-bottom: 8px;
   }

diff --git a/branding/locales/html/de/support.html b/branding/locales/html/de/support.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p style="margin-top: 0px; margin-bottom: 8px;">
   Für Support schreiben Sie bitte an:<br>
 </p>

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin der Inhalt der Seite "Nutzungsbedingungen".</p>
 <br>
 <p>Neu gebrandet …</p>
diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the content of the code of conduct.</p>
 <br>
 <p>Rebranded …</p>
diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>This would be our data privacy section.</p>
 <br>
 <p>Rebranded …</p>
diff --git a/branding/locales/html/en/donate.html b/branding/locales/html/en/donate.html
@@ -0,0 +1,6 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<p>Here's what it says about donations.</p>
+<br>
+<p>Rebranded …</p>
diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Here are the FAQs.</p>
 <br>
 <p>Rebranded …</p>
diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>
   Disclosure according to §§ 24, 25 Mediengesetz and provider identification according to § 5/1 ECG.<br>
 </p>

diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html
@@ -1,31 +1,17 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
-<h1 class="h3-headline-big">
-  sender.fm
+<h1 class="h1-headline">
+  Press Play
 </h1>
-<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<p class="paragraph">
-  Here sender.fm will be described in the future …
-</p>
-<p class="link">
-  <a href="/login" target="_blank">
-    Login …
-  </a><br>
-</p>
-<br>
-<h3 class="h3-headline">
-  Our Radio Stream
-</h3>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
-<h4 class="h4-headline">
-  Radio Weekly Plan
-</h4>
-<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+<h3 class="h3-headline">
+  Broadcast Schedule
+</h3>
+<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
 <br>
 
@@ -38,14 +24,20 @@ <h4 class="h4-headline">
     margin-bottom: 48px;
   }
 
+  .h1-headline {
+    font-size: 48px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
   .h3-headline-big {
     font-size: 64px;
     margin-top: 12px;
     margin-bottom: 8px;
   }
 
   .h3-headline {
-    font-size: 24px;
+    font-size: 32px;
     margin-top: 12px;
     margin-bottom: 8px;
   }

diff --git a/branding/locales/html/en/support.html b/branding/locales/html/en/support.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p style="margin-top: 0px; margin-bottom: 8px;">
   For support, please write to:<br>
 </p>

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html
@@ -1,7 +1,6 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the content of the page "Terms And Conditions".<p>
 <br>
 <p>Rebranded …</p>