From 942a4485869b4f8b844f99b872fcdd94be28c7bd Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Wed, 29 Jul 2020 23:25:00 +0000 Subject: [PATCH] Implemented Payment page (#28) 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 fix: weird routing 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 actual pages Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: api integration for register page fix: messages feat: api integration for forget-password page fix: login title and password placeholder feat: disable button until get response 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: integrate api for new login page feat: implement responsive header feat: implement checkbox Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: checkbox event issue feat: implement register page feat: implement registration page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement UI for forgot-password Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement new login page feat: implement input shared component Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement auth header Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout capitalize filename fix: webpack config to add output default url Merge branch 'master' into feat/ui-layout Merge branch 'master' into feat/ui-layout feat: integrate lazy loading and new page structure feat: use different layout for new Pages Co-authored-by: Tyler Co-authored-by: Jonathan Cobb Co-authored-by: jonathan Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/28 --- package-lock.json | 8 + src/_assets/messages.json | 6 - src/_assets/post_auth_messages.json | 7 + src/_assets/pre_auth_messages.json | 29 ++ src/_components/layout/Header.vue | 4 +- src/_components/sections/Features.vue | 2 +- src/_components/shared/Button.vue | 2 + src/_components/shared/Card.vue | 16 +- src/_pages/auth/ForgotPassword.vue | 4 +- src/_pages/auth/Layout.vue | 12 +- src/_pages/auth/Login.vue | 5 +- src/_pages/auth/Register.vue | 39 +-- src/_pages/main/Layout.vue | 155 +++++++- src/_pages/main/account/Layout.vue | 56 +++ src/_pages/main/account/Payment.vue | 446 ++++++++++++++++++++++++ src/_pages/main/account/VerifyEmail.vue | 124 +++++++ src/_router/index.js | 22 +- src/_scss/components/_form.scss | 4 +- src/_store/index.js | 9 + src/_store/system.module.js | 12 +- 20 files changed, 883 insertions(+), 79 deletions(-) delete mode 100644 src/_assets/messages.json create mode 100644 src/_assets/post_auth_messages.json create mode 100644 src/_assets/pre_auth_messages.json create mode 100644 src/_pages/main/account/Layout.vue create mode 100644 src/_pages/main/account/Payment.vue create mode 100644 src/_pages/main/account/VerifyEmail.vue diff --git a/package-lock.json b/package-lock.json index 3989130..9974410 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7751,6 +7751,14 @@ } } }, + "vue-lottie": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/vue-lottie/-/vue-lottie-0.2.1.tgz", + "integrity": "sha512-zInUX69Ij8MhVR3XArpu4PqqBoufwKxS5UMutWCPm59VUaB5H6GtnaIzf9M+l6aYU+Kr8gF/W9dzWLgRuU6V+Q==", + "requires": { + "lottie-web": "^5.1.9" + } + }, "vue-router": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.6.tgz", diff --git a/src/_assets/messages.json b/src/_assets/messages.json deleted file mode 100644 index ae303a1..0000000 --- a/src/_assets/messages.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "verify_email_title": "Please verify your email address", - "resend_verify_email_label": "Did you not received the email?", - "button_label_resend_verify_email": "Resend it.", - "more_features_label": "More Features" -} diff --git a/src/_assets/post_auth_messages.json b/src/_assets/post_auth_messages.json new file mode 100644 index 0000000..72f0be5 --- /dev/null +++ b/src/_assets/post_auth_messages.json @@ -0,0 +1,7 @@ +{ + "payment_page_title": "Please add a payment method", + "payment_page_sub_title": "We need a CC card to secure your place in the Bubblesphere.", + + "label_bubble_free_title": "Bubble is free for 30 days.", + "label_bubble_free_description": "We think you'll love the security of being in your Bubble.
If for any reason you want to cancel, that's easy too!" +} diff --git a/src/_assets/pre_auth_messages.json b/src/_assets/pre_auth_messages.json new file mode 100644 index 0000000..358b666 --- /dev/null +++ b/src/_assets/pre_auth_messages.json @@ -0,0 +1,29 @@ +{ + "verify_email_title": "Please verify your email address", + "resend_verify_email_label": "Did you not received the email?", + "button_label_resend_verify_email": "Resend it.", + "more_features_label": "More Features", + + "button_label_add_card": "Add Card", + "label_pricing_option_format": "{{messages[`marketing_pricing_${plan}_title`]}}: {{messages.currency_symbol_USD}} {{price}} monthly (free for 30 days)", + + "marketing_pricing_options": "personal,power,mega", + + "marketing_pricing_personal_title": "Personal Bubble", + "marketing_pricing_personal_users": "1 User Account", + "marketing_pricing_personal_price": "1200", + "marketing_pricing_personal_options": "1 User Account,1TB/Month of Data Transfer", + "marketing_pricing_personal_link": "/register?plan=bubble", + + "marketing_pricing_power_title": "Power Plan", + "marketing_pricing_power_users": "5 User Accounts", + "marketing_pricing_power_price": "1900", + "marketing_pricing_power_options": "5 User Accounts,2TB/Month of Data Transfer", + "marketing_pricing_power_link": "/register?plan=bubble_plus", + + "marketing_pricing_mega_title": "Mega Plan", + "marketing_pricing_mega_users": "10 User Accounts", + "marketing_pricing_mega_price": "3100", + "marketing_pricing_mega_options": "10 User Accounts,3TB/Month of Data Transfer", + "marketing_pricing_mega_link": "/register?plan=bubble_super" +} diff --git a/src/_components/layout/Header.vue b/src/_components/layout/Header.vue index 4dc2835..5b7eb97 100644 --- a/src/_components/layout/Header.vue +++ b/src/_components/layout/Header.vue @@ -7,7 +7,7 @@