From df526d7edb463079307e71b0b99ae518db8534e1 Mon Sep 17 00:00:00 2001 From: yena0213 Date: Fri, 9 Jan 2026 10:53:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Design]=20login=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MarketPlace/View/Login/LoginView.swift | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/MarketPlace/View/Login/LoginView.swift b/MarketPlace/View/Login/LoginView.swift index 33d927a..edf12c4 100644 --- a/MarketPlace/View/Login/LoginView.swift +++ b/MarketPlace/View/Login/LoginView.swift @@ -87,7 +87,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() @@ -104,7 +104,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) @@ -114,17 +114,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 { @@ -142,9 +145,6 @@ struct LoginView: View { .cornerRadius(8) }.disabled(studentID.isEmpty || password.isEmpty) - HStack(spacing: 20) { - CheckboxView(title: "계정 정보 저장", isChecked: $saveAccount, action: { _ in }) - } } .padding(.horizontal, 20) From ce96f9919bbf296d670b064ff2c8639a895d5463 Mon Sep 17 00:00:00 2001 From: yena0213 Date: Fri, 9 Jan 2026 11:08:53 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Chore]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=83=81=EB=8B=A8=EB=B6=80=20=EC=95=88=EB=82=B4=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MarketPlace/View/Login/LoginView.swift | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/MarketPlace/View/Login/LoginView.swift b/MarketPlace/View/Login/LoginView.swift index edf12c4..aebe996 100644 --- a/MarketPlace/View/Login/LoginView.swift +++ b/MarketPlace/View/Login/LoginView.swift @@ -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)