Skip to content

Commit

Permalink
Feat: 대학 정보 없음 api 연동
Browse files Browse the repository at this point in the history
  • Loading branch information
eunseo0105 committed Aug 12, 2024
1 parent 6ab28c8 commit f6f0693
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ package com.moneymong.moneymong.model.sign

data class TokenRequest (
val provider : String,
val accessToken : String
val accessToken : String,
val name: String,
val code: String
)
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ data class TokenResponse(
val accessToken : String,
val refreshToken : String,
val loginSuccess : Boolean,
val schoolInfoExist : Boolean
val schoolInfoExist : Boolean,
val schoolInfoProvided: Boolean
)
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.moneymong.moneymong.model.sign

data class UnivRequest(
val universityName: String,
val grade: Int
val universityName: String?,
val grade: Int?
)
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TokenRemoteDataSourceImpl @Inject constructor(
type: LoginType,
accessToken: String
): Result<TokenResponse> {
return accessTokenApi.postAccessToken(TokenRequest(type.name, accessToken))
return accessTokenApi.postAccessToken(TokenRequest(type.name, accessToken, "", ""))
}

override suspend fun getUpdateToken(refreshToken: String): Result<RefreshTokenResponse> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ fun SignUpContent(
}
}

Box(
Column(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,39 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.material.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.moneymong.moneymong.design_system.component.button.MDSButton
import com.moneymong.moneymong.design_system.component.button.MDSButtonSize
import com.moneymong.moneymong.design_system.component.button.MDSButtonType
import com.moneymong.moneymong.design_system.error.ErrorDialog
import com.moneymong.moneymong.design_system.theme.Blue04
import com.moneymong.moneymong.design_system.theme.Body3
import com.moneymong.moneymong.feature.sign.sideeffect.SignUpSideEffect

@Composable
fun SignUpButtonView(
modifier: Modifier = Modifier ,
isEnabled : Boolean,
visiblePopUpError : Boolean,
popUpErrorMessage : String,
visiblePopUpErrorChanged : (Boolean) -> Unit,
onCreateUniversity : () -> Unit,
storeSchoolInfoExist : (Boolean) -> Unit
modifier: Modifier = Modifier,
isEnabled: Boolean,
visiblePopUpError: Boolean,
popUpErrorMessage: String,
visiblePopUpErrorChanged: (Boolean) -> Unit,
onCreateUniversity: () -> Unit,
storeSchoolInfoExist: (Boolean) -> Unit
) {
if(visiblePopUpError){
if (visiblePopUpError) {
ErrorDialog(
message = popUpErrorMessage,
onConfirm = {
visiblePopUpErrorChanged(false)
}
)
}
else{
} else {
Column(
modifier = modifier
) {
Expand All @@ -46,7 +52,17 @@ fun SignUpButtonView(
enabled = isEnabled
)
Spacer(modifier = Modifier.height(8.dp))

TextButton(
modifier = Modifier.align(Alignment.CenterHorizontally),
onClick = { onCreateUniversity() }
){
Text(
textAlign = TextAlign.Center,
text = "입력할 대학 정보가 없어요",
color = Blue04,
style = Body3
)
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SignUpViewModel @Inject constructor(
private val univUseCase: UnivUseCase,
private val schoolInfoUseCase : SchoolInfoUseCase,
) : BaseViewModel<SignUpState, SignUpSideEffect>(SignUpState()) {
fun createUniv(universityName: String, grade: Int) = intent {
fun createUniv(universityName: String?, grade: Int?) = intent {
val body = UnivRequest(universityName, grade)
univUseCase.createUniv(body)
.onSuccess {
Expand Down

0 comments on commit f6f0693

Please sign in to comment.