ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-04-27 00:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Wolfgang Huß 2021-02-09 15:41:11 +01:00
parent 92e34a3bb1
commit 220dba24ff
3 changed files with 29 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
webapp/components/ComponentSlider/ComponentSlider.vue
View File

@ -59,52 +59,18 @@ export default {
}, },
}, },
methods: { methods: {
// Wolle sliderIndexByName(name) {
// return this.sliderData.sliders.findIndex((slider) => slider.name === name)
// },
}, },
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.Sliders { .Sliders {
// Wolle position: relative;
// background-color: #fff;
// height: 100%;
// display: flex;
// margin: 0;
// padding: 0;
// list-style: none;
// .selection-dot {
// margin-right: 5px;
// // &:hover {
// // border-bottom: none;
// // }
// }
&__slider-selection { &__slider-selection {
// padding-top: 5px;
// margin-right: 5px;
// text-align: center;
// height: 100%;
// flex-grow: 1;
// &:hover {
// border-bottom: 2px solid #c9c6ce;
// }
.selection-dot { .selection-dot {
margin-right: 2px; margin-right: 2px;
} }
// &.--active {
// border-bottom: 2px solid #17b53f;
// }
&.--confirmed { &.--confirmed {
opacity: $opacity-disabled; opacity: $opacity-disabled;
// &:hover {
// border-bottom: none;
// }
} }
} }
} }

20
webapp/components/Registration/RegistrationItemEnterEmail.vue
View File

@ -14,18 +14,14 @@
: $t('components.registration.signup.title', metadata) : $t('components.registration.signup.title', metadata)
}} }}
</h1> --> </h1> -->
<ds-space v-if="token" margin-botton="large"> <ds-text v-if="token" v-html="$t('registration.signup.form.invitation-code', { code: token })" />
<ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" /> <ds-text>
</ds-space> {{
<ds-space margin-botton="large"> invitation
<ds-text> ? $t('profile.invites.description')
{{ : $t('components.registration.signup.form.description')
invitation }}
? $t('profile.invites.description') </ds-text>
: $t('components.registration.signup.form.description')
}}
</ds-text>
</ds-space>
<ds-input <ds-input
:placeholder="invitation ? $t('profile.invites.emailPlaceholder') : $t('login.email')" :placeholder="invitation ? $t('profile.invites.emailPlaceholder') : $t('login.email')"
type="email" type="email"

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

@ -64,7 +64,7 @@ storiesOf('RegistrationSlider', module)
collectedInputData: { collectedInputData: {
inviteCode: null, inviteCode: null,
email: 'wolle.huss@pjannto.com', email: 'wolle.huss@pjannto.com',
emailSend: false, emailSend: true,
nonce: 'NTRSCZ', nonce: 'NTRSCZ',
name: 'Wolle', name: 'Wolle',
password: 'Hello', password: 'Hello',
@ -88,10 +88,28 @@ storiesOf('RegistrationSlider', module)
components: { RegistrationSlider }, components: { RegistrationSlider },
store: helpers.store, store: helpers.store,
data: () => ({ data: () => ({
// Wolle searchResults, overwriteSliderData: {
collectedInputData: {
inviteCode: null,
email: 'wolle.huss@pjannto.com',
emailSend: true,
nonce: null,
name: null,
password: null,
passwordConfirmation: null,
about: null,
termsAndConditionsAgreedVersion: null,
termsAndConditionsConfirmed: null,
dataPrivacy: null,
minimumAge: null,
noCommercial: null,
noPolitical: null,
locale: null,
},
},
}), }),
template: ` template: `
<registration-slider registrationType="invite-mail" /> <registration-slider registrationType="invite-mail" :overwriteSliderData="overwriteSliderData" />
`, `,
})) }))
.add('invite-mail with data', () => ({ .add('invite-mail with data', () => ({