Merge branch 'master' into 5059-epic-groups

webapp/constants/logos.js

@@ -3,6 +3,15 @@
 export default {
   LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
   LOGO_HEADER_WIDTH: '130px',
+  LOGO_HEADER_CLICK: {
+    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',

webapp/layouts/default.vue

@@ -5,7 +5,17 @@
         <div>
           <ds-flex class="main-navigation-flex">
             <ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
-              <nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
+              <a
+                v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
+                :href="LOGOS.LOGO_HEADER_CLICK.externalLink"
+              >
+                <logo logoType="header" />
+              </a>
+              <nuxt-link
+                v-else
+                :to="LOGOS.LOGO_HEADER_CLICK.internalPath.to"
+                v-scroll-to="LOGOS.LOGO_HEADER_CLICK.internalPath.scrollTo"
+              >
                 <logo logoType="header" />
               </nuxt-link>
             </ds-flex-item>
@@ -107,33 +117,33 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import Logo from '~/components/Logo/Logo'
 import { SHOW_GROUP_BUTTON_IN_HEADER } from '~/constants/groups.js'
-import headerMenu from '~/constants/headerMenu.js'
-import LOGOS from '~/constants/logos.js'
+import LOGOS from '../constants/logos.js'
+import headerMenu from '../constants/headerMenu.js'
 import seo from '~/mixins/seo'
-import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
-import SearchField from '~/components/features/SearchField/SearchField.vue'
-import Modal from '~/components/Modal'
 import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
 import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
-import GroupButton from '~/components/Group/GroupButton'
 import InviteButton from '~/components/InviteButton/InviteButton'
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+import Logo from '~/components/Logo/Logo'
+import SearchField from '~/components/features/SearchField/SearchField.vue'
+import Modal from '~/components/Modal'
+import GroupButton from '~/components/Group/GroupButton'
 import NotificationMenu from '~/components/NotificationMenu/NotificationMenu'
 import PageFooter from '~/components/PageFooter/PageFooter'
 
 export default {
   components: {
-    Logo,
-    LocaleSwitch,
-    SearchField,
-    Modal,
-    NotificationMenu,
     AvatarMenu,
     FilterMenu,
-    PageFooter,
     InviteButton,
+    LocaleSwitch,
+    Logo,
+    Modal,
+    NotificationMenu,
+    PageFooter,
     GroupButton,
+    SearchField,
   },
   mixins: [seo],
   data() {

webapp/pages/index.vue

@@ -8,7 +8,7 @@
       <ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
         <donation-info :goal="goal" :progress="progress" />
       </ds-grid-item>
-      <!-- newsfeed -->
+      <!-- news feed -->
       <template v-if="hasResults">
         <masonry-grid-item
           v-for="post in posts"