krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Paglias Client Fixes (#9086)

Browse Source 
* fix login background on bigger screens

* redirect to correct page after login / signup

* fix mountains in background
This commit is contained in:
Matteo Pagliazzi
2017-09-27 20:59:49 +02:00
committed by GitHub
parent e1ad19c216
commit d40543f4ca
5 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
website/client/components/auth/registerLoginReset.vue
View File

@@ -83,7 +83,7 @@
:enabled="!resetPasswordSetNewOneData.hasError"
) {{$t('setNewPass')}}
#bottom-wrap
#bottom-wrap(:class="`bottom-wrap-${!registering ? 'login' : 'register'}`")
#bottom-background
.seamless_mountains_demo_repeat
.midground_foreground_extended2
@@ -104,7 +104,16 @@
@import '~client/assets/scss/colors.scss';
@media only screen and (min-height: 1080px) {
#bottom-wrap {
.bottom-wrap-register {
margin-top: 6em;
position: fixed !important;
width: 100%;
bottom: 0;
}
}
@media only screen and (min-height: 862px) {
.bottom-wrap-login {
margin-top: 6em;
position: fixed !important;
width: 100%;
@@ -116,7 +125,7 @@
background-color: $purple-200;
background: $purple-200; /* For browsers that do not support gradients */
background: linear-gradient(to bottom, #4f2a93, #6133b4); /* Standard syntax */
min-height: 100%;
min-height: 100vh;
}
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
@@ -249,7 +258,7 @@
}
.toggle-link {
color: #fff !important;
color: $white !important;
}
.forgot-password {
@@ -367,16 +376,19 @@ export default {
passwordConfirm: this.passwordConfirm,
});
if (this.$store.state.afterLoginRedirect) {
window.location.href = this.$store.state.afterLoginRedirect;
return;
let redirectTo;
if (this.$route.query.redirectTo) {
redirectTo = this.$route.query.redirectTo;
} else {
redirectTo = '/';
}
// @TODO do not reload entire page
// problem is that app.vue created hook should be called again
// after user is logged in / just signed up
// ALSO it's the only way to make sure language data is reloaded and correct for the logged in user
window.location.href = '/';
window.location.href = redirectTo;
},
async login () {
if (!this.username) {
@@ -390,16 +402,19 @@ export default {
password: this.password,
});
if (this.$store.state.afterLoginRedirect) {
window.location.href = this.$store.state.afterLoginRedirect;
return;
let redirectTo;
if (this.$route.query.redirectTo) {
redirectTo = this.$route.query.redirectTo;
} else {
redirectTo = '/';
}
// @TODO do not reload entire page
// problem is that app.vue created hook should be called again
// after user is logged in / just signed up
// ALSO it's the only way to make sure language data is reloaded and correct for the logged in user
window.location.href = '/';
window.location.href = redirectTo;
},
async socialAuth (network) {
const url = window.location.href;
@@ -414,10 +429,19 @@ export default {
auth,
});
let redirectTo;
if (this.$route.query.redirectTo) {
redirectTo = this.$route.query.redirectTo;
} else {
redirectTo = '/';
}
// @TODO do not reload entire page
// problem is that app.vue created hook should be called again
// after user is logged in / just signed up
window.location.href = '/';
// ALSO it's the only way to make sure language data is reloaded and correct for the logged in user
window.location.href = redirectTo;
},
handleSubmit () {
if (this.registering) {