Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d820d57
✨[feat]: 곧통 으로 쓸 화면 전환 구현
Roy-wonji Aug 11, 2025
f534926
✨[feat]: 이미지 관련 추가
Roy-wonji Aug 11, 2025
26e8844
✨[feat]: 이미지 관련 추가및 공통 컴포넌트 리스트 뷰 구현
Roy-wonji Aug 11, 2025
51514ce
✨[feat]: 더 알아 보기 리스트 화면 구현
Roy-wonji Aug 11, 2025
262d25e
✨[feat]: 곧통 으로 쓸 컴포넌트 구현 #2
Roy-wonji Aug 12, 2025
f097e3a
Merge remote-tracking branch 'origin/develop' into Feature/moreinfo_view
Roy-wonji Aug 12, 2025
efd207a
✨[feat]: 이미지 추가 및 블로그 뷰 추가
Roy-wonji Aug 12, 2025
a7286e7
✨[feat]: 블로그 웹뷰 연결 및 블로그 뷰 구현 완료
Roy-wonji Aug 12, 2025
de324ab
🪛[chore]: 파일 수정
Roy-wonji Aug 12, 2025
667d307
Merge remote-tracking branch 'origin/develop' into Feature/moreinfo_view
Roy-wonji Aug 12, 2025
c5e7bf9
🪛[chore]: PR 수정 #2
Roy-wonji Aug 12, 2025
d44ac45
🪛[chore]: 파일 분리
Roy-wonji Aug 12, 2025
dfd01b2
🪛[chore]: 데이터 로딩 관련 추가 #2
Roy-wonji Aug 12, 2025
39f9e6b
✨[feat]: 팀소개 뷰구현
Roy-wonji Aug 12, 2025
e4f4c2b
🪛[chore]: 파일이동
Roy-wonji Aug 12, 2025
b2fbc19
✨[feat]: 팀소개 뷰구현 #2
Roy-wonji Aug 12, 2025
1728126
🪛[chore]: 파일이동 #2
Roy-wonji Aug 12, 2025
c93a68f
Merge branch 'Feature/team_introduce_view' of https://github.com/Spar…
Roy-wonji Aug 12, 2025
5e08da3
✨[feat]: 뷰 들어갈을때 애니 메이션 추가 #2
Roy-wonji Aug 12, 2025
36cd548
✨[feat]: 애니메이션 간격 수정 #2
Roy-wonji Aug 12, 2025
28c9725
🪛[chore]: 파일 분리
Roy-wonji Aug 12, 2025
255d594
🪛[chore]: 파일 분리 #2
Roy-wonji Aug 12, 2025
a896fe7
Merge branch 'Feature/team_introduce_view' of https://github.com/Spar…
Roy-wonji Aug 12, 2025
051d4eb
🪛[chore]: 이미지 이름 변경 및 파일 코디 네이터 수정
Roy-wonji Aug 13, 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
1 change: 1 addition & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ addAssignees: author
reviewers:
- minneee
- Peter1119
- Roy-wonji

# A number of reviewers added to the pull request
# Set 0 to add all the reviewers (default: 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"compression-type" : "automatic"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "TeamiIntroduce.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "TeamInfroduce_Accident.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "TeamInfroduce_Circle.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "TeamInfroduce_Heart.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "TeamInfroduce_Person.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "blog.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "check.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "glabal.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "leftArrow.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "link.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "people.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "rightArrow.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ extension ShapeStyle where Self == Color {

static var staticWhite: Color { .init(hex: "FFFFFF") }
static var staticBlack: Color { .init(hex: "0C0E0F") }
static var shadowColor: Color { .init(hex: "000000")}

// MARK: - Static Text

static var textPrimary: Color { .init(hex: "0A0A0A") }
static var textSecondary: Color { .init(hex: "717182") }
static var textSecondary100: Color { .init(hex: "525252") }
static var textGray100: Color { .init(hex: "7D7E8C") }
static var textInactive: Color { .init(hex: "70737C47").opacity(0.28) }

// MARK: - Static Background
Expand Down Expand Up @@ -47,6 +49,7 @@ extension ShapeStyle where Self == Color {
static var gray90: Color { .init(hex: "202325") }
static var grayError: Color { .init(hex: "FF5050") }
static var grayWhite: Color { .init(hex: "FFFFFF") }
static var blueGray: Color { .init(hex: "7A7A89") }
static var grayPrimary: Color { .init(hex: "0099FF") }

// MARK: - Surface
Expand All @@ -68,7 +71,7 @@ extension ShapeStyle where Self == Color {

// MARK: - NatureBlue

static var blue10: Color { .init(hex: "F5F8FF") }
static var blue10: Color { .init(hex: "155DFC") }
static var blue20: Color { .init(hex: "E1EAFF") }
static var blue30: Color { .init(hex: "C1D3FF") }
static var blue40: Color { .init(hex: "0D82F9") }
Expand Down Expand Up @@ -99,6 +102,10 @@ extension ShapeStyle where Self == Color {
static var gray600: Color { .init(hex: "808080") }
static var gray800: Color { .init(hex: "4D4D4D") }



static var green: Color { .init(hex: "00A63E") }
static var lightPurple: Color { .init(hex: "9810FA") }
static var error: Color { .init(hex: "FF5050") }
static var basicBlue: Color { .init(hex: "0099FF") }

Expand Down
Loading