Skip to content

[Fix] login UI 수정 #133

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

Open
yena0213 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[Fix] login UI 수정 #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df526d7
[Design] login UI 수정
yena0213 Jan 9, 2026
ce96f99
[Chore] 로그인 상단부 안내문구 수정
yena0213 Jan 9, 2026
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
36 changes: 16 additions & 20 deletions MarketPlace/View/Login/LoginView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,9 @@ struct LoginView: View {
.padding(.leading, 20)

VStack(alignment: .leading, spacing: 10) {
Text("매번 마라탕 한 그릇, 이천 원 더 내고 있어요.")
Text("이제, 인천대 제휴 할인을 받으러 가볼까요?")
.pretendardFont(size: 12, weight: .semibold)
.foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))

Text("이제, 다니는 대학 제휴 멤버십으로 \n쿠폰 꾸러미 받아볼까요?")
.pretendardFont(size: 16, weight: .medium)
.foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))
}
.padding(.horizontal, 20)
.padding(.bottom, 14)
Expand Down Expand Up @@ -87,7 +83,7 @@ struct LoginView: View {
.pretendardFont(size: 14, weight: .regular)
.foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))

TextField("학번을 입력해 주세요.", text: $studentID)
TextField("학교 포털 아이디를 입력해 주세요", text: $studentID)
.pretendardFont(size: 13, weight: .regular)
.keyboardType(.numberPad)
.padding()
Expand All @@ -104,7 +100,7 @@ struct LoginView: View {
.pretendardFont(size: 14, weight: .regular)
.foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))

SecureField("비밀번호는 꼭꼭 지켜줄게요", text: $password)
SecureField("학교 포털 비밀번호를 입력해주세요", text: $password)
.pretendardFont(size: 13, weight: .regular)
.padding()
.frame(height: 48)
Expand All @@ -114,17 +110,20 @@ struct LoginView: View {
.focused($isEditing)
}

Text("학교 포털 아이디 / 비밀번호를 적어주세요!")
.pretendardFont(size: 12, weight: .medium)
.foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))

if !isEditing, let errorMessage = viewModel.userErrorMessage {
Text(errorMessage)
.pretendardFont(size: 14, weight: .regular)
.foregroundColor(.red)
.padding(.top, 10)
HStack(spacing: 20) {
CheckboxView(title: "계정 정보 저장", isChecked: $saveAccount, action: { _ in })
}

// Text("학교 포털 아이디 / 비밀번호를 적어주세요!")
// .pretendardFont(size: 12, weight: .medium)
// .foregroundColor(Color(red: 0.2, green: 0.2, blue: 0.2))
//
// if !isEditing, let errorMessage = viewModel.userErrorMessage {
// Text(errorMessage)
// .pretendardFont(size: 14, weight: .regular)
// .foregroundColor(.red)
// .padding(.top, 10)
// }
//
// MARK: - 로그인 버튼
Button(action: {
Task {
Expand All @@ -142,9 +141,6 @@ struct LoginView: View {
.cornerRadius(8)
}.disabled(studentID.isEmpty || password.isEmpty)

HStack(spacing: 20) {
CheckboxView(title: "계정 정보 저장", isChecked: $saveAccount, action: { _ in })
}
}
.padding(.horizontal, 20)

Expand Down