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

[Feature] 사장님 로그인 기능 구현 #378

Merged
merged 7 commits into from
Sep 17, 2024

Conversation

hsgo2430
Copy link
Contributor

개요


  • 사장님 로그인 기능 구현

상세 작업 내용


  • 사장님 로그인 기능 추가
  • 사장님 로그인 아이디 전화번호로 변경
  • 로그인 UI를 웹 UI와 동기화
  • 오류 메시지를 textfield 아래에 나오도록 변경

작업 결과물

  • 로그인 화면
  • 아이디 빈칸
  • 비밀번호 빈칸
  • 틀린 비밀번호

hsgo2430 added 6 commits May 13, 2024 12:32
…o feature/hsgo/business_login

# Conflicts:
#	business/src/main/java/in/koreatech/business/BusinessMainActivity.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/changepassword/ChangePasswordScreen.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/changepassword/ChangePasswordSideEffect.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/changepassword/ChangePasswordState.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/changepassword/ChangePasswordViewModel.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/finishchangepassword/FinishChangePasswordScreen.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/navigator/ChangePasswordRoute.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/navigator/FeatureChangePassword.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/passwordauthentication/PasswordAuthenticationScreen.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/passwordauthentication/PasswordAuthenticationSideEffect.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/passwordauthentication/PasswordAuthenticationState.kt
#	business/src/main/java/in/koreatech/business/feature/changepassword/passwordauthentication/PasswordAuthenticationViewModel.kt
#	business/src/main/java/in/koreatech/business/feature/findpassword/changepassword/ChangePasswordViewModel.kt
#	business/src/main/java/in/koreatech/business/feature/findpassword/navigator/ChangePasswordRoute.kt
#	business/src/main/java/in/koreatech/business/feature/findpassword/navigator/FeatureChangePassword.kt
#	business/src/main/java/in/koreatech/business/feature/findpassword/passwordauthentication/PasswordAuthenticationSideEffect.kt
#	business/src/main/java/in/koreatech/business/feature/insertstore/finishregisterstore/FinishRegisterStore.kt
#	business/src/main/java/in/koreatech/business/feature_changepassword/changepassword/ChangePasswordViewModel.kt
#	business/src/main/java/in/koreatech/business/feature_changepassword/finishchangepassword/FinishChangePasswordScreen.kt
#	business/src/main/java/in/koreatech/business/feature_changepassword/navigator/ChangePasswordRoute.kt
#	business/src/main/java/in/koreatech/business/feature_changepassword/navigator/FeatureChangePassword.kt
#	business/src/main/java/in/koreatech/business/feature_changepassword/passwordauthentication/PasswordAuthenticationSideEffect.kt
#	core/src/main/res/values/strings.xml
#	data/src/main/java/in/koreatech/koin/data/error/UserErrorHandlerImpl.kt
#	data/src/main/res/values/strings.xml
@hsgo2430 hsgo2430 requested a review from a team as a code owner September 13, 2024 09:38
Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

로그인 버튼과 회원가입 버튼 사이 간격이 넓어 보이는데 확인 부탁드립니다!

intent {
reduce {
state.copy(notValidateField = true)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ShowNullMessage 보다 ShowErrorMessage가 낫지 않을까요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

바꾸는걸 깜빡했네요... 수정하겠습니다!

id -> viewModel.insertId(id)
},
onPasswordChange = {
password -> viewModel.insertPassword(password)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
password -> viewModel.insertPassword(password)
password -> viewModel::insertPassword

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이런 방법이 있었군요...!
한번 공부를 해봐야겠어요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이런 방법이 있군요...
한번 공부를 해봐야겠네요!

else if(state.password.isBlank()) postSideEffect(SignInSideEffect.ShowNullMessage(ErrorType.NullPassword))
}
}
private fun toastErrorMessage(message: String) = intent {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private fun toastErrorMessage(message: String) = intent {
private fun showErrorMessage(message: String) = intent {

나중에 toast가 될수도 있고 snackbar이 될수도 있으니 범용적으로 메소드 명을 짓는거는 어떨까요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정했어야 했는데 깜빡했나보네요 감사합니다!

Copy link
Contributor

@yunjaena yunjaena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 수고했습니다!

Copy link
Member

@skdud0629 skdud0629 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수고하셨어요!

@hsgo2430 hsgo2430 merged commit 0cb6a3c into develop Sep 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants