summaryrefslogtreecommitdiff
path: root/packages/client/src/components
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-07-15 10:14:05 +0200
committerGitHub <noreply@github.com>2022-07-15 17:14:05 +0900
commit7cb5b5c8c28451b4b9bd03055955f7d8ce80c6ee (patch)
tree49a4b6101acb95410ee8579a106d69d9e1d3efc7 /packages/client/src/components
parentmove rollup to devDeps (diff)
downloadsharkey-7cb5b5c8c28451b4b9bd03055955f7d8ce80c6ee.tar.gz
sharkey-7cb5b5c8c28451b4b9bd03055955f7d8ce80c6ee.tar.bz2
sharkey-7cb5b5c8c28451b4b9bd03055955f7d8ce80c6ee.zip
refactor: signup component as composition api (#8957)
Diffstat (limited to 'packages/client/src/components')
-rw-r--r--packages/client/src/components/signup.vue411
1 files changed, 195 insertions, 216 deletions
diff --git a/packages/client/src/components/signup.vue b/packages/client/src/components/signup.vue
index dd4a2b18b8..c35d65d5de 100644
--- a/packages/client/src/components/signup.vue
+++ b/packages/client/src/components/signup.vue
@@ -1,255 +1,234 @@
<template>
<form class="qlvuhzng _formRoot" autocomplete="new-password" @submit.prevent="onSubmit">
- <template v-if="meta">
- <MkInput v-if="meta.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" :spellcheck="false" required>
- <template #label>{{ $ts.invitationCode }}</template>
- <template #prefix><i class="fas fa-key"></i></template>
- </MkInput>
- <MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-signup-username @update:modelValue="onChangeUsername">
- <template #label>{{ $ts.username }} <div v-tooltip:dialog="$ts.usernameInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
- <template #prefix>@</template>
- <template #suffix>@{{ host }}</template>
- <template #caption>
- <span v-if="usernameState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span>
- <span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span>
- <span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span>
- <span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span>
- <span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.usernameInvalidFormat }}</span>
- <span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooShort }}</span>
- <span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooLong }}</span>
+ <MkInput v-if="instance.disableRegistration" v-model="invitationCode" class="_formBlock" type="text" :spellcheck="false" required>
+ <template #label>{{ $ts.invitationCode }}</template>
+ <template #prefix><i class="fas fa-key"></i></template>
+ </MkInput>
+ <MkInput v-model="username" class="_formBlock" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :spellcheck="false" required data-cy-signup-username @update:modelValue="onChangeUsername">
+ <template #label>{{ $ts.username }} <div v-tooltip:dialog="$ts.usernameInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
+ <template #prefix>@</template>
+ <template #suffix>@{{ host }}</template>
+ <template #caption>
+ <span v-if="usernameState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span>
+ <span v-else-if="usernameState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span>
+ <span v-else-if="usernameState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span>
+ <span v-else-if="usernameState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span>
+ <span v-else-if="usernameState === 'invalid-format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.usernameInvalidFormat }}</span>
+ <span v-else-if="usernameState === 'min-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooShort }}</span>
+ <span v-else-if="usernameState === 'max-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooLong }}</span>
+ </template>
+ </MkInput>
+ <MkInput v-if="instance.emailRequiredForSignup" v-model="email" class="_formBlock" :debounce="true" type="email" :spellcheck="false" required data-cy-signup-email @update:modelValue="onChangeEmail">
+ <template #label>{{ $ts.emailAddress }} <div v-tooltip:dialog="$ts._signup.emailAddressInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
+ <template #prefix><i class="fas fa-envelope"></i></template>
+ <template #caption>
+ <span v-if="emailState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span>
+ <span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span>
+ <span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.used }}</span>
+ <span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.format }}</span>
+ <span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.disposable }}</span>
+ <span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.mx }}</span>
+ <span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.smtp }}</span>
+ <span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span>
+ <span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span>
+ </template>
+ </MkInput>
+ <MkInput v-model="password" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password @update:modelValue="onChangePassword">
+ <template #label>{{ $ts.password }}</template>
+ <template #prefix><i class="fas fa-lock"></i></template>
+ <template #caption>
+ <span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.weakPassword }}</span>
+ <span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="fas fa-check fa-fw"></i> {{ $ts.normalPassword }}</span>
+ <span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.strongPassword }}</span>
+ </template>
+ </MkInput>
+ <MkInput v-model="retypedPassword" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password-retype @update:modelValue="onChangePasswordRetype">
+ <template #label>{{ $ts.password }} ({{ $ts.retype }})</template>
+ <template #prefix><i class="fas fa-lock"></i></template>
+ <template #caption>
+ <span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.passwordMatched }}</span>
+ <span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.passwordNotMatched }}</span>
+ </template>
+ </MkInput>
+ <MkSwitch v-if="instance.tosUrl" v-model="ToSAgreement" class="_formBlock tou">
+ <I18n :src="$ts.agreeTo">
+ <template #0>
+ <a :href="instance.tosUrl" class="_link" target="_blank">{{ $ts.tos }}</a>
</template>
- </MkInput>
- <MkInput v-if="meta.emailRequiredForSignup" v-model="email" class="_formBlock" :debounce="true" type="email" :spellcheck="false" required data-cy-signup-email @update:modelValue="onChangeEmail">
- <template #label>{{ $ts.emailAddress }} <div v-tooltip:dialog="$ts._signup.emailAddressInfo" class="_button _help"><i class="far fa-question-circle"></i></div></template>
- <template #prefix><i class="fas fa-envelope"></i></template>
- <template #caption>
- <span v-if="emailState === 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span>
- <span v-else-if="emailState === 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span>
- <span v-else-if="emailState === 'unavailable:used'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.used }}</span>
- <span v-else-if="emailState === 'unavailable:format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.format }}</span>
- <span v-else-if="emailState === 'unavailable:disposable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.disposable }}</span>
- <span v-else-if="emailState === 'unavailable:mx'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.mx }}</span>
- <span v-else-if="emailState === 'unavailable:smtp'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts._emailUnavailable.smtp }}</span>
- <span v-else-if="emailState === 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span>
- <span v-else-if="emailState === 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span>
- </template>
- </MkInput>
- <MkInput v-model="password" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password @update:modelValue="onChangePassword">
- <template #label>{{ $ts.password }}</template>
- <template #prefix><i class="fas fa-lock"></i></template>
- <template #caption>
- <span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.weakPassword }}</span>
- <span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="fas fa-check fa-fw"></i> {{ $ts.normalPassword }}</span>
- <span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.strongPassword }}</span>
- </template>
- </MkInput>
- <MkInput v-model="retypedPassword" class="_formBlock" type="password" autocomplete="new-password" required data-cy-signup-password-retype @update:modelValue="onChangePasswordRetype">
- <template #label>{{ $ts.password }} ({{ $ts.retype }})</template>
- <template #prefix><i class="fas fa-lock"></i></template>
- <template #caption>
- <span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.passwordMatched }}</span>
- <span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.passwordNotMatched }}</span>
- </template>
- </MkInput>
- <MkSwitch v-if="meta.tosUrl" v-model="ToSAgreement" class="_formBlock tou">
- <I18n :src="$ts.agreeTo">
- <template #0>
- <a :href="meta.tosUrl" class="_link" target="_blank">{{ $ts.tos }}</a>
- </template>
- </I18n>
- </MkSwitch>
- <MkCaptcha v-if="meta.enableHcaptcha" ref="hcaptcha" v-model="hCaptchaResponse" class="_formBlock captcha" provider="hcaptcha" :sitekey="meta.hcaptchaSiteKey"/>
- <MkCaptcha v-if="meta.enableRecaptcha" ref="recaptcha" v-model="reCaptchaResponse" class="_formBlock captcha" provider="recaptcha" :sitekey="meta.recaptchaSiteKey"/>
- <MkButton class="_formBlock" type="submit" :disabled="shouldDisableSubmitting" gradate data-cy-signup-submit>{{ $ts.start }}</MkButton>
- </template>
+ </I18n>
+ </MkSwitch>
+ <MkCaptcha v-if="instance.enableHcaptcha" ref="hcaptcha" v-model="hCaptchaResponse" class="_formBlock captcha" provider="hcaptcha" :sitekey="instance.hcaptchaSiteKey"/>
+ <MkCaptcha v-if="instance.enableRecaptcha" ref="recaptcha" v-model="reCaptchaResponse" class="_formBlock captcha" provider="recaptcha" :sitekey="instance.recaptchaSiteKey"/>
+ <MkButton class="_formBlock" type="submit" :disabled="shouldDisableSubmitting" gradate data-cy-signup-submit>{{ $ts.start }}</MkButton>
</form>
</template>
-<script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
import getPasswordStrength from 'syuilo-password-strength';
import { toUnicode } from 'punycode/';
import MkButton from './ui/button.vue';
+import MkCaptcha from './captcha.vue';
import MkInput from './form/input.vue';
import MkSwitch from './form/switch.vue';
-import { host, url } from '@/config';
+import * as config from '@/config';
import * as os from '@/os';
import { login } from '@/account';
+import { instance } from '@/instance';
+import { i18n } from '@/i18n';
-export default defineComponent({
- components: {
- MkButton,
- MkInput,
- MkSwitch,
- MkCaptcha: defineAsyncComponent(() => import('./captcha.vue')),
- },
-
- props: {
- autoSet: {
- type: Boolean,
- required: false,
- default: false,
- },
- },
+const props = withDefaults(defineProps<{
+ autoSet?: boolean;
+}>(), {
+ autoSet: false,
+});
- emits: ['signup'],
+const emit = defineEmits<{
+ (ev: 'signup', user: Record<string, any>): void;
+ (ev: 'signupEmailPending'): void;
+}>();
- data() {
- return {
- host: toUnicode(host),
- username: '',
- password: '',
- retypedPassword: '',
- invitationCode: '',
- email: '',
- url,
- usernameState: null,
- emailState: null,
- passwordStrength: '',
- passwordRetypeState: null,
- submitting: false,
- ToSAgreement: false,
- hCaptchaResponse: null,
- reCaptchaResponse: null,
- };
- },
+const host = toUnicode(config.host);
- computed: {
- meta() {
- return this.$instance;
- },
+let hcaptcha = $ref();
+let recaptcha = $ref();
- shouldDisableSubmitting(): boolean {
- return this.submitting ||
- this.meta.tosUrl && !this.ToSAgreement ||
- this.meta.enableHcaptcha && !this.hCaptchaResponse ||
- this.meta.enableRecaptcha && !this.reCaptchaResponse ||
- this.passwordRetypeState === 'not-match';
- },
+let username: string = $ref('');
+let password: string = $ref('');
+let retypedPassword: string = $ref('');
+let invitationCode: string = $ref('');
+let email = $ref('');
+let usernameState: null | 'wait' | 'ok' | 'unavailable' | 'error' | 'invalid-format' | 'min-range' | 'max-range' = $ref(null);
+let emailState: null | 'wait' | 'ok' | 'unavailable:used' | 'unavailable:format' | 'unavailable:disposable' | 'unavailable:mx' | 'unavailable:smtp' | 'unavailable' | 'error' = $ref(null);
+let passwordStrength: '' | 'low' | 'medium' | 'high' = $ref('');
+let passwordRetypeState: null | 'match' | 'not-match' = $ref(null);
+let submitting: boolean = $ref(false);
+let ToSAgreement: boolean = $ref(false);
+let hCaptchaResponse = $ref(null);
+let reCaptchaResponse = $ref(null);
- shouldShowProfileUrl(): boolean {
- return (this.username !== '' &&
- this.usernameState !== 'invalid-format' &&
- this.usernameState !== 'min-range' &&
- this.usernameState !== 'max-range');
- },
- },
+const shouldDisableSubmitting = $computed((): boolean => {
+ return submitting ||
+ instance.tosUrl && !ToSAgreement ||
+ instance.enableHcaptcha && !hCaptchaResponse ||
+ instance.enableRecaptcha && !reCaptchaResponse ||
+ passwordRetypeState === 'not-match';
+});
- methods: {
- onChangeUsername() {
- if (this.username === '') {
- this.usernameState = null;
- return;
- }
+function onChangeUsername(): void {
+ if (username === '') {
+ usernameState = null;
+ return;
+ }
- const err =
- !this.username.match(/^[a-zA-Z0-9_]+$/) ? 'invalid-format' :
- this.username.length < 1 ? 'min-range' :
- this.username.length > 20 ? 'max-range' :
- null;
+ {
+ const err =
+ !username.match(/^[a-zA-Z0-9_]+$/) ? 'invalid-format' :
+ username.length < 1 ? 'min-range' :
+ username.length > 20 ? 'max-range' :
+ null;
- if (err) {
- this.usernameState = err;
- return;
- }
+ if (err) {
+ usernameState = err;
+ return;
+ }
+ }
- this.usernameState = 'wait';
+ usernameState = 'wait';
- os.api('username/available', {
- username: this.username,
- }).then(result => {
- this.usernameState = result.available ? 'ok' : 'unavailable';
- }).catch(err => {
- this.usernameState = 'error';
- });
- },
+ os.api('username/available', {
+ username,
+ }).then(result => {
+ usernameState = result.available ? 'ok' : 'unavailable';
+ }).catch(() => {
+ usernameState = 'error';
+ });
+}
- onChangeEmail() {
- if (this.email === '') {
- this.emailState = null;
- return;
- }
+function onChangeEmail(): void {
+ if (email === '') {
+ emailState = null;
+ return;
+ }
- this.emailState = 'wait';
+ emailState = 'wait';
- os.api('email-address/available', {
- emailAddress: this.email,
- }).then(result => {
- this.emailState = result.available ? 'ok' :
- result.reason === 'used' ? 'unavailable:used' :
- result.reason === 'format' ? 'unavailable:format' :
- result.reason === 'disposable' ? 'unavailable:disposable' :
- result.reason === 'mx' ? 'unavailable:mx' :
- result.reason === 'smtp' ? 'unavailable:smtp' :
- 'unavailable';
- }).catch(err => {
- this.emailState = 'error';
- });
- },
+ os.api('email-address/available', {
+ emailAddress: email,
+ }).then(result => {
+ emailState = result.available ? 'ok' :
+ result.reason === 'used' ? 'unavailable:used' :
+ result.reason === 'format' ? 'unavailable:format' :
+ result.reason === 'disposable' ? 'unavailable:disposable' :
+ result.reason === 'mx' ? 'unavailable:mx' :
+ result.reason === 'smtp' ? 'unavailable:smtp' :
+ 'unavailable';
+ }).catch(() => {
+ emailState = 'error';
+ });
+}
- onChangePassword() {
- if (this.password === '') {
- this.passwordStrength = '';
- return;
- }
+function onChangePassword(): void {
+ if (password === '') {
+ passwordStrength = '';
+ return;
+ }
- const strength = getPasswordStrength(this.password);
- this.passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
- },
+ const strength = getPasswordStrength(password);
+ passwordStrength = strength > 0.7 ? 'high' : strength > 0.3 ? 'medium' : 'low';
+}
- onChangePasswordRetype() {
- if (this.retypedPassword === '') {
- this.passwordRetypeState = null;
- return;
- }
+function onChangePasswordRetype(): void {
+ if (retypedPassword === '') {
+ passwordRetypeState = null;
+ return;
+ }
- this.passwordRetypeState = this.password === this.retypedPassword ? 'match' : 'not-match';
- },
+ passwordRetypeState = password === retypedPassword ? 'match' : 'not-match';
+}
- onSubmit() {
- if (this.submitting) return;
- this.submitting = true;
+function onSubmit(): void {
+ if (submitting) return;
+ submitting = true;
- os.api('signup', {
- username: this.username,
- password: this.password,
- emailAddress: this.email,
- invitationCode: this.invitationCode,
- 'hcaptcha-response': this.hCaptchaResponse,
- 'g-recaptcha-response': this.reCaptchaResponse,
- }).then(() => {
- if (this.meta.emailRequiredForSignup) {
- os.alert({
- type: 'success',
- title: this.$ts._signup.almostThere,
- text: this.$t('_signup.emailSent', { email: this.email }),
- });
- this.$emit('signupEmailPending');
- } else {
- os.api('signin', {
- username: this.username,
- password: this.password,
- }).then(res => {
- this.$emit('signup', res);
+ os.api('signup', {
+ username,
+ password,
+ emailAddress: email,
+ invitationCode,
+ 'hcaptcha-response': hCaptchaResponse,
+ 'g-recaptcha-response': reCaptchaResponse,
+ }).then(() => {
+ if (instance.emailRequiredForSignup) {
+ os.alert({
+ type: 'success',
+ title: i18n.ts._signup.almostThere,
+ text: i18n.t('_signup.emailSent', { email }),
+ });
+ emit('signupEmailPending');
+ } else {
+ os.api('signin', {
+ username,
+ password,
+ }).then(res => {
+ emit('signup', res);
- if (this.autoSet) {
- login(res.i);
- }
- });
+ if (props.autoSet) {
+ login(res.i);
}
- }).catch(() => {
- this.submitting = false;
- this.$refs.hcaptcha?.reset?.();
- this.$refs.recaptcha?.reset?.();
-
- os.alert({
- type: 'error',
- text: this.$ts.somethingHappened,
- });
});
- },
- },
-});
+ }
+ }).catch(() => {
+ submitting = false;
+ hcaptcha.reset?.();
+ recaptcha.reset?.();
+
+ os.alert({
+ type: 'error',
+ text: i18n.ts.somethingHappened,
+ });
+ });
+}
</script>
<style lang="scss" scoped>