From fd3194c368c2f58bcc27066998c7f713720fd5ab Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Mon, 7 Sep 2020 13:42:39 +0000 Subject: [PATCH] feat/ui-layout (#45) Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement my bubble page 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 Co-authored-by: Tyler Co-authored-by: jonathan Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/45 --- package.json | 3 +- src/_pages/main/bubble/Network.vue | 876 +++++++++++++++++++++++++++++ src/_router/index.js | 5 + webpack.config.dev.js | 3 +- 4 files changed, 885 insertions(+), 2 deletions(-) create mode 100644 src/_pages/main/bubble/Network.vue diff --git a/package.json b/package.json index 2740e89..edafd88 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ }, "license": "LicenseRef-LICENSE.md", "scripts": { - "start": "webpack-dev-server --open --env.server=$BUBBLE_API" + "start": "webpack-dev-server --open --env.server=$BUBBLE_API", + "dev": "webpack-dev-server --open --env.server=$MY_BUBBLE_API" }, "dependencies": { "lottie-web": "^5.7.1", diff --git a/src/_pages/main/bubble/Network.vue b/src/_pages/main/bubble/Network.vue new file mode 100644 index 0000000..0f7722f --- /dev/null +++ b/src/_pages/main/bubble/Network.vue @@ -0,0 +1,876 @@ + + + + + + diff --git a/src/_router/index.js b/src/_router/index.js index de10eb5..14cb80d 100644 --- a/src/_router/index.js +++ b/src/_router/index.js @@ -123,6 +123,11 @@ export const router = new Router({ path: 'devices', component: () => import('~/_pages/main/account/Devices'), }, + + { + path: 'bubble/:id', + component: () => import('~/_pages/main/bubble/Network'), + }, ], }, { diff --git a/webpack.config.dev.js b/webpack.config.dev.js index 939f849..2e4a824 100644 --- a/webpack.config.dev.js +++ b/webpack.config.dev.js @@ -8,7 +8,8 @@ module.exports = webpackMerge.merge(require('./webpack.config.js'), { mode: 'development', devServer: { proxy: { - '/api': 'http://beta.bubv.net:8888', + // '/api': 'http://beta.bubv.net:8888', + '/api': 'http://shent-ih538-8m85f-rj97o.bubv.net' // '/api': 'https://beta.bubv.net/', }, },