js/src/components/NavBar.vue

@@ -7,8 +7,8 @@
     <template slot="brand">
       <b-navbar-item
         tag="router-link"
-        :to="{ name: RouteName.HOME }"
         :aria-label="$t('Home')"
+        :to="{ name: RouteName.HOME }"
       >
         <img
           src="/img/long_logo_chapril_mobilizon.png"
@@ -18,6 +18,22 @@
       </b-navbar-item>
     </template>
     <template slot="start">
+<<<<<<< HEAD
+      <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }"
+        >{{ $t("Explore") }}
+      </b-navbar-item>
+      <b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }"
+        >{{ $t("My events") }}
+      </b-navbar-item>
+      <b-navbar-item
+        tag="router-link"
+        :to="{ name: RouteName.MY_GROUPS }"
+        v-if="config && config.features.groups"
+        >{{ $t("My groups") }}
+      </b-navbar-item>
+
+      <b-navbar-item tag="span" v-if="config && config.features.eventCreation">
+=======
       <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
         $t("Explore")
       }}</b-navbar-item>
@@ -47,6 +63,7 @@
           currentUser.isLoggedIn
         "
       >
+>>>>>>> 1.1.4
         <b-button
           tag="router-link"
           :to="{ name: RouteName.CREATE_EVENT }"