Revert "Set Yunite rebranding"

This reverts commit 2635907ac71320b64a33121c412267662d5e9eb9.

# Conflicts:
#	webapp/assets/styles/imports/_branding.scss

webapp/assets/styles/imports/_branding.scss

@@ -2,122 +2,4 @@
     *
     * Here, all SCSS variables and classes can be adapted to your custom design. 
     *
-*/
+*/
- 
-@font-face {
-  font-family: Overpass;
-  src: url('~@/assets/fonts/Overpass-VariableFont_wght.ttf');
-}
-
-$color-primary: rgb(110, 139, 135);
-$color-primary-light: rgb(161, 179, 177);
-$color-primary-dark: rgb(81, 99, 97);
-$color-primary-active: rgb(123, 160, 149);
-$color-primary-inverse: rgb(241, 248, 243);
-
-$color-secondary: rgb(166, 255, 0);
-$color-secondary-active: rgb(188, 255, 130);
-$color-secondary-inverse: rgb(241, 255, 225);
-
-$font-family-heading: 'Overpass',Helvetica,Arial,Lucida,sans-serif;
-$font-family-text: 'Overpass',Helvetica,Arial,Lucida,sans-serif;
-
-$color-header-background: $color-primary;
-$color-footer-background: $color-secondary;
-
-$color-locale-menu: $color-secondary;
-
-$color-donation-bar: $color-secondary;
-
-$color-toast-blue: rgb(0, 142, 230);
-$color-toast-green: $color-primary;
-
-
-.main-navigation a {
-  color: #fff;
-  text-transform: uppercase;
-  font-size: 16px;
-  font-weight: 500;
-}
-.main-navigation a:hover {
-  color: hsla(0,0%,100%,.8);
-}
-.main-navigation .router-link-exact-active { 
-  color:  #A6FF00!important;
-}
-
-.main-navigation .locale-menu {
-  color: #fff;
-}
-
-.main-navigation .base-button {
-  color: #fff;
-}
-
-#nav-search-box .hc-hashtag a{
-  color: #17b53f;
-}
-
-#footer {
-  background-color: $color-secondary;
-}
-
-#footer a {
-  color: $color-primary;
-}
-
-.avatar-menu .profile-avatar {
-  color: $color-primary;
-}
-
-.profile-avatar .initials {
-  color: $color-primary;
-}
-
-.branding-menu .ds-text {
-  font-family: 'Overpass',Helvetica,Arial,Lucida,sans-serif;
-  font-weight: 500;
-  text-transform: uppercase;
-  font-size: 16px;
-}
-
-/* avoid uppercase for user slug */
-span.slug {
-  text-transform: none;
-}
-    
-.ds-footer {
-  font-family: 'Overpass',Helvetica,Arial,Lucida,sans-serif;
-  text-transform: uppercase;
-  font-size: 16px;
-  font-weight: 300;
-}
-
-/* chips on group teaser */
-a.group-teaser footer .ds-chip-primary {
-  background-color: $color-primary;
-}
-/* chips on group profile */
-.group-profile .ds-chip-primary {
-  background-color: $color-primary;
-}
-
-/* number count color */
-div.ds-number > p.ds-number-count {
-  color: $color-primary;
-}
-
-/* active tab border bottom color */
-div.tab-navigation li.Tabs__tab {
-  border-bottom-color: $color-primary;
-}
-
-/* submit button color group form */
-form.group-form button.ds-button-primary {
-  background-color: $color-primary;
-}
-
-/* color of active filter tags in post teaser */
-span.category-tag.filterActive {
-  background-color: $color-primary;
-}

webapp/constants/donation.js

@@ -1 +1 @@
-export const PROGRESS_BAR_COLOR_TYPE = 'uni' // 'gradient' is the other option
+export const PROGRESS_BAR_COLOR_TYPE = 'gradient' // 'uni' is the other option

webapp/constants/emails.js

@@ -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: 'support@yunite.org',
+  SUPPORT_EMAIL: 'devops@ocelot.social',
-  MODERATION_EMAIL: 'hello@yunite.org',
+  MODERATION_EMAIL: 'devops@ocelot.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://yunite.org',
+  ORGANIZATION_LINK: 'https://ocelot.social',
-  SUPPORT_LINK: 'https://yunite.org',
+  SUPPORT_LINK: 'https://ocelot.social',
 }

webapp/constants/groups.js

@@ -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 = 50 // with removed HTML tags
-export const SHOW_GROUP_BUTTON_IN_HEADER = false
+export const SHOW_GROUP_BUTTON_IN_HEADER = true

webapp/constants/headerMenu.js

@@ -1,22 +1,13 @@
 export default {
   MENU: [
-    {
+    // {
-      nameIdent: 'yuniteRebranding.header.newsFeed',
+    //   nameIdent: 'nameIdent',
-      path: '/',
+    //   path: '/',
-    },
+    // },
-    {
+    // {
-      nameIdent: 'yuniteRebranding.header.groups',
+    //   nameIdent: 'nameIdent',
-      path: '/groups',
+    //   url: 'https://ocelot.social',
-    },
+    //   target: '_blank',
-    {
+    // },
-      nameIdent: 'yuniteRebranding.header.topics',
-      url: 'https://yunite.org/themen/',
-      target: '',
-    },
-    {
-      nameIdent: 'yuniteRebranding.header.about',
-      url: 'https://yunite.org',
-      target: '',
-    },
   ],
 }

webapp/constants/links.js

@@ -5,8 +5,8 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
   // if defined it's dominating
   externalLink: {
-    url: 'https://yunite.org',
+    url: 'https://ocelot.social',
-    target: '',
+    target: '_blank',
   },
 
   internalPage: {
@@ -22,8 +22,9 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // if defined it's dominating
   externalLink: {
-    url: 'https://yunite.org/spenden/',
+    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    target: '',
+    url: 'https://ocelot-social.herokuapp.com/donations',
+    target: '_blank',
   },
 
   internalPage: {
@@ -33,24 +34,24 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
-  // if defined it's dominating
   externalLink: {
-    url: 'https://yunite.org/impressum/',
+    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    target: '',
+    url: 'https://ocelot-social.herokuapp.com/imprint',
+    target: '_blank',
   },
 
   internalPage: {
-    footerIdent: 'yuniteRebranding.footer.imprint', // localized string identifier, if undefined default is used
+    // 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/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
@@ -63,15 +64,11 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
-  // if defined it's dominating
+  // externalLink: null, // if defined it's dominating
-  externalLink: {
-    url: 'https://yunite.org/ueber-yunite/unsere-werte/',
-    target: '',
-  },
 
   internalPage: {
     // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
@@ -80,32 +77,24 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
-  // if defined it's dominating
+  // externalLink: null, // if defined it's dominating
-  externalLink: {
-    url: 'https://yunite.org/datenschutz/',
-    target: '',
-  },
 
   internalPage: {
-    footerIdent: 'yuniteRebranding.footer.dataPrivacy', // localized string identifier, if undefined default is used
+    // 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/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  // if defined it's dominating
+  // externalLink: null, // if defined it's dominating
-  externalLink: {
-    url: 'https://yunite.org/ueber-yunite/faq-hilfe/',
-    target: '',
-  },
 
   internalPage: {
     // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
@@ -114,14 +103,14 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
   // if defined it's dominating
   externalLink: {
-    url: 'https://yunite.org/ueber-yunite/faq-hilfe/',
+    url: 'https://ocelot.social',
-    target: '',
+    target: '_blank',
   },
 
   internalPage: {
@@ -131,7 +120,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 
@@ -150,13 +139,13 @@ export default {
   SUPPORT,
 
   FOOTER_LINK_LIST: [
-    // ORGANIZATION,
+    ORGANIZATION,
-    // TERMS_AND_CONDITIONS,
+    TERMS_AND_CONDITIONS,
-    // CODE_OF_CONDUCT,
+    CODE_OF_CONDUCT,
     DATA_PRIVACY,
-    // FAQ,
+    FAQ,
-    // DONATE,
+    DONATE,
-    // SUPPORT,
+    SUPPORT,
     IMPRINT,
   ],
 }

webapp/constants/logos.js

@@ -2,13 +2,19 @@
 // this are the paths in the webapp
 export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
-  LOGO_HEADER_WIDTH: '47px',
+  LOGO_HEADER_WIDTH: '130px',
   LOGO_HEADER_CLICK: {
-    externalLink: {
+    // externalLink: {
-      url: 'https://yunite.org',
+    //   url: 'https://ocelot.social',
-      target: '',
+    //   target: '_blank',
+    // },
+    externalLink: null,
+    internalPath: {
+      to: {
+        name: 'index',
+      },
+      scrollTo: '.main-navigation',
     },
-    internalPath: null,
   },
   LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',
   LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg',

webapp/constants/metadata.js

@@ -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: 'yunite.me',
+  APPLICATION_NAME: 'ocelot.social',
-  APPLICATION_SHORT_NAME: 'yunite.me',
+  APPLICATION_SHORT_NAME: 'ocelot.social',
-  APPLICATION_DESCRIPTION: 'yunite.me – Alternatives Netzwerk für eine freie und bunte Zukunft',
+  APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
-  COOKIE_NAME: 'yunite-me-token',
+  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'yunite – Verein für Vernetzung und Kooperation',
+  ORGANIZATION_NAME: 'ocelot.social Community',
-  ORGANIZATION_JURISDICTION: 'Switzerland',
+  ORGANIZATION_JURISDICTION: 'City of Angels',
 }

webapp/locales/de.json

@@ -1002,17 +1002,5 @@
     "newTermsAndConditions": "Neue Nutzungsbedingungen",
     "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.",
     "termsAndConditionsNewConfirmText": "Bitte lies Dir die neuen Nutzungsbedingungen jetzt durch!"
-  },
-  "yuniteRebranding": {
-    "header": {
-      "about": "Über Yunite",
-      "groups": "Gruppen",
-      "newsFeed": "Beiträge",
-      "topics": "Themen"
-    },
-    "footer": {
-      "dataPrivacy": "Datenschutz",
-      "imprint": "Impressum"
-    }
   }
 }

webapp/locales/en.json

@@ -1002,17 +1002,5 @@
     "newTermsAndConditions": "New Terms and Conditions",
     "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.",
     "termsAndConditionsNewConfirmText": "Please read the new terms of use now!"
-  },
-  "yuniteRebranding": {
-    "header": {
-      "about": "About Yunite",
-      "groups": "Groups",
-      "newsFeed": "News Feed",
-      "topics": "Topics"
-    },
-    "footer": {
-      "dataPrivacy": "Data privacy",
-      "imprint": "Imprint"
-    }
   }
 }