Browse Source

feat/ui-layout (#23)

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 <everdev0923@gmail.com>
Co-authored-by: Jonathan Cobb <jonathan@kyuss.org>
Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org>
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/23
pull/32/head
Tyler Chen 4 years ago
committed by jonathan
parent
commit
d820b90920
3 changed files with 23 additions and 3 deletions
  1. +1
    -0
      src/_assets/messages.json
  2. +11
    -0
      src/_components/shared/Button.vue
  3. +11
    -3
      src/_pages/auth/Login.vue

+ 1
- 0
src/_assets/messages.json View File

@@ -1,2 +1,3 @@
{
"field_label_enter_password": "Enter Password"
}

+ 11
- 0
src/_components/shared/Button.vue View File

@@ -6,7 +6,9 @@
block: block,
[`color-${color}`]: color,
link: link,
disabled: disabled
}"
:disabled="disabled"
:style="cssVars"
class="app-btn"
>
@@ -71,6 +73,11 @@
background: white;
color: $vivid-pink;
}

&.disabled {
opacity: 0.8;
cursor: not-allowed;
}
}
</style>

@@ -89,6 +96,10 @@ export default {
type: Boolean,
default: false,
},
disabled: {
type: Boolean,
default: false,
},
color: {
type: String,
default: '',


+ 11
- 3
src/_pages/auth/Login.vue View File

@@ -1,7 +1,9 @@
<template>
<div class="wrapper">
<h1 class="text-center white-text form-title">
{{ messages.login_title }}
{{
configs.sageLauncher ? messages.login_title_sage : messages.login_title
}}
</h1>
<h4 class="text-center white-text form-sub-title">
{{ messages.login_blurb }}
@@ -53,7 +55,7 @@
}"
v-model="password"
@input="$v.password.$touch()"
:placeholder="messages.field_label_password"
:placeholder="messages.field_label_enter_password"
/>
<span
class="form-error"
@@ -127,9 +129,15 @@
<router-link to="/new_pages/forgot-password">
{{ messages.button_label_forgotPassword }}
</router-link>
<Button color="default" class="auth-form-submit" @click="submit">
<Button
color="default"
class="auth-form-submit"
@click="submit"
:disabled="status.loggingIn"
>
{{ messages.button_label_sign_in }}
</Button>

<p
class="text-center description"
v-html="messages.message_login_agreeToTerms"


Loading…
Cancel
Save