Skip to content
This repository was archived by the owner on Oct 13, 2022. It is now read-only.

#24･#31･#25･#28･#9 入退場・入退室・閲覧権限・汎用エラー表示・日本語化#30

Merged
su8ru merged 107 commits intodevelopfrom
feature/#24_enter_and_exit_scan
Mar 17, 2021
Merged

#24･#31･#25･#28･#9 入退場・入退室・閲覧権限・汎用エラー表示・日本語化#30
su8ru merged 107 commits intodevelopfrom
feature/#24_enter_and_exit_scan

Conversation

@su8ru
Copy link
Member

@su8ru su8ru commented Mar 3, 2021 •
edited
Loading

close #24 #31 #25 #28 #9

Special Thanks @ibuki2003

loxcan

yarn.lock

Package Before After
➕ moment 2.29.1
⬆️ @afes-website/docs 2.0.3 2.3.0-alpha.2
⬆️ prettier 2.0.5 2.2.1
➖ @fortawesome/fontawesome-common-types 0.2.30
➖ @fortawesome/fontawesome-svg-core 1.2.30
➖ @fortawesome/free-brands-svg-icons 5.14.0
➖ @fortawesome/free-regular-svg-icons 5.14.0
➖ @fortawesome/free-solid-svg-icons 5.14.0
➖ @fortawesome/react-fontawesome 0.1.11
➖ @popperjs/core 2.4.4
➖ @restart/context 2.1.4
➖ @restart/hooks 0.3.25
➖ @restart/hooks 0.3.25
➖ @types/classnames 2.2.10
➖ @types/invariant 2.2.33
➖ @types/warning 3.0.0
➖ invariant 2.2.4
➖ lodash-es 4.17.15
➖ prop-types-extra 1.1.1
➖ react-bootstrap 1.3.0
➖ react-lifecycles-compat 3.0.4
➖ react-overlays 4.1.0
➖ uncontrollable 7.1.1
➖ warning 4.0.3
➖ warning 4.0.3

su8ru added 30 commits February 16, 2021 21:37
@su8ru
build: upgrade @afes-website/docs (v2.2.14) and take by npm
20706c1
@su8ru
build: upgrade @afes-website/docs (v2.2.17)
6d3c314
@su8ru
feat: override card component with marginTop
348837c
@su8ru
feat: add general enter
9691dab
@su8ru
refactor: cut out DirectInputModal component
d021df0
@su8ru
feat: add General Exit Scan Page
fd3f41e
@su8ru
feat: change direct input button to fab and create component
c096b8b
@su8ru
fix: change the color of DirectInputModal to the dark theme compatibl…
e702273 
…e color
@su8ru
build: add clsx
65085ea
@su8ru
feat: create ResultChip component
33e2dd2
@su8ru
feat: replace snack bar in exit scan to result chip
0568a4d
@su8ru
feat: replace snack bar in enter scan to result chip
566fb71
@su8ru
fix: use theme color palette for bg color of ResultChip
6e6dae4
@su8ru
fix: set z-index:500 to RightBottomFab
0eceba1
@su8ru
refactor: rename ResultChipColors
45ff0b1
@su8ru
feat: create ResultPopup component
fceebae
@su8ru
feat: improve EnterScan UI
d22fb85
@su8ru
feat: set direct input modal default value
072a884
@su8ru
feat: renew result chip to open and close with func
9c14170
@su8ru
refactor: create gaps between cards with CardList as a template compo…
edfe4a4 
…nent
@su8ru
feat: improve title
e05a844
@su8ru
feat: improve popup design
d27893c
@su8ru
feat: show ListIcon in ExitScan
61de762
@su8ru
feat: override default react-qr-reader style
b82c8e5
@su8ru
chore: add todo comment in errorHandler
a3c530c
@su8ru
fix: hide defaultViewFinder with prepared option prop
18ddfab
@su8ru
fix: add type guard in handleGuestIdScan catch
814a292
@su8ru
refactor: improve type guard
2f01cfd
@su8ru
refactor: redifine ResultChipColors by ResultPopupColors
18d4f4d
@su8ru
feat: add afesBlue, afesDark and afesLight to theme.palette
22484c1
@su8ru su8ru requested a review from ibuki2003 March 15, 2021 15:52
Takeno-hito
Takeno-hito suggested changes Mar 15, 2021
View reviewed changes
@afes-website afes-website deleted a comment from Takeno-hito Mar 16, 2021
@afes-website afes-website deleted a comment from Takeno-hito Mar 16, 2021
@su8ru su8ru requested a review from Takeno-hito March 16, 2021 14:08
@su8ru su8ru force-pushed the feature/#24_enter_and_exit_scan branch from 534d5fe to 2ebbcd1 Compare March 16, 2021 15:03
@su8ru su8ru force-pushed the feature/#24_enter_and_exit_scan branch from 2ebbcd1 to 3c9fc8b Compare March 16, 2021 15:03
@su8ru
Copy link
Member Author

su8ru commented Mar 16, 2021

@Takeno-hito @ibuki2003 re-req 🙇

ibuki2003
ibuki2003 previously approved these changes Mar 16, 2021
View reviewed changes
Takeno-hito
Takeno-hito suggested changes Mar 17, 2021
View reviewed changes
@su8ru su8ru changed the title #24･#31･#28 入退場・入退室・汎用エラー表示 #24･#31･#25･#28 入退場・入退室・閲覧権限・汎用エラー表示 Mar 17, 2021
@su8ru su8ru linked an issue Mar 17, 2021 that may be closed by this pull request
各ページで認証情報を確かめる #25
Closed
@su8ru su8ru requested a review from Takeno-hito March 17, 2021 13:49
Takeno-hito
Takeno-hito suggested changes Mar 17, 2021
View reviewed changes
@su8ru su8ru requested review from Takeno-hito and ibuki2003 March 17, 2021 14:21
@su8ru su8ru changed the title #24･#31･#25･#28 入退場・入退室・閲覧権限・汎用エラー表示 #24･#31･#25･#28･#9 入退場・入退室・閲覧権限・汎用エラー表示・日本語化 Mar 17, 2021
@su8ru su8ru linked an issue Mar 17, 2021 that may be closed by this pull request
UI の日本語化 #9
Closed
@su8ru su8ru merged commit eefff09 into develop Mar 17, 2021
@su8ru su8ru deleted the feature/#24_enter_and_exit_scan branch March 17, 2021 14:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@Takeno-hito Takeno-hito Takeno-hito approved these changes

@ibuki2003 ibuki2003 ibuki2003 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@su8ru su8ru

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

入退室スキャン 汎用性の高いエラー表示 各ページで認証情報を確かめる 入退場スキャン UI の日本語化

3 participants

@su8ru @Takeno-hito @ibuki2003