Explorar el Código

fix error on landing page when the user is connected

pull/342/head
Guillaume Vincent hace 8 años
padre
commit
b8f3229f6b
Se han modificado 6 ficheros con 21 adiciones y 22 borrados
  1. +10
    -0
      src/App.vue
  2. +2
    -7
      src/app/Login.vue
  3. +1
    -1
      src/app/Register.vue
  4. +1
    -1
      src/landing-page/LoginBar/LoginBar.vue
  5. +1
    -11
      src/landing-page/PasswordGenerator/PasswordGenerator.vue
  6. +6
    -2
      src/router.js

+ 10
- 0
src/App.vue Ver fichero

@@ -16,6 +16,16 @@
padding-top: 6rem !important;
padding-bottom: 6rem !important;
}

@media (min-width: 480px) {
.bg-card-white {
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 2px 1px -1px rgba(0, 0, 0, .12);
background-color: #ffffff;
border: none;
color: #323232;
padding: 2em;
}
}
</style>
<template>
<div id="app">


+ 2
- 7
src/app/Login.vue Ver fichero

@@ -1,13 +1,8 @@
<style>
#login {
padding-top: 2rem;
}
</style>
<template>
<div id="login">
<div class="container">
<div class="row">
<div class="col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4">
<div class="row p-t-3">
<div class="col-md-6 col-md-offset-3 col-lg-4 col-lg-offset-4 bg-card-white">
<form v-on:submit.prevent>
<fieldset class="form-group">
<label class="sr-only" for="email">{{$t('login.Email')}}</label>


+ 1
- 1
src/app/Register.vue Ver fichero

@@ -2,7 +2,7 @@
<div id="register">
<div class="container text-xs-center">
<div class="row">
<div class="col-lg-12 m-t-3">
<div class="col-lg-12 m-t-3 bg-card-white">
{{{$t('register.beta')}}}
</div>
</div>


+ 1
- 1
src/landing-page/LoginBar/LoginBar.vue Ver fichero

@@ -29,7 +29,7 @@
</a>
</nav>
<nav class="nav nav-inline pull-right" v-if="user.authenticated">
<a class="nav-link" v-on:click="logout()">
<a href="/" class="nav-link" v-on:click.stop.prevent="logout()">
<i class="fa fa-sign-out"></i> {{ $t('login.logout') }}
</a>
</nav>


+ 1
- 11
src/landing-page/PasswordGenerator/PasswordGenerator.vue Ver fichero

@@ -1,20 +1,10 @@
<style>
@media (min-width: 480px) {
#password-generator{
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .2), 0 1px 1px 0 rgba(0, 0, 0, .14), 0 2px 1px -1px rgba(0, 0, 0, .12);
background-color: #ffffff;
border: none;
color: #323232;
padding: 2em;
}
}

#password-generator .c-input, #password-generator a {
color: inherit;
}
</style>
<template>
<div id="password-generator">
<div id="password-generator" class="bg-card-white">
<form>
<div class="form-group row">
<div class="col-lg-6 m-t-1">


+ 6
- 2
src/router.js Ver fichero

@@ -37,11 +37,15 @@ router.redirect({
Auth.checkAuth();

router.beforeEach(transition => {
if (transition.to.path === '/' && Auth.user.authenticated) {
transition.redirect('/app/');
}

if (transition.to.auth_required && !Auth.user.authenticated) {
transition.redirect('/login/');
} else {
transition.next();
}

transition.next();
});




Cargando…
Cancelar
Guardar