-
Notifications
You must be signed in to change notification settings - Fork 1
Feat/frontend/no chakra #217
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
Merged
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
0bee9c2
refactor: Footerと関連コンポーネントのChakra依存を削除
arkwnet 6aaf970
refactor: Headerと関連コンポーネントのChakra依存を削除 (wip)
arkwnet 5474c76
refactor: GamePreのChakra依存を削除
arkwnet af4bdd2
refactor: GameTypingのChakra依存を削除
arkwnet b27ed64
feat: 権利的にクリーンなユーザ画像を作成
arkwnet 71b93fa
Merge remote-tracking branch 'origin' into feat/frontend/no-chakra
arkwnet 4d0c1f1
refactor: RankingTableのChakra依存を削除
arkwnet d341ff6
refactor: GamePreの色指定にcolor.scssを使用
arkwnet 028c5fb
refactor: PaginationのChakra依存を削除
arkwnet c9638a5
refactor: ホーム画面ボタンのChakra依存を削除 (wip)
arkwnet 4f60e60
refactor: RefreshButtonのChakra依存を削除
arkwnet bfd7c6e
refactor: ホーム画面のChakra依存を削除 (wip)
arkwnet 0393fa5
feat: GameResultのChakra依存削除とTODO対応
arkwnet 9bfeb6f
refactor: pages/Game.tsxのChakra依存を削除
arkwnet 390ad3a
refactor: UserCardのChakra依存を削除
arkwnet 53ad267
refactor: LoginModal/LogoutModalのChakra依存を削除 (wip)
arkwnet f6ef9f8
refactor: RankingTabsのChakra依存を削除
arkwnet 4ef4911
refactor: GameTypingの色指定にcolor.scssを使用
arkwnet 4508672
fix: レイアウトの微調整など
arkwnet fe02314
fix: UserCardがユニットテストに落ちる問題を修正
arkwnet 54e4b96
fix: UserCardがユニットテストに落ちる問題を修正2
arkwnet efbd837
fix: GitHub Actionsの自動ビルドが失敗する問題を修正
arkwnet ac6a96f
簡単に直せないので一旦 lint warning を無視
h-takeyeah 43f6e05
fix: formのサブミットが動かないのを場当たり的に修正
h-takeyeah 485cdbd
style: format code
h-takeyeah acbe9a4
fix: Pull Request 指摘事項対応
arkwnet 46a8730
refactor: RankingTabsの正打率/入力文字数タブのTSXコードを改善
arkwnet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| .banner { | ||
| padding-left: 5px; | ||
| padding-top: 8px; | ||
|
|
||
| img { | ||
| height: 54px; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .button { | ||
| margin: 0 10px; | ||
| padding: 10px 20px; | ||
| color: color.$white; | ||
| background-color: color.$blue-800; | ||
| font-size: 18px; | ||
| border: 0; | ||
| border-radius: 4px; | ||
| float: left; | ||
| user-select: none; | ||
| cursor: pointer; | ||
| transition: all 0.2s 0s ease; | ||
|
|
||
| &:hover { | ||
| background-color: color.$blue-500; | ||
| } | ||
|
|
||
| &:disabled { | ||
| opacity: 0.5; | ||
| cursor: not-allowed; | ||
|
|
||
| &:hover { | ||
| background-color: color.$blue-800; | ||
| } | ||
| } | ||
| } | ||
28 changes: 28 additions & 0 deletions
28
typing-app/src/assets/sass/atoms/RefreshButton.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .button { | ||
| width: 60px; | ||
| height: 50px; | ||
| padding: 13px 18px; | ||
| color: color.$white; | ||
| background-color: color.$blue-800; | ||
| border-radius: 4px; | ||
| float: left; | ||
| text-align: center; | ||
| user-select: none; | ||
| cursor: pointer; | ||
| transition: all 0.2s 0s ease; | ||
|
|
||
| &:hover { | ||
| background-color: color.$blue-500; | ||
| } | ||
|
|
||
| &.disabled { | ||
| opacity: 0.5; | ||
| cursor: default; | ||
|
|
||
| &:hover { | ||
| background-color: color.$blue-800; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .separator { | ||
| width: 100%; | ||
| height: 2px; | ||
| background-color: color.$white; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| $black: #000; | ||
| $white: #fff; | ||
| $red-800: #c62828; | ||
| $yellow-500: #ffeb3b; | ||
| $blue-500: #2196f3; | ||
| $blue-800: #1565c0; | ||
| $gray-300: #e0e0e0; | ||
| $gray-500: #9e9e9e; | ||
| $gray-800: #424242; | ||
| $gray-900: #212121; | ||
| $bluegray-800: #37474f; | ||
| $bluegray-900: #263238; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| @use "color.scss"; | ||
|
|
||
| .modal { | ||
| .overlay { | ||
| width: 100%; | ||
| height: 100%; | ||
| position: fixed; | ||
| left: 0; | ||
| top: 0; | ||
| background-color: color.$black; | ||
| opacity: 0.5; | ||
| z-index: 99; | ||
| } | ||
|
|
||
| .content { | ||
| width: 600px; | ||
| height: 300px; | ||
| position: fixed; | ||
| left: calc(50% - 300px); | ||
| top: calc(50% - 150px); | ||
| background-color: color.$white; | ||
| border-radius: 4px; | ||
| z-index: 100; | ||
|
|
||
| .header { | ||
| width: calc(100% - 40px); | ||
| position: absolute; | ||
| left: 20px; | ||
| top: 18px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| border-radius: 4px; | ||
| } | ||
|
|
||
| .body { | ||
| width: calc(100% - 40px); | ||
| position: absolute; | ||
| left: 20px; | ||
| top: 64px; | ||
| font-size: 18px; | ||
|
|
||
| input[type="text"] { | ||
| padding: 10px; | ||
| font-size: 18px; | ||
| border: solid 1px color.$gray-500; | ||
| border-radius: 4px; | ||
| } | ||
| } | ||
|
|
||
| .footer { | ||
| overflow: hidden; | ||
| position: absolute; | ||
| right: 20px; | ||
| bottom: 20px; | ||
|
|
||
| .button { | ||
| height: 40px; | ||
| margin-left: 10px; | ||
| padding: 7px 40px; | ||
| font-size: 18px; | ||
| border-radius: 4px; | ||
| text-align: center; | ||
| user-select: none; | ||
| cursor: pointer; | ||
| float: left; | ||
| border: none; | ||
| outline: none; | ||
| appearance: none; | ||
| transition: all 0.2s 0s ease; | ||
| } | ||
|
|
||
| .blue { | ||
| color: color.$white; | ||
| background-color: color.$blue-800; | ||
|
|
||
| &:hover { | ||
| background-color: color.$blue-500; | ||
| } | ||
| } | ||
|
|
||
| .gray { | ||
| color: color.$black; | ||
| background-color: color.$white; | ||
|
|
||
| &:hover { | ||
| background-color: color.$gray-300; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .brand-text { | ||
| padding-left: 5px; | ||
| } |
4 changes: 4 additions & 0 deletions
4
typing-app/src/assets/sass/molecules/GameStartButton.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .button { | ||
| margin-bottom: 10px; | ||
| cursor: pointer; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @use "../modal.scss"; |
3 changes: 3 additions & 0 deletions
3
typing-app/src/assets/sass/molecules/LogoutButton.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .button { | ||
| cursor: pointer; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| @use "../modal.scss"; |
4 changes: 4 additions & 0 deletions
4
typing-app/src/assets/sass/molecules/RankingButton.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .button { | ||
| margin-bottom: 10px; | ||
| cursor: pointer; | ||
| } |
9 changes: 9 additions & 0 deletions
9
typing-app/src/assets/sass/molecules/RankingTableHead.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .head th { | ||
| padding: 6px 0; | ||
| color: color.$white; | ||
| background-color: color.$blue-800; | ||
| font-size: 18px; | ||
| font-weight: bold; | ||
| } |
28 changes: 28 additions & 0 deletions
28
typing-app/src/assets/sass/molecules/RankingTableRow.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .row { | ||
| background-color: color.$gray-900; | ||
| color: color.$white; | ||
|
|
||
| td { | ||
| padding: 12px 0; | ||
| text-align: center; | ||
| font-size: 20px; | ||
| } | ||
|
|
||
| .rank { | ||
| color: color.$white; | ||
| background-color: color.$blue-800; | ||
| font-weight: bold; | ||
| outline: 10px solid color.$gray-900; | ||
| outline-offset: -10px; | ||
| } | ||
|
|
||
| &:nth-child(odd) { | ||
| background-color: color.$gray-800; | ||
|
|
||
| .rank { | ||
| outline: 10px solid color.$gray-800; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .user-card { | ||
| width: 360px; | ||
| position: absolute; | ||
| right: 0; | ||
| top: 0; | ||
| background-color: color.$blue-800; | ||
| overflow: hidden; | ||
|
|
||
| .left { | ||
| width: 70px; | ||
| float: left; | ||
|
|
||
| img { | ||
| width: 70px; | ||
| } | ||
| } | ||
|
|
||
| .right { | ||
| width: calc(100% - 70px); | ||
| padding-left: 15px; | ||
| float: right; | ||
|
|
||
| .name { | ||
| padding-top: 10px; | ||
| color: color.$white; | ||
| font-size: 18px; | ||
| font-weight: bold; | ||
| text-overflow: ellipsis; | ||
| } | ||
|
|
||
| .number { | ||
| color: color.$white; | ||
| font-size: 14px; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .footer { | ||
| width: 100%; | ||
| height: 60px; | ||
| position: fixed; | ||
| left: 0; | ||
| bottom: 0; | ||
|
|
||
| .brand-text { | ||
| background-color: color.$blue-800; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| @use "../color.scss"; | ||
|
|
||
| .header { | ||
| width: 100%; | ||
| height: 70px; | ||
| position: fixed; | ||
| left: 0; | ||
| top: 0; | ||
| background-color: color.$bluegray-800; | ||
| } |
11 changes: 11 additions & 0 deletions
11
typing-app/src/assets/sass/organism/HomeMenuContainer.module.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| .menu { | ||
| width: 100%; | ||
| height: 100%; | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
|
|
||
| .container { | ||
| display: block; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| .ranking { | ||
| width: 80%; | ||
| margin: 0 10%; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.