cleanup refactor rebranding

Ocelot-Social-Community · Sep 22, 2022 · 5f5c0fa · 5f5c0fa
1 parent 0293fec
commit 5f5c0fa
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 65 deletions.
diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue
@@ -59,7 +59,7 @@ export default {
   },
   data() {
     const logosObject = {
-      header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: '47px' },
+      header: { path: logos.LOGO_HEADER_PATH, alt: 'Header', widthDefault: logos.LOGO_HEADER_WIDTH },
       welcome: { path: logos.LOGO_WELCOME_PATH, alt: 'Welcome', widthDefault: '200px' },
       #: { path: logos.LOGO_#_PATH, alt: '#', widthDefault: '200px' },
       logout: { path: logos.LOGO_LOGOUT_PATH, alt: 'Logging Out', widthDefault: '200px' },
@@ -90,6 +90,9 @@ export default {
       return `width: ${width};`
     },
   },
+  created() {
+    console.log('logoWidth', this.logoWidth)
+  },
 }
 </script>
 
@@ -107,7 +110,6 @@ export default {
 }
 
 .ds-logo-svg {
-  width: 47px;
   height: auto;
   fill: #000000;
 }

diff --git a/webapp/components/Logo/style.scss b/webapp/components/Logo/style.scss
@@ -8,10 +8,4 @@
 
 .ds-logo-inverse {
   color: $text-color-primary-inverse;
-}
-
-.ds-logo-svg {
-  width: 47px;
-  height: auto;
-  fill: currentColor;
 }
diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js
@@ -1,36 +1,13 @@
 export default {
-  SHOW_HEADER_MENU: true,
   MENU: [
-    {
-      name: 'Beiträge',
-      path: '/#',
-    },
     // {
-    // name: 'Themen',
-    // path: '/#',
-    // },
-    // {
-    //   name: 'Gruppen',
+    //   name: 'Beiträge',
     //   path: '/#',
     // },
-    {
-      name: 'Über Yunite',
-      path: '/#',
-      url: 'https://yunite.org',
-      // children: [
-      // {
-      // name: 'Impressum',
-      // path: '/#',
-      // },
-      // {
-      // name: 'Yunite Team',
-      // path: '/#',
-      // },
-      // ],
-    },
     // {
-    //   name: 'Topic',
+    //   name: 'Über Yunite',
     //   path: '/#',
+    //   url: 'https://yunite.org',
     // },
   ],
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
@@ -3,7 +3,7 @@
 import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
-  externalLink: 'https://yunite.org', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.made', // localized string identifier, if undefined default is used
@@ -17,7 +17,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 })
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: 'https://yunite.org/brand-guidelines/', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
@@ -31,7 +31,7 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: 'https://yunite.org/impressum/', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
@@ -57,7 +57,7 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri
   },
 })
 const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
-  externalLink: 'https://yunite.org/ueber-yunite/unsere-werte/', // if string is defined and not empty 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
@@ -70,7 +70,7 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
   },
 })
 const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
-  externalLink: 'https://yunite.org/datenschutz/', // if string is defined and not empty 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
@@ -83,7 +83,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
   },
 })
 const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  externalLink: 'https://yunite.org/ueber-yunite/faq-hilfe/', // if string is defined and not empty 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
@@ -125,12 +125,12 @@ export default {
 
   FOOTER_LINK_LIST: [
     ORGANIZATION,
-    // TERMS_AND_CONDITIONS,
+    TERMS_AND_CONDITIONS,
     CODE_OF_CONDUCT,
     DATA_PRIVACY,
     FAQ,
-    // DONATE,
-    // SUPPORT,
+    DONATE,
+    SUPPORT,
     IMPRINT,
   ],
 }
diff --git a/webapp/constants/logos.js b/webapp/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_#_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/webapp/layouts/default.vue b/webapp/layouts/default.vue
@@ -4,7 +4,7 @@
       <ds-container class="main-navigation-container" style="padding: 10px 10px">
         <div>
           <ds-flex class="main-navigation-flex">
-            <ds-flex-item :width="{ base: '47px' }" style="margin-right: 20px">
+            <ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
               <nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
                 <logo logoType="header" />
               </nuxt-link>
@@ -47,8 +47,8 @@
               :width="{
                 base: '45%',
                 sm: '45%',
-                md: show ? 'auto' : '45%',
-                lg: show ? 'auto' : '50%',
+                md: isHeaderMenu ? 'auto' : '45%',
+                lg: isHeaderMenu ? 'auto' : '50%',
               }"
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
               style="flex-shrink: 0; flex-grow: 1"
@@ -113,6 +113,7 @@
 
 <script>
 import Logo from '~/components/Logo/Logo'
+import LOGOS from '../constants/logos.js'
 import headerMenu from '../constants/headerMenu.js'
 import { mapGetters } from 'vuex'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
@@ -142,7 +143,8 @@ export default {
   mixins: [seo],
   data() {
     return {
-      show: headerMenu.SHOW_HEADER_MENU,
+      LOGOS,
+      isHeaderMenu: headerMenu.MENU.length > 0,
       menu: headerMenu.MENU,
       mobileSearchVisible: false,
       toggleMobileMenu: false,