Merge pull request #20 from sender-fm/update_2022-10-22

Update 2022 10 22
sender-fm · Oct 22, 2022 · 1e570a5 · 1e570a5
2 parents 639ff4f + 6ce3069
commit 1e570a5
Show file tree

Hide file tree

Showing 33 changed files with 401 additions and 69 deletions.
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F41B Bug Report"
+about: Create a report to help us improve
+title: "\U0001F41B [Bug] XXX"
+labels: bug
+assignees: ''
+
+---
+
+## :bug: Bug Report
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
diff --git a/.github/ISSUE_TEMPLATE/---devops-ticket.md b/.github/ISSUE_TEMPLATE/---devops-ticket.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F4A5 DevOps Ticket"
+about: Help us manage our deployed app.
+title: "\U0001F4A5 [DevOps] XXX"
+labels: ''
+assignees: ''
+
+---
+
+## 💥 DevOps Ticket
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
diff --git a/.github/ISSUE_TEMPLATE/---epic.md b/.github/ISSUE_TEMPLATE/---epic.md
@@ -0,0 +1,15 @@
+---
+name: "\U0001F31F Epic"
+about: Define a big development step.
+title: "\U0001F31F [EPIC] XXX"
+labels: ''
+assignees: ''
+
+---
+
+<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
+<!-- If you need an answer right away, visit the ocelot.social Discord:
+https://discord.gg/AJSX9DCSUA -->
+
+## 🌟 EPIC
+<!-- Describe your Epic in detail. Include screenshots and drawings -->
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F680 Feature Request"
+about: Suggest an idea for this project.
+title: "\U0001F680 [Feature] XXX"
+labels: enhancement
+assignees: ''
+
+---
+
+## :rocket: Feature Request
+<!-- Give a short summary of the Feature. Use Screenshots if you want. -->
diff --git a/.github/ISSUE_TEMPLATE/---question.md b/.github/ISSUE_TEMPLATE/---question.md
@@ -0,0 +1,15 @@
+---
+name: "\U0001F4AC Question"
+about: If you need help understanding ocelot.social.
+title: "\U0001F4AC [Question] XXX"
+labels: ''
+assignees: ''
+
+---
+
+<!-- Chat with ocelot.social team -->
+<!-- If you need an answer right away, visit the ocelot.social Discord:
+https://discord.gg/AJSX9DCSUA -->
+
+## 💬 Question
+<!-- Describe your Question in detail. Include screenshots and drawings if needed. -->
diff --git a/.github/ISSUE_TEMPLATE/---refactor.md b/.github/ISSUE_TEMPLATE/---refactor.md
@@ -0,0 +1,11 @@
+---
+name: "\U0001F527 Refactor"
+about: Help us improve our code by refactoring it.
+title: "\U0001F527 [Refactor] XXX"
+labels: enhancement
+assignees: ''
+
+---
+
+## 🔧 Refactor
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      # - 14-new-deployment-with-base-and-code # for testing while developing
+      # - 79-fix-implementation-of-overwriting-locales # for testing while developing
 
 jobs:
   ##############################################################################

diff --git a/LICENSE.md b/LICENSE.md
@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright \(c\) 2021 by the [Ocelot.Social Community](https://github.com/Ocelot-Social-Community)
+Copyright \(c\) 2022 by the [Ocelot.Social Community](https://github.com/Ocelot-Social-Community)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files \(the "Software"\), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -1,22 +1,27 @@
 # Sender.Fm Deploys And Rebrands Ocelot.Social
 
+[![Build Status Publish](https://github.com/sender-fm/Sender-Fm-Ocelot-Social-Deploy-Rebranding/actions/workflows/publish.yml/badge.svg)](https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/actions)
+[![MIT License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/sender-fm/Sender-Fm-Ocelot-Social-Deploy-Rebranding/blob/LICENSE.md)
+[![Discord Channel](https://img.shields.io/discord/489522408076738561.svg)](https://discord.gg/AJSX9DCSUA)
+[![Open Source Helpers](https://www.codetriage.com/sender-fm/sender-fm-deploy-rebranding/badges/users.svg)](https://www.codetriage.com/sender-fm/sender-fm-deploy-rebranding)
+
 This repository is an in use template to rebrand, configure, and deploy [ocelot.social](https://github.com/Ocelot-Social-Community/Ocelot-Social) networks.
 The forked original repository is [Ocelot-Social-Deploy-Rebranding](https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding).
 
-<!-- [![Build Status](https://travis-ci.com/Human-Connection/Human-Connection.svg?branch=master)](https://travis-ci.com/Human-Connection/Human-Connection) -->
-<!-- [![Codecov Coverage](https://img.shields.io/codecov/c/github/Human-Connection/Human-Connection/master.svg?style=flat-square)](https://codecov.io/gh/Human-Connection/Human-Connection/) -->
-<!-- [![MIT License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/Human-Connection/Nitro-Backend/blob/backend/LICENSE.md) -->
-<!-- [![Discord Channel](https://img.shields.io/discord/489522408076738561.svg)](https://discordapp.com/invite/DFSjPaX) -->
-<!-- [![Open Source Helpers](https://www.codetriage.com/human-connection/human-connection/badges/users.svg)](https://www.codetriage.com/human-connection/human-connection) -->
-
+<!-- markdownlint-disable MD033 -->
 <p align="center">
   <img src="branding/static/img/custom/logo-squared.svg" alt="sender.fm" width="40%" height="40%">
 </p>
+<!-- markdownlint-enable MD033 -->
 
-<!--
 ## Live demo
 
-__Try out our deployed [development environment](https://develop.human-connection.org/).__
+__Try out our deployed [development environment](https://stage.ocelot.social).__
+
+Visit our staging networks:
+
+- central staging network: [stage.ocelot.social](https://stage.ocelot.social).
+<!-- - rebranded staging network: [rebrand.ocelot.social](https://stage.ocelot.social). -->
 
 Logins:
 
@@ -25,7 +30,6 @@ Logins:
 | `user@example.org` | 1234 | user |
 | `moderator@example.org` | 1234 | moderator |
 | `admin@example.org` | 1234 | admin |
--->
 
 ## Usage
 
@@ -45,7 +49,7 @@ The next step is:
 
 - [Configure And Branding](/branding/README.md)
 
-### Optional: Proof Configuration And Branding Locally
+### Optional: Locally Testing Configuration And Branding
 
 Just in case you have Docker installed and run the following, you can check your branding locally:
 
@@ -75,7 +79,7 @@ Secondly, in your GitHub repository, click on the 'Settings' tab and go to the '
 1. Named `DOCKERHUB_TOKEN` with the newly created DockerHub token (only the code, not the token name).
 2. Named `DOCKERHUB_USERNAME` with your DockerHub username.
 
-### Optional: Proof DockerHub Images Locally
+### Optional: Locally Testing Your DockerHub Images
 
 Just in case you like to check your pushed Docker images in your organisation's DockerHub repositories locally:
 

diff --git a/TODO-next-update.md b/TODO-next-update.md
@@ -0,0 +1,32 @@
+# Todo For Next Update
+
+When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings …
+
+## This Latest Version >= 1.1.0 with 'ocelotDockerVersionTag' 1.1.0-205
+
+### Deployment/Rebranding PR –  chore: 🍰 Release v1.1.0 - Implement Categories Again #63
+
+- You have to add the `CATEGORIES_ACTIVE` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your prevered value.
+- Make sure the correct categories are in your Neo4j database on the server.
+
+## Version >= 1.0.9 with 'ocelotDockerVersionTag' 1.0.9-199
+
+### Deployment/Rebranding PR – chore: 🍰 Implement PRODUCTION_DB_CLEAN_ALLOW for Staging Production Environments #56
+
+- Copy `PRODUCTION_DB_CLEAN_ALLOW` from `deployment/kubernetes/values.template.yaml` to `values.yaml` and set it to `false` for production envireonments and only for several stage test servers to `true`.
+
+### Deployment/Rebranding PR – chore: [WIP] 🍰 Refine docs, first step #46
+
+- Commit: `Update cert-manager apiVersion "cert-manager.io/v1alpha2" to "cert-manager.io/v1"
+  - Check for `kubectl` and `helm` versions.
+
+## Version >= 1.0.8 with 'ocelotDockerVersionTag' 1.0.8-182
+
+### PR – feat: 🍰 Configure Cookie Expire Time #43
+
+- You have to add the `COOKIE_EXPIRE_TIME` from the `deployment/kubernetes/values.template.yaml` to your `deployment/kubernetes/values.yaml` and set it to your prevered value.
+- Correct `locale` cookie exploration time in data privacy.
+
+## Version 1.0.7 with 'ocelotDockerVersionTag' 1.0.7-171
+
+- No informations.
diff --git a/branding/assets/styles/imports/_branding.scss b/branding/assets/styles/imports/_branding.scss
@@ -0,0 +1,5 @@
+/* 
+    *
+    * Here, all SCSS variables and classes can be adapted to your custom design. 
+    *
+*/
diff --git a/branding/constants/headerMenu.js b/branding/constants/headerMenu.js
@@ -0,0 +1,12 @@
+export default {
+  MENU: [
+    // {
+    //   name: 'Beiträge',
+    //   path: '/#',
+    // },
+    // {
+    //   name: 'Über Yunite',
+    //   url: 'https://yunite.org',
+    // },
+  ],
+}
diff --git a/branding/constants/logos.js b/branding/constants/logos.js
@@ -2,6 +2,7 @@
 // this are the paths in the webapp
 export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
+  LOGO_HEADER_WIDTH: '130px',
   LOGO_SIGNUP_PATH: '/img/custom/logo-squared-player.svg',
   LOGO_WELCOME_PATH: '/img/custom/logo-squared-player.svg',
   LOGO_LOGOUT_PATH: '/img/custom/logo-squared-player.svg',

diff --git a/branding/locales/de.json b/branding/locales/de.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/branding/locales/en.json b/branding/locales/en.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/deployment/kubernetes/DigitalOcean.md b/deployment/kubernetes/DigitalOcean.md
@@ -18,17 +18,17 @@ On the right top you find the button `Create`. Click on it and choose `Kubernete
 - use the latest Kubernetes version
 - choose your datacenter region
 - name your node pool: e.g. `pool-<your-network-name>`
-- 2 `Basic node` with a total of 4GB and 2 shared CPUs are enough to start with
-- no tags necessary
+- `2 Basic nodes` with `2.5 GB RAM (total of 4 GB)`, `2 shared CPUs`, and `80 GB Disk` each is optimal for the beginning
 - set your cluster name: e.g. `cluster-<your-network-name>`
 - select your project
+- no tags necessary
 
 ## Getting Started
 
-After your cluster is set up, see progress bar above, click on `Getting started`. Please install the following management tools:
+After your cluster is set up – see progress bar above – click on `Getting started`. Please install the following management tools:
 
-- [kubectl](https://kubernetes.io/docs/tasks/tools/)
-- [doctl](https://github.com/digitalocean/doctl)
+- [kubectl v1.24.1](https://kubernetes.io/docs/tasks/tools/)
+- [doctl v1.78.0](https://github.com/digitalocean/doctl)
 
 Install the tools as described on the tab or see the links here.
 

diff --git a/deployment/kubernetes/LICENSE b/deployment/kubernetes/LICENSE