Skip to content

Commit

Permalink
Initialize branding
Browse files Browse the repository at this point in the history
  • Loading branch information
Tirokk committed Jan 23, 2025
1 parent 1b67fc5 commit ba0644b
Show file tree
Hide file tree
Showing 14 changed files with 172 additions and 153 deletions.
8 changes: 4 additions & 4 deletions backend/src/config/emails.ts
Original file line number Diff line number Diff line change
@@ -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://changemedia.club',
SUPPORT_LINK: 'https://changemedia.club/impressum',
}
5 changes: 4 additions & 1 deletion backend/src/constants/groups.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// this file is duplicated in `backend/src/constants/group` and `webapp/constants/group.js`
// 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_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags
export const SHOW_GROUP_BUTTON_IN_HEADER = true
8 changes: 4 additions & 4 deletions webapp/constants/emails.js
Original file line number Diff line number Diff line change
@@ -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://changemedia.club',
SUPPORT_LINK: 'https://changemedia.club/impressum',
}
1 change: 1 addition & 0 deletions webapp/constants/groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
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_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags
export const SHOW_GROUP_BUTTON_IN_HEADER = true
18 changes: 9 additions & 9 deletions webapp/constants/headerMenu.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
export default {
MENU: [
// {
// nameIdent: 'nameIdent',
// path: '/',
// },
// {
// nameIdent: 'nameIdent',
// url: 'https://ocelot.social',
// target: '_blank',
// },
{
nameIdent: 'changemediaRebranding.header.newsFeed',
path: '/',
},
{
nameIdent: 'changemediaRebranding.header.about',
url: 'https://changemedia.club',
// target: '_blank',
},
],
}
55 changes: 28 additions & 27 deletions webapp/constants/links.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'

const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
// if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating
externalLink: {
url: 'https://ocelot.social',
target: '_blank',
url: 'https://changemedia.club',
target: '',
},

internalPage: {
// footerIdent: 'site.made', // localized string identifier, if undefined default is used
// headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
// headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used
headlineIdent: null, // 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 'webapp/locales/html/'
// in case internal page content is here 'branding/locales/html/'
},
})
const DONATE = defaultPageParamsPages.DONATE.overwrite({
// if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating
externalLink: {
url: 'https://busfaktor.org/en/spenden',
url: 'https://ko-fi.com/changemedia',
target: '_blank',
},

Expand All @@ -33,13 +33,14 @@ 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: null, // if string is defined and not empty it's dominating
externalLink: {
url: 'http://ocelot.social/en/impressum',
target: '_blank',
url: 'https://changemedia.club/impressum',
target: '',
},

internalPage: {
Expand All @@ -49,11 +50,11 @@ 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({
// externalLink: null, // if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating

internalPage: {
// footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
Expand All @@ -62,11 +63,11 @@ 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({
// externalLink: null, // if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating

internalPage: {
// footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
Expand All @@ -75,11 +76,11 @@ 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({
// externalLink: null, // if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating

internalPage: {
// footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
Expand All @@ -88,11 +89,11 @@ 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({
// externalLink: null, // if defined it's dominating
// externalLink: null, // if string is defined and not empty it's dominating

internalPage: {
// footerIdent: 'site.faq', // localized string identifier, if undefined default is used
Expand All @@ -101,14 +102,14 @@ 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: null, // if string is defined and not empty it's dominating
externalLink: {
url: 'https://ocelot.social',
target: '_blank',
url: 'https://changemedia.club/impressum',
target: '',
},

internalPage: {
Expand All @@ -118,7 +119,7 @@ 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/'
},
})

Expand All @@ -138,12 +139,12 @@ export default {

FOOTER_LINK_LIST: [
ORGANIZATION,
TERMS_AND_CONDITIONS,
CODE_OF_CONDUCT,
DATA_PRIVACY,
// TERMS_AND_CONDITIONS,
// CODE_OF_CONDUCT,
// DATA_PRIVACY,
FAQ,
DONATE,
SUPPORT,
IMPRINT,
SUPPORT,
],
}
6 changes: 6 additions & 0 deletions webapp/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
}
}
},
"changemediaRebranding": {
"header": {
"about": "Club",
"newsFeed": "Beiträge"
}
},
"chat": {
"addRoomHeadline": "Suche Nutzer für neuen Chat",
"cancelSelectMessage": "Abbrechen",
Expand Down
6 changes: 6 additions & 0 deletions webapp/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
}
}
},
"changemediaRebranding": {
"header": {
"about": "Club",
"newsFeed": "News Feed"
}
},
"chat": {
"addRoomHeadline": "Search User for new Chat",
"cancelSelectMessage": "Cancel",
Expand Down
21 changes: 13 additions & 8 deletions webapp/locales/html/de/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,29 @@

<div class="info-page">
<h2>
Für das soziale Netzwerk Ocelot.Social für Entwickler
Wie bediene ich unser Netzwerk?
</h2>
<h3>
<!-- <h3>
Wie bediene ich dieses Netzwerk?
</h3>
</h3> -->
<p>
Hier findest Du die
<a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >Bedienungsanleitung</a>.<br>
<a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank">Bedienungsanleitung</a>.<br>
</p>
<h3>
<!-- <h3>
Betreiberspezifische FAQs
</h3>
<p>
Hier steht was zu den betreiberspezifischen FAQs.
</p>
</p> -->
</div>

<style type="text/css">
@font-face {
font-family: 'AccordAlt-Bold';
src: url('/sender-fm/fonts/AccordAlt_Bold.otf') format('opentype');
}

.info-page {
margin-bottom: 48px;
}
Expand Down Expand Up @@ -50,7 +55,7 @@ <h3>
background-color: #fff;
border: 1px solid #e0dede;
border-collapse: collapse;
box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
box-shadow: 0 1px 3px rgba(0, 0, 0, .08), inset 0 0 0 1px rgba(255, 255, 255, .5);
margin: 16px 0;
max-width: 100%;
}
Expand All @@ -64,4 +69,4 @@ <h3>
border: 1px solid #e0dede;
padding: 10px;
}
</style>
</style>
21 changes: 13 additions & 8 deletions webapp/locales/html/en/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,29 @@

<div class="info-page">
<h2>
For the social network Ocelot.Social for Developers
How do I operate our network?
</h2>
<h3>
<!-- <h3>
How do I operate this network?
</h3>
</h3> -->
<p>
Here you can find the
<a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >user manual</a>.<br>
<a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank">user manual</a>.<br>
</p>
<h3>
<!-- <h3>
Operator-Specific FAQs
</h3>
<p>
Here are the operator-specific FAQs.
</p>
</p> -->
</div>

<style type="text/css">
@font-face {
font-family: 'AccordAlt-Bold';
src: url('/sender-fm/fonts/AccordAlt_Bold.otf') format('opentype');
}

.info-page {
margin-bottom: 48px;
}
Expand Down Expand Up @@ -50,7 +55,7 @@ <h3>
background-color: #fff;
border: 1px solid #e0dede;
border-collapse: collapse;
box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
box-shadow: 0 1px 3px rgba(0, 0, 0, .08), inset 0 0 0 1px rgba(255, 255, 255, .5);
margin: 16px 0;
max-width: 100%;
}
Expand All @@ -64,4 +69,4 @@ <h3>
border: 1px solid #e0dede;
padding: 10px;
}
</style>
</style>
Binary file modified webapp/static/favicon.ico
Binary file not shown.
Binary file modified webapp/static/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ba0644b

Please sign in to comment.