Revert "Revert "Integrate LFX header (#1148)""

This reverts commit 6360b6b.
CrowdDotDev · Jul 21, 2023 · 00b750e · 00b750e
1 parent 6360b6b
commit 00b750e
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 812 deletions.
diff --git a/frontend/index.html b/frontend/index.html
@@ -63,6 +63,7 @@
         href="https://cdn.jsdelivr.net/npm/remixicon@3.1.1/fonts/remixicon.css"
       />
     </noscript>
+    <script src="https://cdn.platform.linuxfoundation.org/lfx-header-v2.js"></script>
     <script type="text/javascript">
       let segmentKey =
               '%VUE_APP_SEGMENT_KEY%'

diff --git a/frontend/public/images/lf/logo_lfx_cm.svg b/frontend/public/images/lf/logo_lfx_cm.svg
diff --git a/frontend/src/app.vue b/frontend/src/app.vue
@@ -1,6 +1,7 @@
 <template>
   <div v-show="!loading" id="app">
     <div class="sm:hidden md:block lg:block">
+      <lfx-header-v2 v-if="showLfxMenu" id="lfx-header" product="Community Management" />
       <router-view v-slot="{ Component }">
         <transition>
           <div>
@@ -48,6 +49,9 @@ export default {
           && !config.isCommunityVersion)
       );
     },
+    showLfxMenu() {
+      return this.$route.name !== 'reportPublicView';
+    },
   },
 
   async created() {

diff --git a/frontend/src/middleware/auth/auth-guard.js b/frontend/src/middleware/auth/auth-guard.js
@@ -24,6 +24,7 @@ export default async function ({ to, store, router }) {
   if (!to.meta || !to.meta.auth) {
     return;
   }
+
   await store.dispatch('auth/doWaitUntilInit');
 
   const currentUser = store.getters['auth/currentUser'];

diff --git a/frontend/src/modules/auth/auth-routes.js b/frontend/src/modules/auth/auth-routes.js
@@ -3,7 +3,6 @@ import AuthLayout from '@/modules/auth/layouts/auth-layout.vue';
 
 const SigninPage = () => import('@/modules/auth/pages/signin-page.vue');
 
-const ProfileFormPage = () => import('@/modules/auth/pages/profile-form-page.vue');
 const InvitationPage = () => import('@/modules/auth/pages/invitation-page.vue');
 const TermsAndPrivacyPage = () => import('@/modules/auth/pages/terms-and-privacy.vue');
 const EmptyPermissionsPage = () => import('@/modules/auth/pages/empty-permissions-page.vue');
@@ -51,23 +50,6 @@ export default [
       },
     ],
   },
-  {
-    name: '',
-    path: '',
-    component: Layout,
-    meta: {
-      auth: true,
-      title: 'Profile Settings',
-    },
-    children: [
-      {
-        name: 'editProfile',
-        path: '/auth/edit-profile',
-        component: ProfileFormPage,
-        meta: { auth: true },
-      },
-    ],
-  },
   {
     name: 'callback',
     path: '/auth/callback',

diff --git a/frontend/src/modules/auth/auth-service.js b/frontend/src/modules/auth/auth-service.js
@@ -87,7 +87,6 @@ export class AuthService {
           : undefined,
       })
       .then((response) => {
-        console.log(response);
         AuthInvitationToken.clear();
 
         return response.data;

diff --git a/frontend/src/modules/auth/components/oauth.vue b/frontend/src/modules/auth/components/oauth.vue
diff --git a/frontend/src/modules/auth/pages/callback.vue b/frontend/src/modules/auth/pages/callback.vue
@@ -11,7 +11,6 @@
 import { onMounted } from 'vue';
 import { Auth0Service } from '@/shared/services/auth0.service';
 import { mapActions } from '@/shared/vuex/vuex.helpers';
-import { useRoute, useRouter } from 'vue-router';
 
 const { doSigninWithAuth0 } = mapActions('auth');
 

diff --git a/frontend/src/modules/auth/pages/forgot-password-page.vue b/frontend/src/modules/auth/pages/forgot-password-page.vue