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.

Sign up for GitHub

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

Jump to bottom

Add sendFeedback button to OnboardScene #314

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Add sendFeedback button to OnboardScene #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a963ec
Add sendFeedback button to `OnboardScene`
peng-u-0807 Oct 2, 2024
2aac202
Apply SwiftFormat changes
peng-u-0807 Oct 2, 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
14 changes: 14 additions & 0 deletions SNUTT-2022/SNUTT/ViewModels/OnboardViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ extension OnboardScene {
}
}

func sendFeedback(email: String, message: String) async -> Bool {
if !Validation.check(email: email) {
services.globalUIService.presentErrorAlert(error: .INVALID_EMAIL)
return false
}
do {
try await services.etcService.sendFeedback(email: email, message: message)
return true
} catch {
services.globalUIService.presentErrorAlert(error: error)
return false
}
}

func sendVerificationCode(email: String) async -> Bool {
do {
try await services.userService.sendVerificationCode(email: email)
Expand Down
142 changes: 80 additions & 62 deletions SNUTT-2022/SNUTT/Views/Scenes/OnboardScene.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ struct OnboardScene: View {

@State private var pushToSignUpScene = false
@State private var pushToLoginScene = false
@State private var pushToFeedbackView = false
@Binding var pushToTimetableScene: Bool

@Namespace private var launchScreenAnimation
Expand All @@ -21,82 +22,97 @@ struct OnboardScene: View {
var body: some View {
ZStack {
if isActivated {
VStack(spacing: 15) {
Spacer()
.frame(height: 200)

Logo(orientation: .vertical)
.matchedGeometryEffect(id: logoId, in: launchScreenAnimation)

VStack {
GeometryReader { proxy in
VStack(spacing: 0) {
Spacer()

Button {
pushToLoginScene = true
} label: {
Text("로그인")
.font(.system(size: 14, weight: .bold))
.foregroundColor(.white)
.frame(maxWidth: .infinity, maxHeight: 41)
.background(
RoundedRectangle(cornerRadius: 10, style: .continuous)
.foregroundColor(STColor.cyan)
)
}
.padding(.horizontal, 32)

Button {
pushToSignUpScene = true
} label: {
Text("회원가입")
.font(.system(size: 14, weight: .semibold))
.foregroundColor(.init(uiColor: .label))
.padding(.top, 12)
.padding(.bottom, 40)
}
Logo(orientation: .vertical)
.matchedGeometryEffect(id: logoId, in: launchScreenAnimation)

HStack(spacing: 10) {
Rectangle()
.fill(STColor.gray20)
.frame(height: 1)
Text("SNS 계정으로 계속하기")
.font(.system(size: 14, weight: .semibold))
.foregroundColor(STColor.gray20)
.fixedSize(horizontal: true, vertical: false)
Rectangle()
.fill(STColor.gray20)
.frame(height: 1)
}
.padding(.bottom, 24)
Spacer().frame(height: proxy.size.height * 0.16)

HStack(spacing: 12) {
Button {
viewModel.performKakaoSignIn()
} label: {
Image("sns.kakao")
VStack(spacing: 0) {
VStack(spacing: 14) {
Button {
pushToLoginScene = true
} label: {
Text("로그인")
.font(.system(size: 15, weight: .bold))
.foregroundColor(.white)
.padding(.vertical, 12)
.frame(maxWidth: .infinity)
.background(
RoundedRectangle(cornerRadius: 6, style: .continuous)
.foregroundColor(STColor.cyan)
)
}
.padding(.horizontal, 20)

Button {
pushToSignUpScene = true
} label: {
Text("회원가입")
.font(.system(size: 14, weight: .semibold))
.foregroundColor(STColor.darkerGray)
}
}
Button {
viewModel.performGoogleSignIn()
} label: {
Image("sns.google")

Spacer().frame(height: proxy.size.height * 0.07)

HStack(spacing: 10) {
Rectangle()
.fill(STColor.gray20)
.frame(height: 1)
Text("SNS 계정으로 계속하기")
.font(.system(size: 14, weight: .semibold))
.foregroundColor(STColor.gray20)
.fixedSize(horizontal: true, vertical: false)
Rectangle()
.fill(STColor.gray20)
.frame(height: 1)
}
Button {
viewModel.performFacebookSignIn()
} label: {
Image("sns.facebook")

Spacer().frame(height: 24)

HStack(spacing: 12) {
Button {
viewModel.performKakaoSignIn()
} label: {
Image("sns.kakao")
}
Button {
viewModel.performGoogleSignIn()
} label: {
Image("sns.google")
}
Button {
viewModel.performFacebookSignIn()
} label: {
Image("sns.facebook")
}
Button {
viewModel.performAppleSignIn()
} label: {
Image("sns.apple")
}
}

Spacer().frame(height: proxy.size.height * 0.06)

Button {
viewModel.performAppleSignIn()
pushToFeedbackView = true
} label: {
Image("sns.apple")
Text("로그인/회원가입에 문제가 생겼나요?")
.font(.system(size: 14, weight: .semibold))
.foregroundStyle(STColor.gray2)
}
}
.padding(.horizontal, 12)

Spacer()
Spacer().frame(height: proxy.size.height * 0.05)
}
.padding(.horizontal, 12)
.transition(.scale(scale: 1))
}
.transition(.scale(scale: 1))
} else {
VStack {
Spacer()
Expand All @@ -114,6 +130,8 @@ struct OnboardScene: View {
NavigationLink(destination: SignUpView(registerLocalId: viewModel.registerWith(id:password:email:), sendVerificationCode: viewModel.sendVerificationCode(email:), checkVerificationCode: viewModel.submitVerificationCode(code:), pushToTimetableScene: $pushToTimetableScene), isActive: $pushToSignUpScene) { EmptyView() }

NavigationLink(destination: LoginScene(viewModel: .init(container: viewModel.container), moveToTimetableScene: $pushToTimetableScene), isActive: $pushToLoginScene) { EmptyView() }

NavigationLink(destination: UserSupportView(email: nil, sendFeedback: viewModel.sendFeedback(email:message:)), isActive: $pushToFeedbackView) { EmptyView() }
}
)
.onLoad {
Expand Down