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.

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

[Neo, JEJE] Detail 뷰 기능 구현, OAuth 뷰 기능 구현 #63

Open
wants to merge 38 commits into
base: team-4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
977d6e3
Feat: 이미지 캐시 기능 추가
HoonHaChoi Apr 22, 2021
0981b27
Delete: 불필요 파일 제거
jung-yun Apr 21, 2021
fe9ad23
Delete: 스토리보드 중복 제거
jung-yun Apr 21, 2021
9aca999
Add: 아이템 디테일 데이터모델 추가
jung-yun Apr 22, 2021
bc4adbe
Update: 네트워크 매니저
jung-yun Apr 22, 2021
87a3db6
Create: DetailViewController, DetailViewModel
jung-yun Apr 22, 2021
910bb08
Add: DetailViewController 연결
jung-yun Apr 22, 2021
3e7c864
Add: fetchDatail 메소드
jung-yun Apr 22, 2021
e89060c
Update: 피드백 수정
HoonHaChoi Apr 22, 2021
c9d247d
Feat: 상세화면 섬네일이미지, 홍보이미지 추가
HoonHaChoi Apr 23, 2021
1dfc258
Feat: 상세 화면 설명,가격, 배달정보 추가
HoonHaChoi Apr 23, 2021
6001365
Feat: 수량 및 총 주문금액 UI 추가
HoonHaChoi Apr 23, 2021
0d45bc1
Update: 오류파일 커밋
HoonHaChoi Apr 23, 2021
b3cd5b8
Feat: OrderButtonView 추가 및 그림자 효과 추가
HoonHaChoi Apr 23, 2021
1cfdf39
Feat: DIContainer 추가
HoonHaChoi Apr 26, 2021
50687e2
Create: AuthViewController
jung-yun Apr 26, 2021
705de22
Create: Auth and Temp view controller 추가
jung-yun Apr 26, 2021
c61e131
Create: LocalOAuthClient, OAuthService 구현
jung-yun Apr 27, 2021
eee9051
Feat: DetailContentView 추가
HoonHaChoi Apr 27, 2021
5c632f8
Try: Deep link, token 사용: Fail
jung-yun Apr 27, 2021
b338d20
Add: OctoKit dependency 추가
jung-yun Apr 27, 2021
f62f4f7
Feat: OktoKit으로 Github login 구현
jung-yun Apr 27, 2021
8efe310
Add: keychain-swift dependency
jung-yun Apr 28, 2021
68782af
FIx: 앱 처음 시작시 이미지 순서가 올바르지 않은 처리 수정
HoonHaChoi Apr 28, 2021
4e90b62
Update: @escaping을 AnyPublisher로 변경
HoonHaChoi Apr 28, 2021
4a01a93
Update: 의존성 주입 변경
HoonHaChoi Apr 29, 2021
56cca0b
Update: token이 있다면 메인으로 넘어가도록 구현
jung-yun Apr 29, 2021
f4cb1dd
Merge pull request #10 from HoonHaChoi/feat-study3
jung-yun Apr 29, 2021
7166b66
Merge
jung-yun Apr 29, 2021
0e42324
Bug: needed to be fixed
jung-yun Apr 29, 2021
1e01445
Update: 로그인 및 상태에 따라 화면 경로 코드 변경
HoonHaChoi Apr 30, 2021
1647e42
Update: 단어 수정
HoonHaChoi Apr 30, 2021
696d892
Feat: plist 키값을 꺼내오도록 추가
HoonHaChoi Apr 30, 2021
5dfb3fb
Merge pull request #11 from HoonHaChoi/feat-Oauth2
jung-yun Apr 30, 2021
571d557
Feat: 주문 Post요청 추가
HoonHaChoi Apr 30, 2021
79e9b7b
Merge pull request #12 from HoonHaChoi/feat-Oauth2
jung-yun Apr 30, 2021
52a855c
Feat: 주문완료시 알림 추가
HoonHaChoi Apr 30, 2021
8ebe486
Merge pull request #14 from HoonHaChoi/feat-Oauth2
jung-yun Apr 30, 2021
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
138 changes: 129 additions & 9 deletions Side-dish/Side-dish.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"object": {
"pins": [
{
"package": "KeychainSwift",
"repositoryURL": "https://github.com/evgenyneu/keychain-swift.git",
"state": {
"branch": null,
"revision": "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
"version": "19.0.0"
}
},
{
"package": "OctoKit",
"repositoryURL": "https://github.com/nerdishbynature/octokit.swift",
"state": {
"branch": null,
"revision": "9521cdff919053868ab13cd08a228f7bc1bde2a9",
"version": "0.11.0"
}
},
{
"package": "RequestKit",
"repositoryURL": "https://github.com/nerdishbynature/RequestKit.git",
"state": {
"branch": null,
"revision": "fd5e9e99aada7432170366c9e95967011ce13bad",
"version": "2.4.0"
}
}
]
},
"version": 1
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1220"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFCE494E262D4891006C0882"
BuildableName = "Side-dish.app"
BlueprintName = "Side-dish"
ReferencedContainer = "container:Side-dish.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFCE494E262D4891006C0882"
BuildableName = "Side-dish.app"
BlueprintName = "Side-dish"
ReferencedContainer = "container:Side-dish.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BFCE494E262D4891006C0882"
BuildableName = "Side-dish.app"
BlueprintName = "Side-dish"
ReferencedContainer = "container:Side-dish.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "2B292E23-88CF-4BC2-A4C0-F0FC8CB4CACA"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "96F5F7CF-0E43-4E3A-A4FC-079C87DAA3D6"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Side-dish/PresentationLayer/View/DetailContenetView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "67"
endingLineNumber = "67"
landmarkName = "desctionImageLoad(desctionImage:)"
landmarkType = "7">
<Locations>
<Location
uuid = "96F5F7CF-0E43-4E3A-A4FC-079C87DAA3D6 - aab7d9cc9159b2d1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "Side_dish.DetailContenetView.desctionImageLoad(desctionImage: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
moduleName = "Side-dish"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/hoonhachoi/Documents/swift/swift-sidedish/sidedish/Side-dish/Side-dish/PresentationLayer/View/DetailContenetView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
offsetFromSymbolStart = "44">
</Location>
<Location
uuid = "96F5F7CF-0E43-4E3A-A4FC-079C87DAA3D6 - e9ab47a86bea2151"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (Swift.String) -&gt; () in Side_dish.DetailContenetView.desctionImageLoad(desctionImage: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
moduleName = "Side-dish"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/hoonhachoi/Documents/swift/swift-sidedish/sidedish/Side-dish/Side-dish/PresentationLayer/View/DetailContenetView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
offsetFromSymbolStart = "101">
</Location>
<Location
uuid = "96F5F7CF-0E43-4E3A-A4FC-079C87DAA3D6 - 421a93be3f22e4cc"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (__C.UIImage) -&gt; () in closure #1 (Swift.String) -&gt; () in Side_dish.DetailContenetView.desctionImageLoad(desctionImage: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
moduleName = "Side-dish"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/hoonhachoi/Documents/swift/swift-sidedish/sidedish/Side-dish/Side-dish/PresentationLayer/View/DetailContenetView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "60"
endingLineNumber = "60"
offsetFromSymbolStart = "168">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CC45E391-3B3C-44C5-BF29-F70F7C078B7E"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Side-dish/PresentationLayer/ViewController/SideDishViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "109"
endingLineNumber = "109"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
1 change: 0 additions & 1 deletion Side-dish/Side-dish/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import UIKit

@main
class AppDelegate: UIResponder, UIApplicationDelegate {

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.510",
"green" : "0.510",
"red" : "0.510"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.510",
"green" : "0.510",
"red" : "0.510"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
"blue" : "0.176",
"green" : "0.827",
"red" : "0.510"
}
},
"idiom" : "universal"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.000",
"green" : "0.000",
"red" : "0.000"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
"green" : "0.776",
"red" : "0.525"
}
},
"idiom" : "universal"
Expand Down
22 changes: 22 additions & 0 deletions Side-dish/Side-dish/Assets.xcassets/github.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"filename" : "github.png",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "github_negative.png",
"idiom" : "universal"
}
],
"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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions Side-dish/Side-dish/DIContainer.swift

This file was deleted.

6 changes: 3 additions & 3 deletions Side-dish/Side-dish/DataLayer/Model/Item.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

struct Item: Codable, Hashable {
struct Item: Decodable, Hashable {
let detailHash: String
let image: String
let alt: String
Expand All @@ -29,12 +29,12 @@ struct Item: Codable, Hashable {
}
}

enum DeliveryType: String, Codable {
enum DeliveryType: String, Decodable {
case dawnDelivery = "새벽배송"
case nationDelivery = "전국택배"
}

enum Badge: String, Codable {
enum Badge: String, Decodable {
case eventPrice = "이벤트특가"
case launchingPrice = "론칭특가"
}
Loading