Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(frontend): サインイン画面の改善 #14658

Merged
merged 43 commits into from
Oct 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5416198
wip
syuilo Sep 30, 2024
d5a3fb1
Merge remote-tracking branch 'msky/signin-captcha' into enh-tweak-sig…
kakkokari-gtyih Sep 30, 2024
a3fe00d
Update MkSignin.vue
syuilo Sep 30, 2024
4597848
Update MkSignin.vue
syuilo Sep 30, 2024
af7fc7c
wip
syuilo Sep 30, 2024
087b34b
Update CHANGELOG.md
syuilo Sep 30, 2024
80d068c
enhance(frontend): サインイン画面の改善
kakkokari-gtyih Sep 30, 2024
75854f5
Update Changelog
kakkokari-gtyih Sep 30, 2024
8865cef
Merge remote-tracking branch 'msky/signin-captcha' into enh-tweak-sig…
kakkokari-gtyih Sep 30, 2024
76e3950
Merge branch 'develop' into enh-tweak-signin-dialog
kakkokari-gtyih Sep 30, 2024
305925d
14655の変更取り込み
kakkokari-gtyih Sep 30, 2024
8ba9bd9
Merge branch 'enh-tweak-signin-dialog' of https://github.com/kakkokar…
kakkokari-gtyih Sep 30, 2024
6496df3
spdx
kakkokari-gtyih Sep 30, 2024
d568dda
fix
kakkokari-gtyih Sep 30, 2024
319cc79
fix
kakkokari-gtyih Sep 30, 2024
0636d6b
fix
kakkokari-gtyih Sep 30, 2024
c3f1d27
:art:
syuilo Oct 1, 2024
d4fa970
:art:
syuilo Oct 1, 2024
ee8e1b5
:art:
syuilo Oct 1, 2024
6983287
:art:
syuilo Oct 3, 2024
ae4c690
Merge branch 'develop' into enh-tweak-signin-dialog
kakkokari-gtyih Oct 3, 2024
65aac75
Captchaがリセットされない問題を修正
kakkokari-gtyih Oct 3, 2024
adabff7
次の処理をsignin apiから読み取るように
kakkokari-gtyih Oct 3, 2024
e91fc62
Add Comments
kakkokari-gtyih Oct 3, 2024
fdc696b
fix
kakkokari-gtyih Oct 3, 2024
1e88676
fix test
kakkokari-gtyih Oct 3, 2024
374e7d5
attempt to fix test
kakkokari-gtyih Oct 3, 2024
1134187
fix test
kakkokari-gtyih Oct 3, 2024
d5c96ed
fix test
kakkokari-gtyih Oct 3, 2024
51c5bc6
fix test
kakkokari-gtyih Oct 3, 2024
ee6e69c
fix
kakkokari-gtyih Oct 3, 2024
e8d93e7
fix test
kakkokari-gtyih Oct 3, 2024
46c9451
Merge branch 'develop' into enh-tweak-signin-dialog
kakkokari-gtyih Oct 3, 2024
88325d8
fix: 一部のエラーがちゃんと出るように
kakkokari-gtyih Oct 4, 2024
46f68cb
Update Changelog
kakkokari-gtyih Oct 4, 2024
9cf047c
:art:
kakkokari-gtyih Oct 4, 2024
70e772e
:art:
kakkokari-gtyih Oct 4, 2024
0d81649
Merge branch 'develop' into pr/14658
syuilo Oct 4, 2024
0db8ac0
Merge branch 'develop' into pr/14658
syuilo Oct 4, 2024
6efa4a3
remove border
kakkokari-gtyih Oct 4, 2024
9e45d62
Merge branch 'enh-tweak-signin-dialog' of https://github.com/kakkokar…
kakkokari-gtyih Oct 4, 2024
6cea42a
Merge branch 'develop' into pr/14658
syuilo Oct 4, 2024
e962140
Merge branch 'develop' into enh-tweak-signin-dialog
kakkokari-gtyih Oct 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix
kakkokari-gtyih committed Sep 30, 2024
commit d568dda75b35d121f8302dcaa5ca6ae12bd89319
4 changes: 1 addition & 3 deletions cypress/e2e/basic.cy.ts
Original file line number Diff line number Diff line change
@@ -144,11 +144,9 @@ describe('After user signup', () => {

cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
cy.get('[data-cy-signin-username] input').type('alice{enter}');
cy.get('[data-cy-signin-page-password]').should('be.visible', { timeout: 10000 });
cy.get('[data-cy-signin-password] input').type('alice1234{enter}');

// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);
cy.contains(/ユーザーが見つかりません|User not found/gi);
});
});

2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkSignin.vue
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ async function onUsernameSubmitted(username: string) {

userInfo.value = await misskeyApi('users/show', {
username,
});
}).catch(() => null);

if (userInfo.value == null) {
await os.alert({