From 8fbdc2d689a4a80939ed590ee3f7deaeb905a88a Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Fri, 7 Aug 2020 11:39:45 +0000 Subject: [PATCH] showing default values and placeholders for selectors in advanced settings (#33) Merge branch 'master' 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 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 Co-authored-by: jonathan Co-authored-by: Tyler Co-authored-by: Jonathan Cobb Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/33 --- src/_components/modals/AdvancedSettings.vue | 159 +++++++++++++++++++- 1 file changed, 151 insertions(+), 8 deletions(-) diff --git a/src/_components/modals/AdvancedSettings.vue b/src/_components/modals/AdvancedSettings.vue index e66d497..6886d9e 100644 --- a/src/_components/modals/AdvancedSettings.vue +++ b/src/_components/modals/AdvancedSettings.vue @@ -19,22 +19,35 @@
+
+ @@ -44,8 +57,13 @@ +
@@ -54,21 +72,34 @@ :options="timezoneObjects" :reduce="(tz) => tz.timezoneId" label="timezoneDescription" + v-model="accountPlan.timezone" type="text" name="timezone" - > + > + +
+ > + +
- + + +