Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
2be6727
[feat] CardStyleView 추가
minneee Aug 11, 2025
150e526
[feat] 팀원 프로필 뷰 추가
minneee Aug 11, 2025
7c88f1b
팀원 자기소개 뷰 추가, 프로필 뷰의 폰트, 사이즈, 색 조절
minneee Aug 11, 2025
43a202c
오타 수정
minneee Aug 11, 2025
1460145
주요장점 뷰 추가
minneee Aug 11, 2025
81056d5
[feat]팀원 자기소개 뷰 추가, 프로필 뷰의 폰트, 사이즈, 색 조절
minneee Aug 11, 2025
4fc924a
오타 수정
minneee Aug 11, 2025
19f1760
[feat]주요장점 뷰 추가
minneee Aug 11, 2025
d428bcd
Merge remote-tracking branch 'origin/feature/member_detail' into feat…
minneee Aug 11, 2025
a76f266
[feat] 협업스타일, 블로그 주소 뷰 추가
minneee Aug 12, 2025
4f99e4c
오타 수정
minneee Aug 12, 2025
07a37ce
[feat] 스크롤 뷰 추가
minneee Aug 12, 2025
e7d3e3d
[feat]모델 한번만 생성하도록 변경
minneee Aug 12, 2025
fbaa8a6
[feat]필요없는 VStack 제거
minneee Aug 12, 2025
86d0bcf
오타 수정
minneee Aug 12, 2025
a93254a
[chore]CardStyle 디자인 시스템으로 이동
minneee Aug 12, 2025
bb8511a
[chore] 뷰 분리
minneee Aug 12, 2025
ca57bdf
[chore] 좌우 padding 수정
minneee Aug 13, 2025
98be2ea
[chore] 오타 수정
minneee Aug 13, 2025
172082d
[chore] 네비게이션 바와 컨텐츠 간격 수정
minneee Aug 13, 2025
5f482a0
[chore] components 파일 이동
minneee Aug 13, 2025
cfd59ef
[feat] 버튼 하단 고정, 파일 구조 수정
minneee Aug 13, 2025
9ce0efe
[feat] 뷰와 뷰모델 분리
minneee Aug 13, 2025
bd18fe6
[feat] 버튼의 수정 / 저장 모드 추가
minneee Aug 13, 2025
7094e44
[feat] 소개 뷰의 수정모드 추가
minneee Aug 13, 2025
42cd3eb
[feat] 주요 장점 뷰 수정모드 추가
minneee Aug 13, 2025
41b8cd7
[chore] 수정버튼 클릭 가능 영역 변경
minneee Aug 13, 2025
4606183
[feat] 협업 스타일 뷰 수정모드 추가
minneee Aug 13, 2025
88ba561
[feat] 블로그 주소 뷰 수정모드 추가
minneee Aug 13, 2025
87addd1
[chore] 자기소개 TextField titleKey 수정
minneee Aug 13, 2025
d1313bb
[feat] padding 선언 위치 변경
minneee Aug 13, 2025
44a96e3
Merge branch 'feature/member_detail' of github.com:SpartCodig-iOS/Tea…
minneee Aug 13, 2025
301c250
Revert "[feat] padding 선언 위치 변경"
minneee Aug 13, 2025
5ce0bef
Revert "[chore] 자기소개 TextField titleKey 수정"
minneee Aug 13, 2025
37fa2bf
[chore] 필요없는 파일 삭제
minneee Aug 13, 2025
369aed1
[chore] padding 선언 위치 변경
minneee Aug 13, 2025
8075ddf
[feat] 수정화면 로직 변경
minneee Aug 14, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import SwiftUI

init(
text: String = "",
buttonAction: @escaping () -> Void,
buttonAction: @escaping () -> Void
) {
self.buttonAction = buttonAction
self.text = text
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
//
// BlogView.swift
// BlogDisplayView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/12/25.
//
import SwiftUI

struct BlogView: View {
let profile: MemberProfile
struct BlogDisplayView: View {
var blogURL: String

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("블로그")
.pretendardFont(family: .semiBold, size: 14)
Text(profile.blogURL)

Text(blogURL)
.pretendardFont(family: .regular, size: 13)
.cardStyle()

}
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
//
// CollabStyleView.swift
// CollabStyleDisplayView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/12/25.
//
import SwiftUI

struct CollabStyleView: View {
let profile: MemberProfile
struct CollabStyleDisplayView: View {
var collabStyle: String


var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("협업스타일")
.pretendardFont(family: .semiBold, size: 14)
Text(profile.collabStyle)

Text(collabStyle)
.pretendardFont(family: .regular, size: 13)
.foregroundStyle(.textSecondary100)
.lineSpacing(5)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
//
// IntroductionView.swift
// IntroductionDisplayView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/12/25.
//
import SwiftUI

struct IntroductionView: View {
let profile: MemberProfile
struct IntroductionDisplayView: View {
var introduction: String

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("자기소개")
.pretendardFont(family: .semiBold, size: 14)
Text(profile.introduction)

Text(introduction)
.pretendardFont(family: .regular, size: 13)
.foregroundStyle(.textSecondary100)
.lineSpacing(5)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
//
// StrengthsView.swift
// StrengthsDisplayView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/12/25.
//
import SwiftUI

struct StrengthsView: View {
let profile: MemberProfile
struct StrengthsDisplayView: View {
var strengths: [String]

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("주요장점")
.pretendardFont(family: .semiBold, size: 14)

VStack {
ForEach(profile.strengths, id: \.self) { item in
ForEach(strengths, id: \.self) { item in
HStack(alignment: .firstTextBaseline, spacing: 8) {
Circle().frame(width: 5, height: 5)
Text(item)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@
import SwiftUI

struct EditButton: View {
var body: some View {
Button(action: {}) {
Text("수정")
.foregroundColor(.white)
}
var text: String
var action: () -> Void

var body: some View {
Button {
action()
} label: {
Text(text)
.foregroundColor(.white)
.frame(maxWidth: .infinity)
.frame(height: 48)
.background(.backGroundPrimary)
.clipShape(RoundedRectangle(cornerRadius: 16))
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// BlogEditView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/14/25.
//
import SwiftUI

struct BlogEditView: View {
@Binding var blogURL: String

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("블로그")
.pretendardFont(family: .semiBold, size: 14)

TextField("블로그 URL", text: $blogURL)
.pretendardFont(family: .regular, size: 13)
.cardStyle()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// CollabStyleEditView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/14/25.
//
import SwiftUI

struct CollabStyleEditView: View {
@Binding var collabStyle: String


var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("협업스타일")
.pretendardFont(family: .semiBold, size: 14)

TextField("협업스타일", text: $collabStyle, axis: .vertical)
.pretendardFont(family: .regular, size: 13)
.foregroundStyle(.textSecondary100)
.lineSpacing(5)
.lineLimit(1...10)
.cardStyle()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// IntroductionEditView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/14/25.
//
import SwiftUI

struct IntroductionEditView: View {
@Binding var introduction: String

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("자기소개")
.pretendardFont(family: .semiBold, size: 14)

TextField("", text: $introduction, axis: .vertical)
.pretendardFont(family: .regular, size: 13)
.foregroundStyle(.textSecondary100)
.lineSpacing(5)
.lineLimit(1...10)
.cardStyle()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// StrengthsEditView.swift
// TeamIntroduce
//
// Created by 김민희 on 8/14/25.
//
import SwiftUI

struct StrengthsEditView: View {
@Binding var strengths: [String]

var body: some View {
VStack(alignment: .leading, spacing: 14) {
Text("주요장점")
.pretendardFont(family: .semiBold, size: 14)

VStack {
ForEach(strengths.indices, id: \.self) { index in
HStack {
Button {
strengths.remove(at: index)
} label: {
Image(systemName: "minus.circle.fill")
.foregroundStyle(.red)
}

TextField("", text: $strengths[index])
.pretendardFont(family: .regular, size: 13)
.foregroundStyle(.textSecondary100)
.lineLimit(1...5)
}
}

Button {
strengths.append("")
} label: {
HStack {
Image(systemName: "plus.circle.fill")
Text("장점 추가하기")
.pretendardFont(family: .regular, size: 13)
}
}
.padding(.top, 10)
}
.cardStyle()
}
}
}
Loading