Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'captcha' into 'develop'

Browse source 
Make captcha stateless

See merge request pleroma/pleroma-fe!434
This commit is contained in:
Shpuld Shpludson 2018-12-22 06:17:56 +00:00
commit e59b67e119
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/registration/registration.js
View file

@ -48,8 +48,10 @@ const registration = {
async submit () { async submit () {
this.user.nickname = this.user.username this.user.nickname = this.user.username
this.user.token = this.token this.user.token = this.token
this.user.captcha_solution = this.captcha.solution this.user.captcha_solution = this.captcha.solution
this.user.captcha_token = this.captcha.token this.user.captcha_token = this.captcha.token
this.user.captcha_answer_data = this.captcha.answer_data
this.$v.$touch() this.$v.$touch()

7
src/components/registration/registration.vue
View file

@ -76,15 +76,16 @@
</div> </div>
<div class="form-group" id="captcha-group" v-if="captcha.type != 'none'"> <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
<label class='form--label' for='captcha-label'>$t('captcha')</label>
<template v-if="captcha.type == 'kocaptcha'"> <template v-if="captcha.type == 'kocaptcha'">
<img v-bind:src="captcha.url" v-on:click="setCaptcha"> <img v-bind:src="captcha.url" v-on:click="setCaptcha">
<sub>Click the image to get a new captcha</sub> <sub>{{$t('registration.new_captcha')}}</sub>
<label class='form--label' for='captcha-label'>CAPTCHA</label>
<input :disabled="isPending" <input :disabled="isPending"
v-model='captcha.solution' v-model='captcha.solution'
class='form-control' id='captcha-answer' type='text'> class='form-control' id='captcha-answer' type='text' autocomplete="off">
</template> </template>
</div> </div>

2
src/i18n/en.json
View file

@ -74,6 +74,8 @@
"password_confirm": "Password confirmation", "password_confirm": "Password confirmation",
"registration": "Registration", "registration": "Registration",
"token": "Invite token", "token": "Invite token",
"captcha": "CAPTCHA",
"new_captcha": "Click the image to get a new captcha",
"validations": { "validations": {
"username_required": "cannot be left blank", "username_required": "cannot be left blank",
"fullname_required": "cannot be left blank", "fullname_required": "cannot be left blank",