Commit f1d1fd64 authored by raeno's avatar raeno

Clean up the code

parent 91a72d51
......@@ -31,10 +31,6 @@ const registration = {
if ((!this.registrationOpen && !this.token) || this.signedIn) {
this.$router.push('/main/all')
}
// // Seems like this doesn't work at first page open for some reason
// if (this.$store.state.instance.registrationOpen && this.token) {
// this.$router.push('/registration')
// }
},
computed: {
token () { return this.$route.params.token },
......@@ -43,7 +39,7 @@ const registration = {
signedIn: (state) => !!state.users.currentUser,
isPending: (state) => state.users[SIGN_UP.isPending],
serverValidationErrors: (state) => state.users[SIGN_UP.errors],
termsofservice: (state) => state.instance.tos
termsOfService: (state) => state.instance.tos
})
},
methods: {
......
......@@ -74,13 +74,7 @@
</li>
</ul>
</div>
<!--
<div class='form-group'>
<label for='captcha'>Captcha</label>
<img src='/qvittersimplesecurity/captcha.jpg' alt='captcha' class='captcha'>
<input :disabled="registering" v-model='user.captcha' placeholder='Enter captcha' type='test' class='form-control' id='captcha'>
</div>
-->
<div class='form-group' v-if='token' >
<label for='token'>{{$t('registration.token')}}</label>
<input disabled='true' v-model='token' class='form-control' id='token' type='text'>
......@@ -89,12 +83,10 @@
<button :disabled="isPending" type='submit' class='btn btn-default'>{{$t('general.submit')}}</button>
</div>
</div>
<div class='terms-of-service' v-html="termsofservice">
<div class='terms-of-service' v-html="termsOfService">
</div>
</div>
<div v-if="clientValidationFailed">
<span>Form is invalid</span>
</div>
<div v-if="serverValidationErrors.length" class='form-group'>
<div class='alert error'>
<span v-for="error in serverValidationErrors">{{error}}</span>
......@@ -165,7 +157,7 @@
}
.form-group--error .form--label {
color: #f04124;
color: var(--cRed, #f04124);
}
.form-error {
......@@ -198,8 +190,6 @@
}
.btn {
//align-self: flex-start;
//width: 10em;
margin-top: 0.6em;
height: 28px;
}
......
export const SIGN_UP = {
// mutations
SUCCESS: 'SIGN_UP_SUCCESS',
FAILURE: 'SIGN_UP_FAILURE',
PENDING: 'SIGN_UP_PENDING',
// state
isPending: 'sign_up_pending',
errors: 'sign_up_errors'
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment