diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-20 15:15:34 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-20 15:15:34 +0900 |
| commit | 001b660cbee68aef49c441e0eb559a8831a2afb7 (patch) | |
| tree | d0e0377f03696468a7dc63199fa272a718a21c7c /packages/client/src/components | |
| parent | :art: (diff) | |
| download | sharkey-001b660cbee68aef49c441e0eb559a8831a2afb7.tar.gz sharkey-001b660cbee68aef49c441e0eb559a8831a2afb7.tar.bz2 sharkey-001b660cbee68aef49c441e0eb559a8831a2afb7.zip | |
:art:
Diffstat (limited to 'packages/client/src/components')
| -rw-r--r-- | packages/client/src/components/MkSignin.vue | 38 | ||||
| -rw-r--r-- | packages/client/src/components/MkUrlPreview.vue | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue index b51bcb2dc3..a842ab6a5e 100644 --- a/packages/client/src/components/MkSignin.vue +++ b/packages/client/src/components/MkSignin.vue @@ -41,9 +41,9 @@ </div> </div> <div class="social _section"> - <a v-if="meta && meta.enableTwitterIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/twitter`"><i class="fab fa-twitter" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'Twitter' }) }}</a> - <a v-if="meta && meta.enableGithubIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/github`"><i class="fab fa-github" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'GitHub' }) }}</a> - <a v-if="meta && meta.enableDiscordIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/discord`"><i class="fab fa-discord" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'Discord' }) }}</a> + <a v-if="meta && meta.enableTwitterIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/twitter`"><i class="ti ti-brand-twitter" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'Twitter' }) }}</a> + <a v-if="meta && meta.enableGithubIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/github`"><i class="ti ti-brand-github" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'GitHub' }) }}</a> + <a v-if="meta && meta.enableDiscordIntegration" class="_borderButton _gap" :href="`${apiUrl}/signin/discord`"><i class="ti ti-brand-discord" style="margin-right: 4px;"></i>{{ $t('signinWith', { x: 'Discord' }) }}</a> </div> </form> </template> @@ -51,6 +51,7 @@ <script lang="ts" setup> import { defineAsyncComponent } from 'vue'; import { toUnicode } from 'punycode/'; +import { showSuspendedDialog } from '../scripts/show-suspended-dialog'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkInfo from '@/components/MkInfo.vue'; @@ -58,7 +59,6 @@ import { apiUrl, host as configHost } from '@/config'; import { byteify, hexify } from '@/scripts/2fa'; import * as os from '@/os'; import { login } from '@/account'; -import { showSuspendedDialog } from '../scripts/show-suspended-dialog'; import { instance } from '@/instance'; import { i18n } from '@/i18n'; @@ -85,7 +85,7 @@ const props = defineProps({ withAvatar: { type: Boolean, required: false, - default: true + default: true, }, autoSet: { type: Boolean, @@ -95,13 +95,13 @@ const props = defineProps({ message: { type: String, required: false, - default: '' - } + default: '', + }, }); function onUsernameChange() { os.api('users/show', { - username: username + username: username, }).then(userResponse => { user = userResponse; }, () => { @@ -123,10 +123,10 @@ function queryKey() { allowCredentials: challengeData.securityKeys.map(key => ({ id: byteify(key.id, 'hex'), type: 'public-key', - transports: ['usb', 'nfc', 'ble', 'internal'] + transports: ['usb', 'nfc', 'ble', 'internal'], })), - timeout: 60 * 1000 - } + timeout: 60 * 1000, + }, }).catch(() => { queryingKey = false; return Promise.reject(null); @@ -141,7 +141,7 @@ function queryKey() { clientDataJSON: hexify(credential.response.clientDataJSON), credentialId: credential.id, challengeId: challengeData.challengeId, - 'hcaptcha-response': hCaptchaResponse, + 'hcaptcha-response': hCaptchaResponse, 'g-recaptcha-response': reCaptchaResponse, }); }).then(res => { @@ -151,7 +151,7 @@ function queryKey() { if (err === null) return; os.alert({ type: 'error', - text: i18n.ts.signinFailed + text: i18n.ts.signinFailed, }); signing = false; }); @@ -165,8 +165,8 @@ function onSubmit() { os.api('signin', { username, password, - 'hcaptcha-response': hCaptchaResponse, - 'g-recaptcha-response': reCaptchaResponse, + 'hcaptcha-response': hCaptchaResponse, + 'g-recaptcha-response': reCaptchaResponse, }).then(res => { totpLogin = true; signing = false; @@ -181,9 +181,9 @@ function onSubmit() { os.api('signin', { username, password, - 'hcaptcha-response': hCaptchaResponse, + 'hcaptcha-response': hCaptchaResponse, 'g-recaptcha-response': reCaptchaResponse, - token: user && user.twoFactorEnabled ? token : undefined + token: user && user.twoFactorEnabled ? token : undefined, }).then(res => { emit('login', res); onLogin(res); @@ -197,7 +197,7 @@ function loginFailed(err) { os.alert({ type: 'error', title: i18n.ts.loginFailed, - text: i18n.ts.noSuchUser + text: i18n.ts.noSuchUser, }); break; } @@ -226,7 +226,7 @@ function loginFailed(err) { os.alert({ type: 'error', title: i18n.ts.loginFailed, - text: JSON.stringify(err) + text: JSON.stringify(err), }); } } diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue index 9ef6efa1e5..ac03559bea 100644 --- a/packages/client/src/components/MkUrlPreview.vue +++ b/packages/client/src/components/MkUrlPreview.vue @@ -26,7 +26,7 @@ </transition> <div v-if="tweetId" class="expandTweet"> <a @click="tweetExpanded = true"> - <i class="fab fa-twitter"></i> {{ i18n.ts.expandTweet }} + <i class="ti ti-brand-twitter"></i> {{ i18n.ts.expandTweet }} </a> </div> </div> |