natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1296 from rinsuki/features/revived-twitter-login-link-on-desktop 

デスクトップ版にTwitterでログインするリンクを復活させた
This commit is contained in:
syuilo 2018-03-26 16:19:08 +09:00 committed by GitHub
parent 8bdb074b5d 7676b86617
commit d230503913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/web/app/common/views/components/signin.vue
View File

@ -10,11 +10,13 @@
<input v-model="token" type="number" placeholder="%i18n:common.tags.mk-signin.token%" required/>%fa:lock% <input v-model="token" type="number" placeholder="%i18n:common.tags.mk-signin.token%" required/>%fa:lock%
</label> </label>
<button type="submit" :disabled="signing">{{ signing ? '%i18n:common.tags.mk-signin.signing-in%' : '%i18n:common.tags.mk-signin.signin%' }}</button> <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> </form>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { apiUrl } from '../../../config';
export default Vue.extend({ export default Vue.extend({
data() { data() {
@ -23,7 +25,8 @@ export default Vue.extend({
user: null, user: null,
username: '', username: '',
password: '', password: '',
token: '' token: '',
apiUrl,
}; };
}, },
methods: { methods: {
@ -40,7 +43,7 @@ export default Vue.extend({
(this as any).api('signin', { (this as any).api('signin', {
username: this.username, username: this.username,
password: this.password, 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(() => { }).then(() => {
location.reload(); location.reload();
}).catch(() => { }).catch(() => {