ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suggestions implemented II

Browse Source
This commit is contained in:
ogerly 2019-08-14 14:12:17 +02:00
parent bd27876d9c
commit a5f448036c
4 changed files with 87 additions and 7020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6943
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

156
webapp/components/Registration/CreateUserAccount.vue
View File

@ -1,75 +1,83 @@
<template> <template>
<ds-card v-if="success" class="success"> <ds-container width="small">
<ds-space> <ds-card v-if="success" class="success">
<sweetalert-icon icon="success" /> <ds-space>
<ds-text align="center" bold color="success"> <sweetalert-icon icon="success" />
{{ $t('registration.create-user-account.success') }} <ds-text align="center" bold color="success">
</ds-text> {{ $t('registration.create-user-account.success') }}
</ds-space> </ds-text>
</ds-card> </ds-space>
<ds-form </ds-card>
v-else <ds-form
class="create-user-account" v-else
v-model="formData" class="create-user-account"
:schema="formSchema" v-model="formData"
@submit="submit" :schema="formSchema"
> @submit="submit"
<template slot-scope="{ errors }"> >
<ds-card :header="$t('registration.create-user-account.title')"> <template slot-scope="{ errors }">
<ds-input <ds-card :header="$t('registration.create-user-account.title')">
id="name" <ds-input
model="name" id="name"
icon="user" model="name"
:label="$t('settings.data.labelName')" icon="user"
:placeholder="$t('settings.data.namePlaceholder')" :label="$t('settings.data.labelName')"
/> :placeholder="$t('settings.data.namePlaceholder')"
<ds-input />
id="bio" <ds-input
model="about" id="bio"
type="textarea" model="about"
rows="3" type="textarea"
:label="$t('settings.data.labelBio')" rows="3"
:placeholder="$t('settings.data.labelBio')" :label="$t('settings.data.labelBio')"
/> :placeholder="$t('settings.data.labelBio')"
<ds-input />
id="password" <ds-input
model="password" id="password"
type="password" model="password"
autocomplete="off" type="password"
:label="$t('settings.security.change-password.label-new-password')" autocomplete="off"
/> :label="$t('settings.security.change-password.label-new-password')"
<ds-input />
id="passwordConfirmation" <ds-input
model="passwordConfirmation" id="passwordConfirmation"
type="password" model="passwordConfirmation"
autocomplete="off" type="password"
:label="$t('settings.security.change-password.label-new-password-confirm')" autocomplete="off"
/> :label="$t('settings.security.change-password.label-new-password-confirm')"
<password-strength :password="formData.password" /> />
<ds-section> <password-strength :password="formData.password" />
<ds-text> <ds-text>
<input id="checkbox" type="checkbox" v-model="checkedDefault" @change="checked" /> <input
<label for="checkbox" v-html="$t('site.termsAndConditionsCeckbox')"></label> id="checkbox"
type="checkbox"
v-model="checkedConfimed"
@change="checked"
:checked="checkedConfimed"
/>
<label for="checkbox" v-html="$t('site.termsAndConditionsRead')"></label>
</ds-text> </ds-text>
</ds-section>
<template slot="footer"> <template slot="footer">
<ds-space class="backendErrors" v-if="backendErrors"> <ds-space class="backendErrors" v-if="backendErrors">
<ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text> <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
</ds-space> </ds-space>
<ds-button <ds-button
style="float: right;" style="float: right;"
icon="check" icon="check"
type="submit" type="submit"
:loading="$apollo.loading" :loading="$apollo.loading"
:disabled="errors" :disabled="errors"
primary primary
> >
{{ $t('actions.save') }} {{ $t('actions.save') }}
</ds-button> </ds-button>
</template> </template>
</ds-card> </ds-card>
</template> </template>
</ds-form> </ds-form>
</ds-container>
</template> </template>
<script> <script>
@ -112,7 +120,7 @@ export default {
disabled: true, disabled: true,
success: null, success: null,
backendErrors: null, backendErrors: null,
checkedDefault: false, checkedConfimed: false,
} }
}, },
props: { props: {
@ -121,10 +129,12 @@ export default {
}, },
methods: { methods: {
checked: function() { checked: function() {
this.backendErrors = { message: '' } this.backendErrors = { message: null }
console.log('tzzzzzzzzzz')
this.disabled = true
}, },
async submit() { async submit() {
if (this.checkedDefault) { if (this.checkedConfimed) {
const { name, password, about } = this.formData const { name, password, about } = this.formData
const { email, nonce } = this const { email, nonce } = this
try { try {
@ -143,7 +153,7 @@ export default {
this.backendErrors = err this.backendErrors = err
} }
} else { } else {
this.backendErrors = { message: this.$t(`site.termsAndConditionsNoChecked`) } this.backendErrors = { message: this.$t(`site.confirmTermsAndConditions`) }
} }
}, },
}, },

4
webapp/locales/de.json
View File

@ -23,8 +23,8 @@
"bank": "Bankverbindung", "bank": "Bankverbindung",
"germany": "Deutschland", "germany": "Deutschland",
"code-of-conduct": "Verhaltenscodex", "code-of-conduct": "Verhaltenscodex",
"termsAndConditionsCeckbox": "<a href=\"/terms-and-conditions\" target=\"_blank\">Nutzungsbedingungen</a> gelesen und verstanden", "termsAndConditionsRead": "<a href=\"/terms-and-conditions\" target=\"_blank\">Nutzungsbedingungen</a> gelesen und verstanden",
"termsAndConditionsNoChecked": "Bitte lies und bestätige die Nutzungsbednigungen!" "confirmTermsAndConditions": "Bitte lies und bestätige die Nutzungsbednigungen!"
}, },
"sorting": { "sorting": {
"newest": "Neuste", "newest": "Neuste",

4
webapp/locales/en.json
View File

@ -23,8 +23,8 @@
"bank": "bank account", "bank": "bank account",
"germany": "Germany", "germany": "Germany",
"code-of-conduct": "Code of Conduct", "code-of-conduct": "Code of Conduct",
"termsAndConditionsCeckbox": "<a href=\"/terms-and-conditions\" target=\"_blank\">Terms and conditions</a> read and understood", "termsAndConditionsRead": "<a href=\"/terms-and-conditions\" target=\"_blank\">Terms and conditions</a> read and understood",
"termsAndConditionsNoChecked": "Please read and confirm the Terms and conditions!" "confirmTermsAndConditions": "Please read and confirm the Terms and conditions!"
}, },
"sorting": { "sorting": {
"newest": "Newest", "newest": "Newest",