Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate LFX header #1148

Merged
merged 5 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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%'
Expand Down
17 changes: 0 additions & 17 deletions frontend/public/images/lf/logo_lfx_cm.svg

This file was deleted.

4 changes: 4 additions & 0 deletions frontend/src/app.vue
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -48,6 +49,9 @@ export default {
&& !config.isCommunityVersion)
);
},
showLfxMenu() {
return this.$route.name !== 'reportPublicView';
},
},

async created() {
Expand Down
1 change: 1 addition & 0 deletions frontend/src/middleware/auth/auth-guard.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
18 changes: 0 additions & 18 deletions frontend/src/modules/auth/auth-routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion frontend/src/modules/auth/auth-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export class AuthService {
: undefined,
})
.then((response) => {
console.log(response);
AuthInvitationToken.clear();

return response.data;
Expand Down
26 changes: 0 additions & 26 deletions frontend/src/modules/auth/components/oauth.vue

This file was deleted.

1 change: 0 additions & 1 deletion frontend/src/modules/auth/pages/callback.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
175 changes: 0 additions & 175 deletions frontend/src/modules/auth/pages/forgot-password-page.vue

This file was deleted.

Loading
Loading