Get a working rough copy of the login page
This commit is contained in:
parent
94710934b9
commit
324b989a29
13 changed files with 265 additions and 68 deletions
|
@ -1,6 +1,8 @@
|
|||
import Vue from 'vue';
|
||||
import Vuex from 'vuex';
|
||||
import vuexI18n from 'vuex-i18n';
|
||||
import VuexFlash from 'vuex-flash';
|
||||
import { createFlashStore } from 'vuex-flash';
|
||||
import VueRouter from 'vue-router';
|
||||
|
||||
// Helpers
|
||||
|
@ -15,7 +17,11 @@ window.Ziggy = Ziggy;
|
|||
|
||||
Vue.use(Vuex);
|
||||
|
||||
const store = new Vuex.Store();
|
||||
const store = new Vuex.Store({
|
||||
plugins: [
|
||||
createFlashStore(),
|
||||
],
|
||||
});
|
||||
const route = require('./../../../../vendor/tightenco/ziggy/src/js/route').default;
|
||||
|
||||
Vue.config.productionTip = false;
|
||||
|
@ -26,6 +32,10 @@ Vue.mixin({
|
|||
});
|
||||
|
||||
Vue.use(VueRouter);
|
||||
Vue.use(VuexFlash, {
|
||||
mixin: true,
|
||||
template: require('./components/errors/Flash.template')
|
||||
});
|
||||
Vue.use(vuexI18n.plugin, store);
|
||||
|
||||
Vue.i18n.add('en', Locales.en);
|
||||
|
@ -34,9 +44,20 @@ Vue.i18n.set('en');
|
|||
const router = new VueRouter({
|
||||
routes: [
|
||||
{
|
||||
path: '/:action?',
|
||||
name: 'login',
|
||||
path: '/',
|
||||
component: Login,
|
||||
}
|
||||
},
|
||||
{
|
||||
name: 'forgot-password',
|
||||
path: '/forgot-password',
|
||||
component: Login,
|
||||
},
|
||||
{
|
||||
name: 'checkpoint',
|
||||
path: '/checkpoint',
|
||||
component: Login,
|
||||
},
|
||||
]
|
||||
});
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<form class="bg-white shadow-lg rounded-lg pt-10 px-8 pb-6 mb-4 animate fadein" method="post">
|
||||
<div class="flex flex-wrap -mx-3 mb-6">
|
||||
<div class="input-open">
|
||||
<input class="input" id="grid-email" type="email" aria-labelledby="grid-email" required
|
||||
<input class="input" id="grid-email" type="email" aria-labelledby="grid-email" ref="email" required
|
||||
v-bind:value="email"
|
||||
v-on:input="updateEmail($event)"
|
||||
/>
|
||||
|
@ -27,7 +27,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import Csrf from "../shared/CSRF";
|
||||
import Csrf from "../forms/CSRF";
|
||||
|
||||
export default {
|
||||
components: {Csrf},
|
||||
|
@ -35,6 +35,9 @@
|
|||
props: {
|
||||
email: {type: String, required: true},
|
||||
},
|
||||
mounted: function () {
|
||||
this.$refs.email.focus();
|
||||
},
|
||||
data: function () {
|
||||
return {
|
||||
X_CSRF_TOKEN: window.X_CSRF_TOKEN,
|
||||
|
|
|
@ -1,14 +1,17 @@
|
|||
<template>
|
||||
<div>
|
||||
<login-form
|
||||
v-if="this.$route.path === '/'"
|
||||
v-bind:email="email"
|
||||
v-on:update-email="onEmailUpdate"
|
||||
v-if="this.$route.name === 'login'"
|
||||
v-bind:user="user"
|
||||
v-on:update-email="onUpdateEmail"
|
||||
/>
|
||||
<forgot-password
|
||||
v-if="this.$route.path === '/forgot-password'"
|
||||
v-bind:email="email"
|
||||
v-on:update-email="onEmailUpdate"
|
||||
v-if="this.$route.name === 'forgot-password'"
|
||||
v-bind:email="user.email"
|
||||
v-on:update-email="onUpdateEmail"
|
||||
/>
|
||||
<two-factor-form
|
||||
v-if="this.$route.name === 'checkpoint'"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -16,22 +19,26 @@
|
|||
<script>
|
||||
import LoginForm from "./LoginForm";
|
||||
import ForgotPassword from "./ForgotPassword";
|
||||
import TwoFactorForm from "./TwoFactorForm";
|
||||
|
||||
export default {
|
||||
name: 'login',
|
||||
data: function () {
|
||||
return {
|
||||
email: '',
|
||||
user: {
|
||||
email: ''
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
onEmailUpdate: function (value) {
|
||||
this.$data.email = value;
|
||||
onUpdateEmail: function (value) {
|
||||
this.$data.user.email = value;
|
||||
},
|
||||
},
|
||||
components: {
|
||||
TwoFactorForm,
|
||||
ForgotPassword,
|
||||
LoginForm
|
||||
LoginForm,
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
@ -1,10 +1,25 @@
|
|||
<template>
|
||||
<div>
|
||||
<form class="bg-white shadow-lg rounded-lg pt-10 px-8 pb-6 mb-4 animate fadein" :action="route('auth.login')" method="post">
|
||||
<flash-message variant="danger" />
|
||||
<flash-message variant="success" />
|
||||
<flash-message variant="warning" />
|
||||
<flash-message variant="info" />
|
||||
<div class="py-4" v-if="errors && errors.length === 1">
|
||||
<div class="p-2 bg-red-dark border-red-darker border items-center text-red-lightest leading-normal rounded flex lg:inline-flex w-full text-sm"
|
||||
role="alert">
|
||||
<span class="flex rounded-full bg-red uppercase px-2 py-1 text-xs font-bold mr-3 leading-none">Error</span>
|
||||
<span class="mr-2 text-left flex-auto">{{ errors[0] }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<form class="bg-white shadow-lg rounded-lg pt-10 px-8 pb-6 mb-4 animate fadein" method="post"
|
||||
v-on:submit.prevent="handleLogin"
|
||||
>
|
||||
<div class="flex flex-wrap -mx-3 mb-6">
|
||||
<div class="input-open">
|
||||
<input class="input" id="grid-username" type="text" name="user" aria-labelledby="grid-username" required
|
||||
v-bind:value="email"
|
||||
<input class="input" id="grid-username" type="text" name="user" aria-labelledby="grid-username"
|
||||
ref="email"
|
||||
required
|
||||
v-bind:value="user.email"
|
||||
v-on:input="updateEmail($event)"
|
||||
/>
|
||||
<label for="grid-username">{{ $t('strings.user_identifier') }}</label>
|
||||
|
@ -12,18 +27,21 @@
|
|||
</div>
|
||||
<div class="flex flex-wrap -mx-3 mb-6">
|
||||
<div class="input-open">
|
||||
<input class="input" id="grid-password" type="password" name="password" aria-labelledby="grid-password" required>
|
||||
<input class="input" id="grid-password" type="password" name="password"
|
||||
aria-labelledby="grid-password" required
|
||||
v-model="user.password"
|
||||
/>
|
||||
<label for="grid-password">{{ $t('strings.password') }}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<csrf/>
|
||||
<button class="btn btn-blue btn-jumbo" type="submit">
|
||||
{{ $t('auth.sign_in') }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="pt-6 text-center">
|
||||
<router-link to="/forgot-password" class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark">
|
||||
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark"
|
||||
:to="{ name: 'forgot-password' }">
|
||||
{{ $t('auth.forgot_password') }}
|
||||
</router-link>
|
||||
</div>
|
||||
|
@ -32,20 +50,61 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import Csrf from "../shared/CSRF";
|
||||
|
||||
export default {
|
||||
components: {Csrf},
|
||||
name: 'login-form',
|
||||
props: {
|
||||
email: { type: String, required: true },
|
||||
user: {
|
||||
type: Object,
|
||||
required: false,
|
||||
default: function () {
|
||||
return {
|
||||
email: '',
|
||||
password: '',
|
||||
};
|
||||
},
|
||||
}
|
||||
},
|
||||
data: function () {
|
||||
return {
|
||||
X_CSRF_TOKEN: window.X_CSRF_TOKEN,
|
||||
};
|
||||
errors: [],
|
||||
}
|
||||
},
|
||||
mounted: function () {
|
||||
this.$refs.email.focus();
|
||||
},
|
||||
methods: {
|
||||
// Handle a login request eminating from the form. If 2FA is required the
|
||||
// user will be presented with the 2FA modal window.
|
||||
handleLogin: function () {
|
||||
const self = this;
|
||||
|
||||
axios.post(this.route('auth.login'), {
|
||||
user: this.$props.user.email,
|
||||
password: this.$props.user.password,
|
||||
})
|
||||
.then(function (response) {
|
||||
if (response.data.complete) {
|
||||
return window.location = '/';
|
||||
}
|
||||
|
||||
self.$props.user.password = '';
|
||||
self.$router.push({name: 'checkpoint', query: {token: response.data.token}});
|
||||
})
|
||||
.catch(function (err) {
|
||||
self.$props.user.password = '';
|
||||
if (!err.response) {
|
||||
return console.error(err);
|
||||
}
|
||||
|
||||
const response = err.response;
|
||||
if (response.data && _.isObject(response.data.errors)) {
|
||||
self.$data.errors.push(response.data.errors[0].detail);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
// Update the email address associated with the login form
|
||||
// so that it is populated in the parent model automatically.
|
||||
updateEmail: function (event) {
|
||||
this.$emit('update-email', event.target.value);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
<template>
|
||||
<form class="bg-white shadow-lg rounded-lg pt-10 px-8 pb-6 mb-4 animate fadein" method="post"
|
||||
v-on:submit.prevent="submitToken"
|
||||
>
|
||||
<div class="flex flex-wrap -mx-3 mb-6">
|
||||
<div class="input-open">
|
||||
<input class="input" id="grid-code" type="number" name="token" aria-labelledby="grid-username" ref="code" required
|
||||
v-model="code"
|
||||
/>
|
||||
<label for="grid-code">{{ $t('auth.two_factor.label') }}</label>
|
||||
<p class="text-grey-darker text-xs">{{ $t('auth.two_factor.label_help') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button class="btn btn-blue btn-jumbo" type="submit">
|
||||
{{ $t('auth.sign_in') }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="pt-6 text-center">
|
||||
<router-link class="text-xs text-grey tracking-wide no-underline uppercase hover:text-grey-dark"
|
||||
:to="{ name: 'login' }">
|
||||
Back to Login
|
||||
</router-link>
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "two-factor-form",
|
||||
data: function () {
|
||||
return {
|
||||
code: '',
|
||||
};
|
||||
},
|
||||
mounted: function () {
|
||||
this.$refs.code.focus();
|
||||
},
|
||||
methods: {
|
||||
submitToken: function () {
|
||||
const self = this;
|
||||
|
||||
axios.post(this.route('auth.checkpoint'), {
|
||||
confirmation_token: this.$route.query.token,
|
||||
authentication_code: this.$data.code,
|
||||
})
|
||||
.then(function (response) {
|
||||
window.location = response.data.intended;
|
||||
})
|
||||
.catch(function (err) {
|
||||
if (!err.response) {
|
||||
return console.error(err);
|
||||
}
|
||||
|
||||
const response = err.response;
|
||||
if (response.data && _.isObject(response.data.errors)) {
|
||||
self.flash({message: response.data.errors[0].detail, variant: 'danger'});
|
||||
self.$router.push({ name: 'login' });
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
|
@ -0,0 +1,28 @@
|
|||
module.exports = `
|
||||
<div class="pb-2" v-if="show">
|
||||
<transition v-if="variant === 'success'">
|
||||
<div class="p-2 bg-green-dark border-green-darker border items-center text-green-lightest leading-normal rounded flex lg:inline-flex w-full text-sm" role="alert">
|
||||
<span class="flex rounded-full bg-green uppercase px-2 py-1 text-xs font-bold mr-3 leading-none">Success</span>
|
||||
<span class="mr-2 text-left flex-auto">{{ message }}</span>
|
||||
</div>
|
||||
</transition>
|
||||
<transition v-if="variant === 'danger'">
|
||||
<div class="p-2 bg-red-dark border-red-darker border items-center text-red-lightest leading-normal rounded flex lg:inline-flex w-full text-sm" role="alert">
|
||||
<span class="flex rounded-full bg-red uppercase px-2 py-1 text-xs font-bold mr-3 leading-none">Error</span>
|
||||
<span class="mr-2 text-left flex-auto">{{ message }}</span>
|
||||
</div>
|
||||
</transition>
|
||||
<transition v-if="variant === 'info'">
|
||||
<div class="p-2 bg-blue-dark border-blue-darker border items-center text-blue-lightest leading-normal rounded flex lg:inline-flex w-full text-sm" role="alert">
|
||||
<span class="flex rounded-full bg-blue uppercase px-2 py-1 text-xs font-bold mr-3 leading-none">Info</span>
|
||||
<span class="mr-2 text-left flex-auto">{{ message }}</span>
|
||||
</div>
|
||||
</transition>
|
||||
<transition v-if="variant === 'warning'">
|
||||
<div class="p-2 bg-yellow-dark border-yellow-darker border items-center text-yellow-lightest leading-normal rounded flex lg:inline-flex w-full text-sm" role="alert">
|
||||
<span class="flex rounded-full bg-yellow uppercase px-2 py-1 text-xs font-bold mr-3 leading-none">Warning</span>
|
||||
<span class="mr-2 text-left flex-auto">{{ message }}</span>
|
||||
</div>
|
||||
</transition>
|
||||
</div>
|
||||
`;
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
&:focus + label, &:valid + label {
|
||||
@apply .text-grey-darker .px-0 .cursor-pointer;
|
||||
transform:translateY(-24px)
|
||||
transform:translateY(-26px)
|
||||
}
|
||||
|
||||
&:invalid + label {
|
||||
|
|
|
@ -10,6 +10,12 @@ return [
|
|||
'go_to_login' => 'Go to Login',
|
||||
'reset_help_text' => 'Enter your account email address to recive instructions on resetting your password.',
|
||||
'recover_account' => 'Recover Account',
|
||||
|
||||
'two_factor' => [
|
||||
'label' => '2-Factor Token',
|
||||
'label_help' => 'This account requires a second layer of authentication in order to continue. Please enter the code generated by your device to complete this login.',
|
||||
],
|
||||
|
||||
'reset_password_text' => 'Reset your account password.',
|
||||
'reset_password' => 'Reset Account Password',
|
||||
'email_sent' => 'An email has been sent to you with further instructions for resetting your password.',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue