From a9e6a39bb0218bdddf8420e65a409e430dc20426 Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Mon, 7 Sep 2020 12:46:59 +0000 Subject: [PATCH] feat/ui-layout (#43) Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: replace old pages with new pages feat: implement devices page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement account policy page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement payment and bills page Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: change config to accept env files Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: make a stripe element component Merge branch 'master' into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement manage ssh key page feat: set password page feat: implement change password page fix: change design feat: implement my account page feat: implement animation control for launching bubble screen fix: navigating to network page feat: implement Launching bubble page feat: integrate launch bubble api Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement MFA in login Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement adding ssh key Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: showing default values Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement selector placeholders and default values Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: getting user information after setting payment method Merge branch 'master' into feat/ui-layout feat: implement setting payment plan in payment page feat: populate options for advanced settings modal fix: remove showing advanced settings modal when loading the page feat: implement Advanced Settings Modal layout feat: implement modal and selector components feat: implement launch bubble screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement add stripe card feat: implement login process Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement payment page feat: implement mail verification screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: prevent registration when the configs.allowRegistration is set to false Co-authored-by: Tyler Co-authored-by: jonathan Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/43 --- src/_router/index.js | 87 +++++++++++++++++++++++++++++++++++++------- src/app/App.vue | 2 +- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/src/_router/index.js b/src/_router/index.js index cfa41b9..de10eb5 100644 --- a/src/_router/index.js +++ b/src/_router/index.js @@ -20,7 +20,7 @@ import DashboardPage from '~/account/DashboardPage'; import ProfilePage from '~/account/profile/ProfilePage'; import ActionPage from '~/account/profile/ActionPage'; import PolicyPage from '~/account/profile/PolicyPage'; -import DevicesPage from '~/account/DevicesPage'; +// import DevicesPage from '~/account/DevicesPage'; import AppsPage from '~/account/AppsPage'; import AppPage from '~/account/AppPage'; import BillsPage from '~/account/payment/BillsPage'; @@ -148,8 +148,8 @@ export const router = new Router({ { path: '/legal', component: LegalPage }, { path: '/support', component: SupportPage }, - { path: '/me', component: ProfilePage }, - { path: '/me/policy', component: PolicyPage }, + // { path: '/me', component: ProfilePage }, + // { path: '/me/policy', component: PolicyPage }, { path: '/me/download/:uuid', redirect: (r) => ({ @@ -158,16 +158,16 @@ export const router = new Router({ }), }, { path: '/me/action', component: ActionPage }, - { path: '/me/changePassword', component: ChangePasswordPage }, - { path: '/me/setPassword/:code', component: SetPasswordPage }, - { path: '/me/keys', component: SshKeysPage }, - { path: '/me/bills', component: BillsPage }, - { - path: '/me/payment', - component: PaymentMethodsPage, - children: paymentMethodsChildren, - }, - { path: '/devices', component: DevicesPage }, + // { path: '/me/changePassword', component: ChangePasswordPage }, + // { path: '/me/setPassword/:code', component: SetPasswordPage }, + // { path: '/me/keys', component: SshKeysPage }, + // { path: '/me/bills', component: BillsPage }, + // { + // path: '/me/payment', + // component: PaymentMethodsPage, + // children: paymentMethodsChildren, + // }, + // { path: '/devices', component: DevicesPage }, { path: '/apps', component: AppsPage }, { path: '/app/:app', component: AppPage }, { path: '/app/:app/config/:view', component: AppConfigPage }, @@ -252,7 +252,66 @@ export const router = new Router({ { path: '', component: () => import('~/_pages/main/Layout'), - children: [], + children: [ + { + path: '', + component: () => import('~/_pages/main/account/Layout'), + children: [ + { + path: 'verify-email', + component: () => import('~/_pages/main/account/VerifyEmail'), + }, + { + path: 'payment', + component: () => import('~/_pages/main/account/Payment'), + }, + { + path: 'me', + exact: true, + component: () => import('~/_pages/main/account/MyAccount'), + }, + { + path: 'me/change-password', + component: () => + import('~/_pages/main/account/ChangePassword'), + }, + { + path: 'me/set-password/:code', + component: () => import('~/_pages/main/account/SetPassword'), + }, + { + path: 'me/keys', + component: () => import('~/_pages/main/account/ManageSSH'), + }, + { + path: 'me/payment', + component: () => + import('~/_pages/main/account/PaymentMethods'), + }, + { + path: 'me/bills', + component: () => import('~/_pages/main/account/Bills'), + }, + { + path: 'me/policy', + component: () => import('~/_pages/main/account/Policy'), + }, + + { + path: 'devices', + component: () => import('~/_pages/main/account/Devices'), + }, + ], + }, + { + path: 'launch-bubble', + component: () => import('~/_pages/main/bubble/LaunchBubble'), + }, + { + path: 'launching-bubble/:id', + component: () => import('~/_pages/main/bubble/LaunchingBubble'), + }, + ], }, ], }, diff --git a/src/app/App.vue b/src/app/App.vue index 1efbb8d..7093251 100644 --- a/src/app/App.vue +++ b/src/app/App.vue @@ -182,7 +182,7 @@ export default { return this.configs ? this.configs.awaitingRestore : undefined; }, isNewPage() { - const newPages = ['/new_pages', '/login', '/forgotPassword', '/register']; + const newPages = ['/new_pages', '/login', '/forgotPassword', '/register', '/me', '/devices', '/launch-bubble', '/launching-bubble']; return ( newPages.includes(this.$route.path) || newPages.filter((p) => this.$route.path.startsWith(p)).length