diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-26 16:19:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 16:19:08 +0900 |
| commit | d230503913b3be795a5e1a5c810c996bad7cdaff (patch) | |
| tree | 8a05670556fb9c4a0784ada7ed72a70ca30e0a93 /src | |
| parent | Merge pull request #1295 from rinsuki/features/user-tab-position-sticky (diff) | |
| parent | デスクトップ版にTwitterでログインするリンクを復活させた (diff) | |
| download | sharkey-d230503913b3be795a5e1a5c810c996bad7cdaff.tar.gz sharkey-d230503913b3be795a5e1a5c810c996bad7cdaff.tar.bz2 sharkey-d230503913b3be795a5e1a5c810c996bad7cdaff.zip | |
Merge pull request #1296 from rinsuki/features/revived-twitter-login-link-on-desktop
デスクトップ版にTwitterでログインするリンクを復活させた
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/app/common/views/components/signin.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/web/app/common/views/components/signin.vue b/src/web/app/common/views/components/signin.vue index d8b1357764..37ce4de327 100644 --- a/src/web/app/common/views/components/signin.vue +++ b/src/web/app/common/views/components/signin.vue @@ -10,11 +10,13 @@ <input v-model="token" type="number" placeholder="%i18n:common.tags.mk-signin.token%" required/>%fa:lock% </label> <button type="submit" :disabled="signing">{{ signing ? '%i18n:common.tags.mk-signin.signing-in%' : '%i18n:common.tags.mk-signin.signin%' }}</button> + もしくは <a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a> </form> </template> <script lang="ts"> import Vue from 'vue'; +import { apiUrl } from '../../../config'; export default Vue.extend({ data() { @@ -23,7 +25,8 @@ export default Vue.extend({ user: null, username: '', password: '', - token: '' + token: '', + apiUrl, }; }, methods: { @@ -40,7 +43,7 @@ export default Vue.extend({ (this as any).api('signin', { username: this.username, password: this.password, - token: this.user && this.user.account.two_factor_enabled ? this.token : undefined + token: this.user && this.user.two_factor_enabled ? this.token : undefined }).then(() => { location.reload(); }).catch(() => { |