Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New client misc with some more misc (#8929)

Browse Source 
* Added markdown

* Added styles and option for debug menu

* Added sm icons

* Began styling autocomplete

* Added autocomplete styles

* Added more challenge categories

* Updated challenge participants modal

* Fixed challenge list updating without reload

* Added close and delete challenge

* Fixed form placeholder, adjusted desc style and fixed create button style

* Fixed faq collapsing and style

* Fixed repeating ending

* Fixed delete account

* Fixed party fetch issue

* Fixed scope issue

* Added member count filters

* Fixed create button style

* Fixed badge color display

* Updated tavern styles

* Fixed some party styles

* Updated login styles

* Fixed login redirect

* Fixed initial login process

* Added done local
This commit is contained in:
Keith Holliday
2017-08-07 14:26:17 -06:00
committed by GitHub
parent 1896984777
commit 0b076311df
46 changed files with 671 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/components/auth/registerLogin.vue
+33 -24
View File
@@ -34,10 +34,11 @@
.text-center
.btn.btn-info(@click='register()', v-if='registering', v-once) {{$t('joinHabitica')}}
.btn.btn-info(@click='login()', v-if='!registering', v-once) {{$t('login')}}
router-link(tag="li", :to="{name: 'login'}", v-if='registering', exact)
a(v-once) {{ $t('login') }}
router-link(tag="li", :to="{name: 'register'}", v-if='!registering', exact)
a(v-once) {{ $t('joinHabitica') }}
.toggle-links
router-link(:to="{name: 'login'}", v-if='registering', exact)
a.toggle-link(v-once) {{ $t('login') }}
router-link(:to="{name: 'register'}", v-if='!registering', exact)
a.toggle-link(v-once) Don't have an account? Join Habitica!
#bottom-background
.seamless_mountains_demo_repeat
@@ -51,11 +52,24 @@
background-color: $purple-200;
}
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
color: $purple-400;
}
::-moz-placeholder { /* Firefox 19+ */
color: $purple-400;
}
:-ms-input-placeholder { /* IE 10+ */
color: $purple-400;
}
:-moz-placeholder { /* Firefox 18- */
color: $purple-400;
}
#login-form {
margin: 0 auto;
width: 40em;
padding-top: 5em;
padding-bottom: 22.5em;
padding-bottom: 4em;
position: relative;
z-index: 1;
@@ -83,20 +97,7 @@
background-color: #432874;
border-color: transparent;
height: 50px;
color: $purple-400;
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
color: $purple-400;
}
::-moz-placeholder { /* Firefox 19+ */
color: $purple-400;
}
:-ms-input-placeholder { /* IE 10+ */
color: $purple-400;
}
:-moz-placeholder { /* Firefox 18- */
color: $purple-400;
}
color: $white;
}
.form-text {
@@ -123,7 +124,7 @@
background-repeat: repeat-x;
position: absolute;
height: 500px;
width: 1600px;
width: 1517px;
}
}
@@ -133,7 +134,7 @@
.seamless_mountains_demo_repeat {
background-image: url('~assets/images/auth/seamless_mountains_demo.png');
background-repeat: repeat-x;
width: 1600px;
width: 1517px;
height: 500px;
position: absolute;
z-index: 0;
@@ -147,6 +148,14 @@
height: 150px;
}
}
.toggle-links {
margin-top: 1em;
}
.toggle-link {
color: #fff !important;
}
</style>
<script>
@@ -215,7 +224,7 @@ export default {
passwordConfirm: this.passwordConfirm,
});
this.$router.push('/tasks');
window.location.href = '/';
},
async login () {
await this.$store.dispatch('auth:login', {
@@ -224,7 +233,7 @@ export default {
password: this.password,
});
this.$router.push('/tasks');
window.location.href = '/';
},
async socialAuth (network) {
let auth = await hello(network).login({scope: 'email'});
@@ -233,7 +242,7 @@ export default {
auth,
});
this.$router.push('/tasks');
window.location.href = '/';
},
},
};