diff --git a/cypress/e2e/accountAdmin/accountDuplicationCheck.cy.js b/cypress/e2e/accountAdmin/accountDuplicationCheck.cy.js index 3780390..5f0aebf 100644 --- a/cypress/e2e/accountAdmin/accountDuplicationCheck.cy.js +++ b/cypress/e2e/accountAdmin/accountDuplicationCheck.cy.js @@ -2,11 +2,11 @@ const MSG_ACCOUNT_NOT_UNIQUE = 'Account has already been registered.'; describe('Account duplication check.', ()=>{ beforeEach(() => { - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); const username = 'cindy'; const password = 'REDACTED-PWD'; - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); cy.get('input[id="account"]').type(username); cy.get('input[id="password"]').type(password); diff --git a/cypress/e2e/accountAdmin/confirmPasswordMessage.cy.js b/cypress/e2e/accountAdmin/confirmPasswordMessage.cy.js index 2d3aa4e..90a232e 100644 --- a/cypress/e2e/accountAdmin/confirmPasswordMessage.cy.js +++ b/cypress/e2e/accountAdmin/confirmPasswordMessage.cy.js @@ -2,11 +2,11 @@ const MSG_PWD_NOT_MATCHED = 'Confirm Password does not match.'; describe('Confirm that two input passwords are equal.', ()=>{ beforeEach(() => { - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); const username = 'cindy'; const password = 'REDACTED-PWD'; - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); cy.get('input[id="account"]').type(username); cy.get('input[id="password"]').type(password); diff --git a/cypress/e2e/accountAdmin/createAccont.cy.js b/cypress/e2e/accountAdmin/createAccont.cy.js index 6a3c77e..dcbd95d 100644 --- a/cypress/e2e/accountAdmin/createAccont.cy.js +++ b/cypress/e2e/accountAdmin/createAccont.cy.js @@ -1,10 +1,10 @@ describe('Create an Account', ()=>{ beforeEach(() => { - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); const username = 'cindy'; const password = 'REDACTED-PWD'; - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); cy.get('input[id="account"]').type(username); cy.get('input[id="password"]').type(password); diff --git a/cypress/e2e/accountAdmin/deleteAccount.cy.js b/cypress/e2e/accountAdmin/deleteAccount.cy.js index a2240f8..38db868 100644 --- a/cypress/e2e/accountAdmin/deleteAccount.cy.js +++ b/cypress/e2e/accountAdmin/deleteAccount.cy.js @@ -1,10 +1,10 @@ describe('Delete an Account', ()=>{ beforeEach(() => { - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); const username = 'cindy'; const password = 'REDACTED-PWD'; - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); cy.get('input[id="account"]').type(username); cy.get('input[id="password"]').type(password); diff --git a/cypress/e2e/accountAdmin/editAccount.cy.js b/cypress/e2e/accountAdmin/editAccount.cy.js index 130ecf8..aa57554 100644 --- a/cypress/e2e/accountAdmin/editAccount.cy.js +++ b/cypress/e2e/accountAdmin/editAccount.cy.js @@ -12,11 +12,11 @@ Cypress.Commands.add('manualScrollToBottom', (repeats = 20) => { describe('Edit an account', ()=>{ beforeEach(() => { - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); const username = 'cindy'; const password = 'REDACTED-PWD'; - cy.visit('https://REDACTED-HOST/account/account-admin'); + cy.visit('https://REDACTED-HOST/account-admin'); cy.get('input[id="account"]').type(username); cy.get('input[id="password"]').type(password); diff --git a/src/components/Header.vue b/src/components/Header.vue index aa14a46..7e1fafa 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -6,11 +6,10 @@
- -
diff --git a/src/router/index.js b/src/router/index.js index 6d3f305..130ff2d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -53,7 +53,7 @@ const routes = [ name: "Account Management", children: [ { - path: "/account/account-admin", + path: "/account-admin", name: "AcctAdmin", component: AccountAdmin, }, diff --git a/src/views/AccountManagement/ModalAccountEditCreate.vue b/src/views/AccountManagement/ModalAccountEditCreate.vue index 07aef7b..2c43f21 100644 --- a/src/views/AccountManagement/ModalAccountEditCreate.vue +++ b/src/views/AccountManagement/ModalAccountEditCreate.vue @@ -253,7 +253,7 @@ export default defineComponent({ await toast.success(i18next.t("AcctMgmt.MsgAccountAdded")); await modalStore.closeModal(); acctMgmtStore.setShouldUpdateList(true); - await router.push('/account/account-admin'); + await router.push('/account-admin'); break; case MODAL_ACCT_EDIT: // 要注意的是舊的username跟新的username可以是不同的 diff --git a/src/views/AccountManagement/ModalDeleteAlert.vue b/src/views/AccountManagement/ModalDeleteAlert.vue index 5088972..1e9afa4 100644 --- a/src/views/AccountManagement/ModalDeleteAlert.vue +++ b/src/views/AccountManagement/ModalDeleteAlert.vue @@ -47,7 +47,7 @@ export default defineComponent({ toast.success(i18next.t("AcctMgmt.MsgAccountDeleteSuccess")); modalStore.closeModal(); acctMgmtStore.setShouldUpdateList(true); - router.push("/account/account-admin"); + router.push("/account-admin"); } }