From 942adc09c68782415b24649132cefde19c5b8292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 22 Oct 2024 21:33:09 +0200 Subject: [PATCH] Set first config and branding --- backend/src/config/emails.ts | 8 +- backend/src/config/logos.ts | 16 ++- backend/src/config/metadata.ts | 14 +- backend/src/constants/groups.ts | 7 +- webapp/assets/styles/imports/_branding.scss | 130 ++++++++++++++++++- webapp/constants/donation.js | 2 +- webapp/constants/emails.js | 8 +- webapp/constants/groups.js | 3 +- webapp/constants/links.js | 53 ++++---- webapp/constants/logos.js | 2 +- webapp/constants/metadata.js | 12 +- webapp/static/img/custom/logo-horizontal.svg | 110 ++++++++-------- webapp/static/img/custom/logo-squared.svg | 112 ++++++++-------- 13 files changed, 309 insertions(+), 168 deletions(-) diff --git a/backend/src/config/emails.ts b/backend/src/config/emails.ts index 34daaecb0..da0d04790 100644 --- a/backend/src/config/emails.ts +++ b/backend/src/config/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: 'devops@ocelot.social', - MODERATION_EMAIL: 'devops@ocelot.social', + SUPPORT_EMAIL: 'support@reformer.network', + MODERATION_EMAIL: 'support@reformer.network', // 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', } diff --git a/backend/src/config/logos.ts b/backend/src/config/logos.ts index 41b83b30c..78b66d124 100644 --- a/backend/src/config/logos.ts +++ b/backend/src/config/logos.ts @@ -1,7 +1,21 @@ -// this file is duplicated in `backend/src/config/logos` and `webapp/constants/logos.js` and replaced on rebranding +// this file is duplicated in `backend/src/config/logos.js` and `webapp/constants/logos.js` and replaced on rebranding // this are the paths in the webapp export default { LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg', + LOGO_HEADER_WIDTH: '260px', + LOGO_HEADER_CLICK: { + // externalLink: { + // url: 'https://ocelot.social', + // target: '_blank', + // }, + externalLink: null, + internalPath: { + to: { + name: 'index', + }, + scrollTo: '.main-navigation', + }, + }, LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg', LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg', LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg', diff --git a/backend/src/config/metadata.ts b/backend/src/config/metadata.ts index 282fcb655..5e1088019 100644 --- a/backend/src/config/metadata.ts +++ b/backend/src/config/metadata.ts @@ -1,9 +1,9 @@ -// this file is duplicated in `backend/src/config/metadata` and `webapp/constants/metadata.js` and replaced on rebranding +// 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', - APPLICATION_DESCRIPTION: 'ocelot.social Community Network', - COOKIE_NAME: 'ocelot-social-token', - ORGANIZATION_NAME: 'ocelot.social Community', - ORGANIZATION_JURISDICTION: 'City of Angels', + 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', } diff --git a/backend/src/constants/groups.ts b/backend/src/constants/groups.ts index 6300afa35..af2156126 100644 --- a/backend/src/constants/groups.ts +++ b/backend/src/constants/groups.ts @@ -1,3 +1,6 @@ -// this file is duplicated in `backend/src/constants/group` and `webapp/constants/group.js` -export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3 // with removed HTML tags +// 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 = 10 // with removed HTML tags export const DESCRIPTION_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags +export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/webapp/assets/styles/imports/_branding.scss b/webapp/assets/styles/imports/_branding.scss index 75058595d..401ce885e 100644 --- a/webapp/assets/styles/imports/_branding.scss +++ b/webapp/assets/styles/imports/_branding.scss @@ -2,4 +2,132 @@ * * Here, all SCSS variables and classes can be adapted to your custom design. * -*/ \ No newline at end of file +*/ + +// @font-face { +// font-family: Overpass; +// src: url('~@/assets/fonts/Overpass-VariableFont_wght.ttf'); +// } + +$color-primary: rgb(56, 57, 55); +$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(0, 168, 181); +$color-secondary-active: rgb(188, 255, 130); +$color-secondary-inverse: rgb(241, 255, 225); + +$color-tertiary: rgb(244, 142, 0); + +// $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-tertiary; + +$color-toast-blue: rgb(0, 142, 230); +$color-toast-green: $color-tertiary; + +$chat-message-bg-me: $color-primary-light; +$chat-message-checkmark-seen: $color-tertiary; +$chat-message-checkmark: $text-color-inverse; +$chat-room-color-counter-badge: $color-tertiary; +$chat-room-background-counter-badge: $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-tertiary !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-tertiary; +} + +/* chips on group profile */ +.group-profile .ds-chip-primary { + background-color: $color-tertiary; +} + +/* 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; +} \ No newline at end of file diff --git a/webapp/constants/donation.js b/webapp/constants/donation.js index 3e36ae9a8..ac07b2e74 100644 --- a/webapp/constants/donation.js +++ b/webapp/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 diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js index 34daaecb0..da0d04790 100644 --- a/webapp/constants/emails.js +++ b/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: 'devops@ocelot.social', - MODERATION_EMAIL: 'devops@ocelot.social', + SUPPORT_EMAIL: 'support@reformer.network', + MODERATION_EMAIL: 'support@reformer.network', // 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', } diff --git a/webapp/constants/groups.js b/webapp/constants/groups.js index 029f492e0..af2156126 100644 --- a/webapp/constants/groups.js +++ b/webapp/constants/groups.js @@ -1,5 +1,6 @@ // 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 = 3 // with removed HTML tags +export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 10 // with removed HTML tags +export const DESCRIPTION_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/webapp/constants/links.js b/webapp/constants/links.js index a252b98cd..e702bad91 100644 --- a/webapp/constants/links.js +++ b/webapp/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 @@ -16,15 +16,15 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ // if defined it's dominating - externalLink: { - 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 @@ -33,14 +33,15 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ - externalLink: { - url: 'http://ocelot.social/en/impressum', - target: '_blank', - }, + // if defined it's dominating + // externalLink: { + // url: 'http://ocelot.social/en/imprint/', + // target: '_blank', + // }, internalPage: { // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used @@ -49,7 +50,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({ @@ -62,7 +63,7 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ @@ -75,7 +76,7 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ @@ -88,7 +89,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const FAQ = defaultPageParamsPages.FAQ.overwrite({ @@ -101,15 +102,15 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) 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 @@ -118,12 +119,12 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) 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/ @@ -141,8 +142,8 @@ export default { TERMS_AND_CONDITIONS, CODE_OF_CONDUCT, DATA_PRIVACY, - FAQ, DONATE, + FAQ, SUPPORT, IMPRINT, ], diff --git a/webapp/constants/logos.js b/webapp/constants/logos.js index 714e78a2c..78b66d124 100644 --- a/webapp/constants/logos.js +++ b/webapp/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', diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js index da313c7fb..5e1088019 100644 --- a/webapp/constants/metadata.js +++ b/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: 'ocelot.social', - APPLICATION_SHORT_NAME: 'ocelot.social', - APPLICATION_DESCRIPTION: 'ocelot.social Community Network', - COOKIE_NAME: 'ocelot-social-token', - ORGANIZATION_NAME: 'ocelot.social Community', - ORGANIZATION_JURISDICTION: 'City of Angels', + 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', } diff --git a/webapp/static/img/custom/logo-horizontal.svg b/webapp/static/img/custom/logo-horizontal.svg index 4121fa08e..b60179c3f 100644 --- a/webapp/static/img/custom/logo-horizontal.svg +++ b/webapp/static/img/custom/logo-horizontal.svg @@ -1,63 +1,61 @@ - - - - - - - - - - - - - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/logo-squared.svg b/webapp/static/img/custom/logo-squared.svg index 2a926f0a9..5b2914d50 100644 --- a/webapp/static/img/custom/logo-squared.svg +++ b/webapp/static/img/custom/logo-squared.svg @@ -1,65 +1,61 @@ - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +