Merge branch 'staging' into staging

.github/pull.yml

@@ -0,0 +1,16 @@
+version: "1"
+rules:                                                    # Array of rules
+  - base: staging                                         # Required. Target branch
+    upstream: Ocelot-Social-Community/stage.ocelot.social # Required. Must be in the same fork network.
+    mergeMethod: merge                                    # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: false                                  # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+#   - base: dev
+#     upstream: master        # Required. Can be a branch in the same forked repo.
+#     assignees:              # Optional
+#       - wei
+#     reviewers:              # Optional
+#       - wei
+#     conflictReviewers:      # Optional, on merge conflict assign a reviewer
+#       - wei
+# label: ":arrow_heading_down: pull"  # Optional
+# conflictLabel: "merge-conflict"

branding/assets/styles/imports/_branding.scss

@@ -2,4 +2,164 @@
     *
     * 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(56, 57, 55);
+$color-primary-light: rgb(149, 153, 147);
+$color-primary-dark: rgb(25, 26, 24);
+$color-primary-active: rgb(95, 97, 92);
+$color-primary-inverse: rgb(226, 230, 218);
+
+$color-secondary: rgb(244, 142, 0);
+$color-secondary-active: rgb(255, 172, 23);
+$color-secondary-inverse: rgb(255, 238, 212);
+
+$color-tertiary: rgb(0, 168, 181);
+
+// $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-tertiary;
+
+$color-locale-menu: $color-primary;
+
+$color-donation-bar: $color-secondary;
+
+$color-toast-blue: rgb(0, 142, 230);
+$color-toast-green: $color-secondary;
+
+$chat-message-bg-me: $color-primary-light;
+$chat-message-bg-others: $color-primary-inverse;
+$chat-message-checkmark-seen: $color-secondary;
+$chat-message-checkmark: $text-color-inverse;
+$chat-room-color-counter-badge: $color-primary;
+$chat-room-background-counter-badge: $color-secondary;
+
+/* "a" link colors */
+a {
+  color: $color-primary;
+}
+a:hover {
+  color: $color-primary-light;
+}
+
+/* ds-menu-item link colors */
+a:hover.ds-menu-item-link {
+  color: $color-secondary;
+}
+.ds-menu-item-link.router-link-exact-active {
+  color: $color-secondary;
+  border-left-color: $color-secondary;
+}
+
+.v-popover.open .trigger a {
+  color: $color-secondary;
+}
+
+.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: $color-secondary !important;
+}
+
+.main-navigation .locale-menu {
+  color: #fff;
+}
+
+.main-navigation .base-button {
+  color: #fff;
+}
+
+// #nav-search-box .hc-hashtag a {
+.hc-hashtag a {
+  color: $color-secondary;
+}
+.hc-hashtag a:hover {
+  color: $color-secondary-active;
+}
+
+#footer {
+  background-color: $color-tertiary;
+}
+#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-secondary;
+// }
+
+/* chips on group profile */
+// .group-profile .ds-chip-primary {
+//   background-color: $color-secondary;
+// }
+
+/* chips with primary color */
+.ds-chip-primary {
+  background-color: $color-secondary;
+}
+
+/* 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 {
+/* ds-button with primary color */
+.ds-button-primary {
+  background-color: $color-primary;
+}
+
+/* color of active filter tags in post teaser */
+span.category-tag.filterActive {
+  background-color: $color-primary;
+}

branding/constants/donation.js

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

branding/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: '[email protected]',
-  MODERATION_EMAIL: '[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://ocelot.social',
-  SUPPORT_LINK: 'https://ocelot.social',
+  ORGANIZATION_LINK: 'https://reformer.network/organization',
+  SUPPORT_LINK: 'https://reformer.network/support',
 }

branding/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 = 10 // with removed HTML tags
 export const SHOW_GROUP_BUTTON_IN_HEADER = true

branding/constants/links.js

@@ -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,10 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 })
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // if defined it's dominating
-  externalLink: {
-    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'https://busfaktor.org/en/spenden',
-    target: '_blank',
-  },
+  // externalLink: {
+  //   url: 'https://ocelot.social/en/donate/',
+  //   target: '_blank',
+  // },
 
   internalPage: {
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
@@ -39,11 +38,10 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   // if defined it's dominating
-  externalLink: {
-    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'http://ocelot.social/en/impressum',
-    target: '_blank',
-  },
+  // externalLink: {
+  //   url: 'http://ocelot.social/en/imprint/',
+  //   target: '_blank',
+  // },
 
   internalPage: {
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
@@ -109,10 +107,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/en/contact/',
+  //   target: '_blank',
+  // },
 
   internalPage: {
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used
@@ -126,7 +124,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
 })
 
 export default {
-  LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+  LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
 
   // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
@@ -144,9 +142,9 @@ export default {
     TERMS_AND_CONDITIONS,
     CODE_OF_CONDUCT,
     DATA_PRIVACY,
-    FAQ,
     DONATE,
-    IMPRINT,
+    FAQ,
     SUPPORT,
+    IMPRINT,
   ],
 }

branding/constants/logos.js

@@ -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: '260px',
   LOGO_HEADER_CLICK: {
     // externalLink: {
     //   url: 'https://ocelot.social',

branding/constants/metadata.js

@@ -1,9 +1,10 @@
 // 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_DESCRIPTION: 'Ocelot Social Community',
-  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'busFaktor e.V.',
-  ORGANIZATION_JURISDICTION: 'Deutschland',
+  APPLICATION_NAME: 'Reformer.network',
+  APPLICATION_SHORT_NAME: 'Reformer.network',
+  APPLICATION_DESCRIPTION: 'Reformer.network, social network',
+  COOKIE_NAME: 'reformer-network-token',
+  ORGANIZATION_NAME: 'Stichting Rudulin',
+  ORGANIZATION_JURISDICTION: 'Amsterdam',
+  THEME_COLOR: 'rgb(56, 57, 55)', // $color-primary – as the main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case
 }