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

Cleanup refactoring create account checkboxes after Ulf's suggestions

Browse Source
This commit is contained in:
Wolfgang Huß 2021-03-22 10:21:00 +01:00
parent 3504bbb123
commit 9291fbf013
3 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
webapp/components/Registration/RegistrationSlideCreate.vue
View File

@ -73,15 +73,12 @@
:checked="termsAndConditionsConfirmed" :checked="termsAndConditionsConfirmed"
/> />
<label for="checkbox0"> <label for="checkbox0">
<!-- Wolle {{ $t('termsAndConditions.termsAndConditionsConfirmed') }} -->
{{ $t('components.registration.create-user-account.termsAndCondsEtcConfirmed') }} {{ $t('components.registration.create-user-account.termsAndCondsEtcConfirmed') }}
<br /> <br />
<!-- Wolle <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link> -->
<a :href="'/terms-and-conditions'" target="_blank"> <a :href="'/terms-and-conditions'" target="_blank">
{{ $t('site.termsAndConditions') }} {{ $t('site.termsAndConditions') }}
</a> </a>
<br /> <br />
<!-- Wolle <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link> -->
<a :href="'/data-privacy'" target="_blank"> <a :href="'/data-privacy'" target="_blank">
{{ $t('site.data-privacy') }} {{ $t('site.data-privacy') }}
</a> </a>
@ -95,39 +92,13 @@
:checked="recieveCommunicationAsEmailsEtcConfirmed" :checked="recieveCommunicationAsEmailsEtcConfirmed"
/> />
<label for="checkbox1"> <label for="checkbox1">
<!-- Wolle {{ $t('components.registration.signup.form.data-privacy') }} -->
{{ {{
$t( $t(
'components.registration.create-user-account.recieveCommunicationAsEmailsEtcConfirmed', 'components.registration.create-user-account.recieveCommunicationAsEmailsEtcConfirmed',
) )
}} }}
<!-- Wolle <br />
<nuxt-link to="/data-privacy">
{{ $t('site.data-privacy') }}
</nuxt-link> -->
</label> </label>
</ds-text> </ds-text>
<!-- Wolle <ds-text>
<input id="checkbox2" type="checkbox" v-model="minimumAge" :checked="minimumAge" />
<label
for="checkbox2"
v-html="$t('components.registration.signup.form.minimum-age')"
></label>
</ds-text>
<ds-text>
<input id="checkbox3" type="checkbox" v-model="noCommercial" :checked="noCommercial" />
<label
for="checkbox3"
v-html="$t('components.registration.signup.form.no-commercial')"
></label>
</ds-text>
<ds-text>
<input id="checkbox4" type="checkbox" v-model="noPolitical" :checked="noPolitical" />
<label
for="checkbox4"
v-html="$t('components.registration.signup.form.no-political')"
></label>
</ds-text> -->
</template> </template>
</ds-form> </ds-form>
</div> </div>
@ -176,10 +147,6 @@ export default {
// have checkmarks available. // have checkmarks available.
termsAndConditionsConfirmed: false, termsAndConditionsConfirmed: false,
recieveCommunicationAsEmailsEtcConfirmed: false, recieveCommunicationAsEmailsEtcConfirmed: false,
// Wolle dataPrivacy: false,
// minimumAge: false,
// noCommercial: false,
// noPolitical: false,
} }
}, },
mounted: function () { mounted: function () {
@ -203,18 +170,6 @@ export default {
.recieveCommunicationAsEmailsEtcConfirmed .recieveCommunicationAsEmailsEtcConfirmed
? this.sliderData.collectedInputData.recieveCommunicationAsEmailsEtcConfirmed ? this.sliderData.collectedInputData.recieveCommunicationAsEmailsEtcConfirmed
: false : false
// Wolle this.dataPrivacy = this.sliderData.collectedInputData.dataPrivacy
// ? this.sliderData.collectedInputData.dataPrivacy
// : false
// this.minimumAge = this.sliderData.collectedInputData.minimumAge
// ? this.sliderData.collectedInputData.minimumAge
// : false
// this.noCommercial = this.sliderData.collectedInputData.noCommercial
// ? this.sliderData.collectedInputData.noCommercial
// : false
// this.noPolitical = this.sliderData.collectedInputData.noPolitical
// ? this.sliderData.collectedInputData.noPolitical
// : false
this.sendValidation() this.sendValidation()
this.sliderData.setSliderValuesCallback(this.validInput, { this.sliderData.setSliderValuesCallback(this.validInput, {
@ -230,10 +185,6 @@ export default {
this.formData.password === this.formData.passwordConfirmation && this.formData.password === this.formData.passwordConfirmation &&
this.termsAndConditionsConfirmed && this.termsAndConditionsConfirmed &&
this.recieveCommunicationAsEmailsEtcConfirmed this.recieveCommunicationAsEmailsEtcConfirmed
// Wolle this.dataPrivacy &&
// this.minimumAge &&
// this.noCommercial &&
// this.noPolitical
) )
}, },
}, },
@ -244,18 +195,6 @@ export default {
recieveCommunicationAsEmailsEtcConfirmed() { recieveCommunicationAsEmailsEtcConfirmed() {
this.sendValidation() this.sendValidation()
}, },
// Wolle dataPrivacy() {
// this.sendValidation()
// },
// minimumAge() {
// this.sendValidation()
// },
// noCommercial() {
// this.sendValidation()
// },
// noPolitical() {
// this.sendValidation()
// },
}, },
methods: { methods: {
sendValidation() { sendValidation() {
@ -263,10 +202,6 @@ export default {
const { const {
termsAndConditionsConfirmed, termsAndConditionsConfirmed,
recieveCommunicationAsEmailsEtcConfirmed, recieveCommunicationAsEmailsEtcConfirmed,
// Wolle dataPrivacy,
// minimumAge,
// noCommercial,
// noPolitical,
} = this } = this
this.sliderData.setSliderValuesCallback(this.validInput, { this.sliderData.setSliderValuesCallback(this.validInput, {

16
webapp/components/Registration/RegistrationSlider.story.js
View File

@ -102,10 +102,6 @@ storiesOf('RegistrationSlider', module)
passwordConfirmation: 'Hello', passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true, termsAndConditionsConfirmed: true,
recieveCommunicationAsEmailsEtcConfirmed: true, recieveCommunicationAsEmailsEtcConfirmed: true,
// Wolle dataPrivacy: true,
// minimumAge: true,
// noCommercial: true,
// noPolitical: true,
}, },
}, },
}), }),
@ -136,10 +132,6 @@ storiesOf('RegistrationSlider', module)
passwordConfirmation: 'Hello', passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true, termsAndConditionsConfirmed: true,
recieveCommunicationAsEmailsEtcConfirmed: true, recieveCommunicationAsEmailsEtcConfirmed: true,
// Wolle dataPrivacy: true,
// minimumAge: true,
// noCommercial: true,
// noPolitical: true,
}, },
}, },
}), }),
@ -162,10 +154,6 @@ storiesOf('RegistrationSlider', module)
passwordConfirmation: null, passwordConfirmation: null,
termsAndConditionsConfirmed: null, termsAndConditionsConfirmed: null,
recieveCommunicationAsEmailsEtcConfirmed: null, recieveCommunicationAsEmailsEtcConfirmed: null,
// Wolle dataPrivacy: null,
// minimumAge: null,
// noCommercial: null,
// noPolitical: null,
}, },
}, },
}), }),
@ -188,10 +176,6 @@ storiesOf('RegistrationSlider', module)
passwordConfirmation: 'Hello', passwordConfirmation: 'Hello',
termsAndConditionsConfirmed: true, termsAndConditionsConfirmed: true,
recieveCommunicationAsEmailsEtcConfirmed: true, recieveCommunicationAsEmailsEtcConfirmed: true,
// Wolle dataPrivacy: true,
// minimumAge: true,
// noCommercial: true,
// noPolitical: true,
}, },
}, },
}), }),

4
webapp/components/Registration/RegistrationSlider.vue
View File

@ -177,10 +177,6 @@ export default {
passwordConfirmation: null, passwordConfirmation: null,
termsAndConditionsConfirmed: null, termsAndConditionsConfirmed: null,
recieveCommunicationAsEmailsEtcConfirmed: null, recieveCommunicationAsEmailsEtcConfirmed: null,
// Wolle dataPrivacy: null,
// minimumAge: null,
// noCommercial: null,
// noPolitical: null,
}, },
sliderIndex: 0, sliderIndex: 0,
sliders: sliders, sliders: sliders,