Merge pull request #3 from wir-social/release-v3.1.2-581-groups-map-events-chat

chore(release): release v3.1.2-581 - groups, map, events, chat
2023-10-05 16:03:33 +02:00 · 2023-10-05 16:03:33 +02:00 · d43e64abd3
commit d43e64abd3
parent fdc2e52fa4 ae4cae0174
34 changed files with 1391 additions and 320 deletions
--- a/.env.enc
+++ b/.env.enc
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
+.DS_Store
+
 *.yaml
 SECRET
 .env
--- a/branding/constants/emails.ts
+++ b/branding/constants/emails.ts
@ -1,8 +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: 'hello@ocelot.social',
-  MODERATION_EMAIL: 'hello@ocelot.social',
+  SUPPORT_EMAIL: 'admin@freilernen.social',
+  MODERATION_EMAIL: 'admin@freilernen.social',
  // 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://ocelot.social',
-  SUPPORT_LINK: 'https://ocelot.social',
+  ORGANIZATION_LINK: 'https://freilernen.social',
+  SUPPORT_LINK: 'https://freilernen.social',
 }
--- a/branding/constants/groups.ts
+++ b/branding/constants/groups.ts
@ -1,5 +1,5 @@
 // this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js`
 export const NAME_LENGTH_MIN = 3
 export const NAME_LENGTH_MAX = 50
-export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags
+export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 20 // with removed HTML tags
 export const SHOW_GROUP_BUTTON_IN_HEADER = true
--- a/branding/constants/headerMenu.ts
+++ b/branding/constants/headerMenu.ts
@ -4,10 +4,10 @@ export default {
    //   nameIdent: 'nameIdent',
    //   path: '/',
    // },
-    // {
-    //   nameIdent: 'nameIdent',
-    //   url: 'https://ocelot.social',
-    //   target: '_blank',
-    // },
+    {
+      nameIdent: 'freilernensocialRebranding.header.asp',
+      url: 'https://freilernen.com',
+      target: '_blank',
+    },
  ],
 }
--- a/branding/constants/links.ts
+++ b/branding/constants/links.ts
@ -4,10 +4,10 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'

 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
  // if defined it's dominating
-  externalLink: {
-    url: 'https://ocelot.social',
-    target: '_blank',
-  },
+  // externalLink: {
+  //   url: 'https://ocelot.social',
+  //  target: '_blank',
+  // },

  internalPage: {
    // footerIdent: 'site.made', // localized string identifier, if undefined default is used
@ -21,11 +21,11 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 })
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
  // if defined it's dominating
-  externalLink: {
+  // externalLink: {
  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'https://ocelot-social.herokuapp.com/donations',
-    target: '_blank',
-  },
+  //  url: 'https://ocelot-social.herokuapp.com/donations',
+  //  target: '_blank',
+  // },

  internalPage: {
    // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
@ -38,12 +38,11 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
  },
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
-  // if defined it's dominating
-  externalLink: {
+  // externalLink: {
  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'https://ocelot-social.herokuapp.com/imprint',
-    target: '_blank',
-  },
+  //  url: 'https://ocelot-social.herokuapp.com/imprint',
+  //  target: '_blank',
+  // },

  internalPage: {
    // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
@ -98,9 +97,9 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
  // externalLink: null, // if defined 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
+    footerIdent: 'freilernensocialRebranding.footer.faq.headline', // localized string identifier, if undefined default is used
+    headTitleIdent: 'freilernensocialRebranding.footer.faq.headline', // localized string identifier, if undefined default is used
+    headlineIdent: 'freilernensocialRebranding.footer.faq.headline', // on null default is used, on empty string it's hidden
    hasContainer: true,
    hasBaseCard: true,
    hasLoginInHeader: true,
@ -109,10 +108,10 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
  // if defined it's dominating
-  externalLink: {
-    url: 'https://ocelot.social',
-    target: '_blank',
-  },
+  // externalLink: {
+  //  url: 'https://ocelot.social',
+  //  target: '_blank',
+  // },

  internalPage: {
    // footerIdent: 'site.support', // localized string identifier, if undefined default is used
@ -147,6 +146,6 @@ export default {
    FAQ,
    DONATE,
    IMPRINT,
-    SUPPORT,
+    // SUPPORT,
  ],
 }
--- a/branding/constants/logos.ts
+++ b/branding/constants/logos.ts
@ -2,7 +2,7 @@
 // this are the paths in the webapp
 export default {
  LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
-  LOGO_HEADER_WIDTH: '130px',
+  LOGO_HEADER_WIDTH: '47px',
  LOGO_HEADER_CLICK: {
    // externalLink: {
    //   url: 'https://ocelot.social',
--- a/branding/constants/metadata.ts
+++ b/branding/constants/metadata.ts
@ -1,9 +1,9 @@
 // this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding
 export default {
-  APPLICATION_NAME: 'ocelot.social',
-  APPLICATION_SHORT_NAME: 'ocelot.social',
+  APPLICATION_NAME: 'freilernen.social',
+  APPLICATION_SHORT_NAME: 'freilernen.social',
  APPLICATION_DESCRIPTION: 'Ocelot Social Community',
  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'busFaktor e.V.',
+  ORGANIZATION_NAME: 'ASP – Aktive Schule Petershausen',
  ORGANIZATION_JURISDICTION: 'Deutschland',
 }
--- a/branding/locales/de.json
+++ b/branding/locales/de.json
@ -1,2 +1,12 @@
 {
+  "freilernensocialRebranding": {
+    "footer": {
+      "faq": {
+        "headline": "Hilfe"
+      }
+    },
+    "header": {
+      "asp": "ASP"
+    }
+  }
 }
--- a/branding/locales/en.json
+++ b/branding/locales/en.json
@ -1,2 +1,12 @@
 {
+  "freilernensocialRebranding": {
+    "footer": {
+      "faq": {
+        "headline": "Help"
+      }
+    },
+    "header": {
+      "asp": "ASP"
+    }
+  }
 }
--- a/branding/locales/html/de/code-of-conduct.html
+++ b/branding/locales/html/de/code-of-conduct.html
@ -1,23 +1,18 @@
-<!-- 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/ -->
+<!-- this file is a template for rebranding of 'branding/locales/html/en/code-of-conduct.html' -->
+
+<!-- template for the 'Code Of Conduct' from the old HC network. in the old repo you will find other languages as well -->

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Für das soziale Netzwerk Freilernen.social
  </h2>
-  <h3>
-    Präambel
-  </h3>
  <p>
-    Ich bin der Inhalt vom Verhaltenskodex.
+    Wie möchtet Ihr in diesem Netzwerk miteinander umgehen? Vorschläge gerne an den <a href="/imprint">Elternbeirat</a>.
  </p>
+  <br>
 </div>

 <style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
  .info-page h2 {
    margin: 24px 0;
  }
--- a/branding/locales/html/de/data-privacy.html
+++ b/branding/locales/html/de/data-privacy.html
--- a/branding/locales/html/de/donate.html
+++ b/branding/locales/html/de/donate.html
@ -3,13 +3,21 @@

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Für das soziale Netzwerk Freilernen.social
  </h2>
-  <h3>
-    Wohin kann ich spenden?
-  </h3>
  <p>
-    Hier steht was zu den Spenden.
+    Die Software des Netzwerks ist frei und Open-Source und wir vom Elternbeirat leisten den Benutzersupport.
+  </p>
+  <p>
+    Für die Domain, das Hosting des Netzwerks sowie für Unterhalt und Weiterentwicklung der Software fallen hingegen Kosten an. 
+    Über einen der nachfolgenden Links kannst du dich mit einer Spende an Jens vom Elternbeirat daran beteiligen.
+  </p>
+  <ul>
+    <li><a href="https://paypal.me/Jensebluemchen78?country.x=DE&locale.x=de_DE" target="_blank">PayPal</a></li>
+    <li><a href="https://liberapay.com/Jens-Heinrich" target="_blank">Liberapay</a></li>
+  </ul>
+  <p>
+     Herzlichen Dank!
  </p>
 </div>

--- a/branding/locales/html/de/faq.html
+++ b/branding/locales/html/de/faq.html
@ -1,30 +1,20 @@
-<!-- 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/ -->
+<!-- this file is a template for rebranding of 'branding/locales/html/de/help.html' -->
+
+<!-- template for the 'FAQ' from the old HC network. in the old repo you will find other languages as well -->

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Für das soziale Netzwerk Freilernen.social
  </h2>
-  <h3>
-    Wie bediene ich dieses Netzwerk?
-  </h3>
  <p>
-    Hier findest Du die
-    <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >Bedienungsanleitung</a>.<br>
-  </p>
-  <h3>
-    Betreiberspezifische FAQs
-  </h3>
-  <p>
-    Hier steht was zu den betreiberspezifischen FAQs.
+    Hast du Fragen zur Bedienung dieses Netzwerks? Dann schau in der offiziellen <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/de:User-Guide" target="_blank">Benutzeranleitung</a> nach.
+Weitere Infos zur Software findest du im <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank">Wiki</a>.
+Bei anderen Fragen hilft dir gerne unser <a href="/imprint">Support</a>.
  </p>
+  <br>
 </div>

 <style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
  .info-page h2 {
    margin: 24px 0;
  }
--- a/branding/locales/html/de/imprint.html
+++ b/branding/locales/html/de/imprint.html
@ -2,22 +2,42 @@
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->

 <div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
  <h3>
+    Für das Netzwerk Freilernen.social
+  </h3>
+  <h4>
    Betreiber
+  </h4>
+    <p>
+      Elternbeirat der Freien aktiven Schule Petershausen<br>
+      c/o Jens Heinrich<br>
+      Pfaffenhofenerstr. 1C<br>
+      85305 Jetzendorf<br>
+      <a href="mailto:info@freilernen.social">info@freilernen.social</a>
+    </p>
+  <h4>
+    Support
+  </h4>
+    <p>
+      <a href="mailto:support@freilernen.social">support@freilernen.social<br>
+        Hilfe rund um die Uhr findest du auf unserer <a href="/faq">Hilfeseite</a>.
+    </p>
+  <h4>
+    Hosting
+  </h4>
+  <p>
+    <a href="https://www.webcraft-media.de" target="_blank">Webcraft Media</a>
+  </p>
+  <h4>
+    Software-Entwicklung und -Unterhalt
  </h3>
  <p>
-    Ich bin das Impressum.
+    <a href="https://www.busfaktor.org" target="_blank">busFaktor() e.V.</a>
  </p>
+  <br>
 </div>

 <style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
  .info-page h2 {
    margin: 24px 0;
  }
--- a/branding/locales/html/de/organization.html
+++ b/branding/locales/html/de/organization.html
@ -3,13 +3,27 @@

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Über freilernen.social
  </h2>
-  <h3>
-    Das Entwicklernetzwerk
-  </h3>
  <p>
-    Hier wird das Netzwerk beschrieben.
+    Das soziale Netzwerk freilernen.social soll eine Verbindung zu Eltern der Aktiven Schule Petershausen aufbauen, denn das Netzwerk sucht Gemeinsamkeiten. 
+    Da wir alle an einer Alternativen Schule sind, ist das schon der beste gemeinsame Grundstein, den wir dafür haben, um soziale Netzwerke neu zu lernen.
+  </p>
+  <p>
+    Es wird vom Elternbeitrat der Aktiven Schule Petershausen betrieben und steht den Schülern und deren Familien zur Verfügung. 
+    Um im Netzwerk mitmachen zu können, kontaktiere unseren <a href="/imprint">Elternbeirat</a>.
+  </p>
+  <p>
+    Der Betrieb des Netzwerks (Domain, Hosting und Software-Unterhalt) wird gemeinschaftlich durch freiwillige <a href="/donate">Spenden</a> finanziert.
+  </p>
+  <p>
+    Das Netzwerk läuft mit der Software Ocelot.Social, deren Entwicklung von einer Community aus Programmierern und 
+    interessierten Netzwerkbetreibern getragen wird. 
+    Die Software ist frei auf <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/" target="_blank">GitHub</a> verfügbar. 
+    Sie ist Open-Source, kann also jederzeit eingesehen und darf frei verändert werden.
+  </p>
+  <p>
+    Erfahre mehr über Ocelot.Social in dessen <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki/de:About-ocelot.social">Wiki</a>.
  </p>
 </div>

--- a/branding/locales/html/de/support.html
+++ b/branding/locales/html/de/support.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Für das soziale Netzwerk Ocelot.Social für Entwickler
  </h2>
  <h3>
    Ansprechpartner
--- a/branding/locales/html/de/terms-and-conditions.html
+++ b/branding/locales/html/de/terms-and-conditions.html
@ -1,24 +1,18 @@
-<!-- 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/ -->
+<!-- this file is a template for rebranding of 'branding/locales/html/de/terms-and-conditions.html' -->

+<!-- template for the 'Terms And Conditions' from the old HC network. in the old repo you will find other languages as well -->

 <div class="info-page">
  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
+    Für das soziale Netzwerk Freilernen.social
  </h2>
-  <h3>
-    Nutzung und Lizenz
-  </h3>
  <p>
-    Ich bin der Inhalt der Seite "Nutzungsbedingungen".
+    Infos folgen.<br>
  </p>
+  <br>
 </div>

 <style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
  .info-page h2 {
    margin: 24px 0;
  }
--- a/branding/locales/html/en/code-of-conduct.html
+++ b/branding/locales/html/en/code-of-conduct.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Präambel
--- a/branding/locales/html/en/data-privacy.html
+++ b/branding/locales/html/en/data-privacy.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Information about the collection of personal data
--- a/branding/locales/html/en/donate.html
+++ b/branding/locales/html/en/donate.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Where can I donate?
--- a/branding/locales/html/en/faq.html
+++ b/branding/locales/html/en/faq.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
    <h3>
    How do I operate this network?
--- a/branding/locales/html/en/imprint.html
+++ b/branding/locales/html/en/imprint.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Operator
--- a/branding/locales/html/en/organization.html
+++ b/branding/locales/html/en/organization.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    The Developers Network
--- a/branding/locales/html/en/support.html
+++ b/branding/locales/html/en/support.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Contact
--- a/branding/locales/html/en/terms-and-conditions.html
+++ b/branding/locales/html/en/terms-and-conditions.html
@ -3,7 +3,7 @@

 <div class="info-page">
  <h2>
-    For the social network Ocelot.Social Staging
+    For the social network Freilernen.Social
  </h2>
  <h3>
    Use and License
--- a/branding/static/favicon.ico
+++ b/branding/static/favicon.ico
--- a/branding/static/icon.png
+++ b/branding/static/icon.png
--- a/branding/static/img/custom/logo-horizontal.svg
+++ b/branding/static/img/custom/logo-horizontal.svg
--- a/branding/static/img/custom/logo-squared.svg
+++ b/branding/static/img/custom/logo-squared.svg
--- a/kubeconfig.yaml.enc
+++ b/kubeconfig.yaml.enc
--- a/kubernetes/dns.values.yaml.enc
+++ b/kubernetes/dns.values.yaml.enc
--- a/kubernetes/values.yaml.enc
+++ b/kubernetes/values.yaml.enc
--- a/kubernetes/values.yaml.template
+++ b/kubernetes/values.yaml.template
@ -29,6 +29,11 @@ BACKEND:
  # SMTP_PORT: "465"
  # SMTP_IGNORE_TLS: 'true'
  # SMTP_SECURE: 'true' # true for 465, false for other ports
+  # optional
+  SMTP_DKIM_DOMAINNAME: ocelot.social
+  SMTP_DKIM_KEYSELECTOR: 2017
+  # all newlines in one line with "\\n". multi line doesn't work with Helm
+  SMTP_DKIM_PRIVATKEY: "-----BEGIN RSA PRIVATE KEY-----\\n<private.key>\\n-----END RSA PRIVATE KEY-----\\n"

  # most likely you don't need to change this
  MIN_READY_SECONDS: "15"