From 749d0fe47f3e97dff0e76aacd7390facc0943ffb Mon Sep 17 00:00:00 2001 From: Zhigang Wang Date: Fri, 14 Jun 2024 12:37:08 -0700 Subject: [PATCH] user FooterUser for all logged in pages --- frontend/src/plugins/router/router.js | 45 ++++++++++++++------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/frontend/src/plugins/router/router.js b/frontend/src/plugins/router/router.js index bea3f9b..135b2e9 100644 --- a/frontend/src/plugins/router/router.js +++ b/frontend/src/plugins/router/router.js @@ -58,6 +58,7 @@ import UserHistory from '../../pages/user/account/UserHistory.vue' import Workspace from '../../pages/user/workspace/Home.vue' import FooterGuest from '../../footers/FooterGuest.vue' +import FooterUser from '../../footers/FooterUser.vue' import HeaderGuest from '../../headers/HeaderGuest.vue' import HeaderUser from '../../headers/HeaderUser.vue' @@ -180,7 +181,7 @@ const router = createRouter({ name: 'my-workspace-projects', path: '/my-workspace-projects', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: MyWorkspaceProjects, footer: FooterGuest, header: HeaderUser }, + components: { default: MyWorkspaceProjects, footer: FooterUser, header: HeaderUser }, props: false }, @@ -188,7 +189,7 @@ const router = createRouter({ name: 'project-manage', path: '/project-manage/:projectId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: ProjectManage, footer: FooterGuest, header: HeaderUser }, + components: { default: ProjectManage, footer: FooterUser, header: HeaderUser }, props: true, children: [ { @@ -233,14 +234,14 @@ const router = createRouter({ name: 'my-workspace-requests', path: '/my-workspace-requests', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: MyWorkspaceRequests, footer: FooterGuest, header: HeaderUser }, + components: { default: MyWorkspaceRequests, footer: FooterUser, header: HeaderUser }, props: false }, { name: 'request-issue', path: '/request-issue/:loadFrom', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'Post' }, - components: { default: IssueRequest, footer: FooterGuest, header: HeaderUser }, + components: { default: IssueRequest, footer: FooterUser, header: HeaderUser }, props: (route) => { /** * This would preserve the other route.params object properties overriding only @@ -257,7 +258,7 @@ const router = createRouter({ name: 'request-issue2', path: '/request-issue/:loadFrom/:requestId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: IssueRequest, footer: FooterGuest, header: HeaderUser }, + components: { default: IssueRequest, footer: FooterUser, header: HeaderUser }, props: (route) => { /** * This would preserve the other route.params object properties overriding only @@ -274,28 +275,28 @@ const router = createRouter({ name: 'request-submitted', path: '/request-submitted/:requestId', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'Post' }, - components: { default: RequestSubmitted, footer: FooterGuest, header: HeaderUser }, + components: { default: RequestSubmitted, footer: FooterUser, header: HeaderUser }, props: true }, { name: 'request-deposit', path: '/request-deposit/:requestId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: RequestDeposit, footer: FooterGuest, header: HeaderUser }, + components: { default: RequestDeposit, footer: FooterUser, header: HeaderUser }, props: true }, { name: 'request-deposited', path: '/request-deposited/:requestId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: RequestDeposited, footer: FooterGuest, header: HeaderUser }, + components: { default: RequestDeposited, footer: FooterUser, header: HeaderUser }, props: true }, { name: 'my-workspace-proposals', path: '/my-workspace-proposals', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: MyWorkspaceProposals, footer: FooterGuest, header: HeaderUser }, + components: { default: MyWorkspaceProposals, footer: FooterUser, header: HeaderUser }, props: false }, //message hub @@ -303,34 +304,34 @@ const router = createRouter({ name: 'message-hub', path: '/message-hub', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'message' }, - components: { default: MessageHub, footer: FooterGuest, header: HeaderUser } + components: { default: MessageHub, footer: FooterUser, header: HeaderUser } }, // provider hub { name: 'provider-hub', path: '/provider-hub', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'Providers' }, - components: { default: ProviderHub, footer: FooterGuest, header: HeaderUser } + components: { default: ProviderHub, footer: FooterUser, header: HeaderUser } }, //request hub { name: 'request-hub', path: '/request-hub', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'Requests' }, - components: { default: RequestHub, footer: FooterGuest, header: HeaderUser } + components: { default: RequestHub, footer: FooterUser, header: HeaderUser } }, { name: 'make-proposal', path: '/make-proposal/:requestId/:loadingMode', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: MakeProposal, footer: FooterGuest, header: HeaderUser }, + components: { default: MakeProposal, footer: FooterUser, header: HeaderUser }, props: true }, { name: 'proposal-submitted', path: '/proposal-submitted/:proposalId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: ProposalSubmitted, footer: FooterGuest, header: HeaderUser }, + components: { default: ProposalSubmitted, footer: FooterUser, header: HeaderUser }, props: true }, @@ -338,7 +339,7 @@ const router = createRouter({ name: 'request-manage', path: '/request-manage/:requestId', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: RequestManage, footer: FooterGuest, header: HeaderUser }, + components: { default: RequestManage, footer: FooterUser, header: HeaderUser }, props: true }, { @@ -347,7 +348,7 @@ const router = createRouter({ meta: { requiredRoles: [userRoleEnum.PERSONAL] }, components: { default: ReviewProposalBeforeAccetance, - footer: FooterGuest, + footer: FooterUser, header: HeaderUser }, props: true @@ -357,38 +358,38 @@ const router = createRouter({ name: 'user-profile', path: '/user-profile', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: UserProfile, footer: FooterGuest, header: HeaderUser } + components: { default: UserProfile, footer: FooterUser, header: HeaderUser } }, { name: 'user-finance', path: '/user-finance', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: UserFinance, footer: FooterGuest, header: HeaderUser } + components: { default: UserFinance, footer: FooterUser, header: HeaderUser } }, { name: 'user-history', path: '/user-history', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: UserHistory, footer: FooterGuest, header: HeaderUser } + components: { default: UserHistory, footer: FooterUser, header: HeaderUser } }, { name: 'work-space', path: '/work-space', meta: { requiredRoles: [userRoleEnum.PERSONAL], activePath: 'Workspace' }, - components: { default: Workspace, footer: FooterGuest, header: HeaderUser } + components: { default: Workspace, footer: FooterUser, header: HeaderUser } }, { name: 'lab-home', path: '/lab-home', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: LabHome, footer: FooterGuest, header: HeaderUser } + components: { default: LabHome, footer: FooterUser, header: HeaderUser } } , { name: 'machine-translation', path: '/machine-translation', meta: { requiredRoles: [userRoleEnum.PERSONAL] }, - components: { default: TranslationHome, footer: FooterGuest, header: HeaderUser } + components: { default: TranslationHome, footer: FooterUser, header: HeaderUser } } ],