Skip to content

Commit

Permalink
Merge pull request #21 from ghojeong/feature/sidedishEntity
Browse files Browse the repository at this point in the history
너무 고생했습니다 :) (#11)
  • Loading branch information
Settpark committed Apr 21, 2021
2 parents 4d33417 + a245e16 commit 8e59a4b
Show file tree
Hide file tree
Showing 17 changed files with 266 additions and 31 deletions.
136 changes: 124 additions & 12 deletions ios/sidedish/sidedish.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,24 @@
8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70A262DE07A004467C2 /* MenuCell.swift */; };
8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */; };
8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */; };
82BBBBB72630067B008F89CB /* SideDishFindable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82BBBBB52630067B008F89CB /* SideDishFindable.swift */; };
82BBBBB82630067B008F89CB /* SideDishesCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82BBBBB62630067B008F89CB /* SideDishesCollection.swift */; };
82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */; };
82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */; };
82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */; };
82FDB9CE262DCFD8009E3EB7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */; };
82FDB9D0262DCFD8009E3EB7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */; };
82FDB9D3262DCFD8009E3EB7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */; };
E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC950262E6E9A0043CC44 /* SideDish.swift */; };
E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC953262EBA2E0043CC44 /* SideDishes.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
8214B70A262DE07A004467C2 /* MenuCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = "<group>"; };
8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewDataSource.swift; sourceTree = "<group>"; };
8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewDelegate.swift; sourceTree = "<group>"; };
82BBBBB52630067B008F89CB /* SideDishFindable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideDishFindable.swift; sourceTree = "<group>"; };
82BBBBB62630067B008F89CB /* SideDishesCollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideDishesCollection.swift; sourceTree = "<group>"; };
82FDB9C3262DCFD8009E3EB7 /* sidedish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sidedish.app; sourceTree = BUILT_PRODUCTS_DIR; };
82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -30,6 +36,8 @@
82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
82FDB9D2262DCFD8009E3EB7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
82FDB9D4262DCFD8009E3EB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E41EC950262E6E9A0043CC44 /* SideDish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDish.swift; sourceTree = "<group>"; };
E41EC953262EBA2E0043CC44 /* SideDishes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishes.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -43,6 +51,101 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
82A3F139262F1FE200FD86BE /* Application */ = {
isa = PBXGroup;
children = (
82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */,
82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */,
);
path = Application;
sourceTree = "<group>";
};
82A3F13C262F202A00FD86BE /* Domain */ = {
isa = PBXGroup;
children = (
E41EC94F262E6DF40043CC44 /* Entity */,
);
path = Domain;
sourceTree = "<group>";
};
82A3F13E262F243300FD86BE /* Presentation */ = {
isa = PBXGroup;
children = (
82A3F140262F256C00FD86BE /* MainMenuList */,
82A3F149262F337000FD86BE /* SubMenuList */,
82A3F13F262F248300FD86BE /* ViewController */,
);
path = Presentation;
sourceTree = "<group>";
};
82A3F13F262F248300FD86BE /* ViewController */ = {
isa = PBXGroup;
children = (
8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */,
8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */,
82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */,
);
path = ViewController;
sourceTree = "<group>";
};
82A3F140262F256C00FD86BE /* MainMenuList */ = {
isa = PBXGroup;
children = (
82A3F142262F259600FD86BE /* ViewModel */,
82A3F141262F259200FD86BE /* View */,
);
path = MainMenuList;
sourceTree = "<group>";
};
82A3F141262F259200FD86BE /* View */ = {
isa = PBXGroup;
children = (
82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */,
8214B70A262DE07A004467C2 /* MenuCell.swift */,
);
path = View;
sourceTree = "<group>";
};
82A3F142262F259600FD86BE /* ViewModel */ = {
isa = PBXGroup;
children = (
);
path = ViewModel;
sourceTree = "<group>";
};
82A3F144262F2EB900FD86BE /* Resources */ = {
isa = PBXGroup;
children = (
82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */,
82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */,
82FDB9D4262DCFD8009E3EB7 /* Info.plist */,
);
path = Resources;
sourceTree = "<group>";
};
82A3F149262F337000FD86BE /* SubMenuList */ = {
isa = PBXGroup;
children = (
82A3F14B262F338700FD86BE /* ViewModel */,
82A3F14A262F337800FD86BE /* View */,
);
path = SubMenuList;
sourceTree = "<group>";
};
82A3F14A262F337800FD86BE /* View */ = {
isa = PBXGroup;
children = (
);
path = View;
sourceTree = "<group>";
};
82A3F14B262F338700FD86BE /* ViewModel */ = {
isa = PBXGroup;
children = (
);
path = ViewModel;
sourceTree = "<group>";
};
82FDB9BA262DCFD8009E3EB7 = {
isa = PBXGroup;
children = (
Expand All @@ -62,20 +165,25 @@
82FDB9C5262DCFD8009E3EB7 /* sidedish */ = {
isa = PBXGroup;
children = (
82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */,
82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */,
82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */,
8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */,
8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */,
8214B70A262DE07A004467C2 /* MenuCell.swift */,
82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */,
82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */,
82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */,
82FDB9D4262DCFD8009E3EB7 /* Info.plist */,
82A3F13E262F243300FD86BE /* Presentation */,
82A3F13C262F202A00FD86BE /* Domain */,
82A3F139262F1FE200FD86BE /* Application */,
82A3F144262F2EB900FD86BE /* Resources */,
);
path = sidedish;
sourceTree = "<group>";
};
E41EC94F262E6DF40043CC44 /* Entity */ = {
isa = PBXGroup;
children = (
82BBBBB62630067B008F89CB /* SideDishesCollection.swift */,
82BBBBB52630067B008F89CB /* SideDishFindable.swift */,
E41EC953262EBA2E0043CC44 /* SideDishes.swift */,
E41EC950262E6E9A0043CC44 /* SideDish.swift */,
);
path = Entity;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -146,11 +254,15 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
82BBBBB82630067B008F89CB /* SideDishesCollection.swift in Sources */,
E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */,
E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */,
82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */,
82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */,
8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */,
8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */,
82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */,
82BBBBB72630067B008F89CB /* SideDishFindable.swift in Sources */,
8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -300,7 +412,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = B3PWYBKFUK;
INFOPLIST_FILE = sidedish/Info.plist;
INFOPLIST_FILE = sidedish/Resources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -319,7 +431,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = B3PWYBKFUK;
INFOPLIST_FILE = sidedish/Info.plist;
INFOPLIST_FILE = sidedish/Resources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
File renamed without changes.
File renamed without changes.
46 changes: 46 additions & 0 deletions ios/sidedish/sidedish/Domain/Entity/SideDish.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//
// SideDish.swift
// sidedish
//
// Created by Song on 2021/04/20.
//

import Foundation

class SideDish: Codable {

var detail_hash : String
var image: String //library/cache의 파일명
var title: String //"[소중한식사] 골뱅이무침 195g"
var description: String //"매콤새콤달콤, 반찬으로도 안주로도 좋은"
var deliveryTypes: [String] //["새벽배송","전국택배"]
var price: Int //7,000
var salePrice: Int //6,300
var badges: [String] //["이벤트특가", "런칭특가"]

var detail: Detail?

func updateDetail(_ detail: Detail) {
self.detail = detail
}
}

class Detail: Codable {
var thumbImages: [String] //library/cache의 파일명들
var point: String //"63원"
var deliveryInfo: String //"서울 경기 새벽배송 / 전국택배 (제주 및 도서산간 불가) [화 수 목 금 토] 수령 가능한 상품입니다"
var deliveryFee: String //"2,500원 (40,000원 이상 구매 시 무료)"
var detailImages: [String]
}

//struct Detail: Codable {
// var hash = "HF778" //겹침
// var topImage = "" //겹침?
// var thumbImages = ["","",""]
// var productDescription = "매콤새콤달콤, 반찬으로도 안주로도 좋은" //겹침
// var point = "63원"
// var deliveryInfo = "서울 경기 새벽배송 / 전국택배 (제주 및 도서산간 불가) [화 수 목 금 토] 수령 가능한 상품입니다"
// var deliveryFee = "2,500원 (40,000원 이상 구매 시 무료)"
// var prices = ["7,000원", "6,300원"] //겹침
// var detailSection = ["","","",""]
//}
16 changes: 16 additions & 0 deletions ios/sidedish/sidedish/Domain/Entity/SideDishFindable.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// SideDishFindable.swift
// sidedish
//
// Created by Song on 2021/04/20.
//

import Foundation

protocol SideDishFindable {

func count() -> Int

func sideDish(at index: Int) -> SideDish?

}
40 changes: 40 additions & 0 deletions ios/sidedish/sidedish/Domain/Entity/SideDishes.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//
// SideDishes.swift
// sidedish
//
// Created by Song on 2021/04/20.
//

import Foundation

class SideDishes: Codable {

private(set) var category: Category

enum Category: Int, Codable {
case main = 1
case soup = 2
case side = 3
}

private var list: [SideDish]

init(category: Category, list: [SideDish]) {
self.category = category
self.list = list
}

}

extension SideDishes: SideDishFindable {

func count() -> Int {
return list.count
}

func sideDish(at index: Int) -> SideDish? {
guard count() > index else { return nil }
return list[index]
}

}
24 changes: 24 additions & 0 deletions ios/sidedish/sidedish/Domain/Entity/SideDishesCollection.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// SideDishesCollection.swift
// sidedish
//
// Created by Song on 2021/04/20.
//

import Foundation

class SideDishesCollection: Codable {

private var recentUpdate: Date?
private var list: [SideDishes]

init(recentUpdate: Date, list: [SideDishes]) {
self.recentUpdate = recentUpdate
self.list = list
}

func update(list: [SideDishes]) {
self.list = list
recentUpdate = Date()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<constraint firstItem="G1I-wH-UN6" firstAttribute="top" secondItem="Adn-xA-Y07" secondAttribute="bottom" constant="8" id="mlf-Nr-YNH"/>
<constraint firstItem="Adn-xA-Y07" firstAttribute="leading" secondItem="Phq-gM-0YS" secondAttribute="trailing" constant="8" id="njj-ru-2fQ"/>
<constraint firstItem="AFy-Qg-94P" firstAttribute="top" secondItem="PAV-B8-wAs" secondAttribute="top" constant="11" id="ok7-D1-h1z"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SZz-9i-Zzs" secondAttribute="trailing" constant="102" id="uLD-aB-7M8"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SZz-9i-Zzs" secondAttribute="trailing" constant="16" id="uLD-aB-7M8"/>
<constraint firstItem="Phq-gM-0YS" firstAttribute="top" secondItem="PAV-B8-wAs" secondAttribute="top" id="uuU-N8-QV4"/>
<constraint firstItem="AFy-Qg-94P" firstAttribute="leading" secondItem="Phq-gM-0YS" secondAttribute="trailing" constant="8" id="w3x-gx-qgr"/>
<constraint firstItem="G1I-wH-UN6" firstAttribute="leading" secondItem="Phq-gM-0YS" secondAttribute="trailing" constant="8" id="x8t-bz-gLM"/>
Expand Down Expand Up @@ -167,7 +167,7 @@
</objects>
<point key="canvasLocation" x="18.840579710144929" y="88.392857142857139"/>
</scene>
<!--View Controller-->
<!--[미노리키친] 규동 250g-->
<scene sceneID="EhS-Az-FWy">
<objects>
<viewController id="qPN-Ia-EMd" sceneMemberID="viewController">
Expand Down Expand Up @@ -335,11 +335,6 @@
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.30980855229999998" green="0.30979558829999998" blue="0.30980435010000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="style.lineSpacing">
<integer key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2,500원 (40,000원 이상 구매 시 무료)" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8e-fB-oat">
<rect key="frame" x="92" y="753" width="222.5" height="20"/>
Expand All @@ -349,11 +344,6 @@
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.30980855229999998" green="0.30979558829999998" blue="0.30980435010000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="style.lineSpacing">
<integer key="value" value="5"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bEM-20-BK1">
<rect key="frame" x="370" y="823" width="28" height="20"/>
Expand Down Expand Up @@ -398,7 +388,7 @@
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="c8e-fB-oat" secondAttribute="trailing" constant="16" id="61f-6M-NUZ"/>
<constraint firstItem="c8e-fB-oat" firstAttribute="centerY" secondItem="VmB-TX-zD3" secondAttribute="centerY" id="6J6-Z3-pKu"/>
<constraint firstItem="bbd-Rs-d6k" firstAttribute="leading" secondItem="mvV-Tz-xwH" secondAttribute="trailing" constant="16" id="6Ut-5a-Cki"/>
<constraint firstItem="Kal-6C-CFv" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="PEB-z0-g61" secondAttribute="trailing" constant="237" id="6fg-lX-opA"/>
<constraint firstItem="Kal-6C-CFv" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="PEB-z0-g61" secondAttribute="trailing" constant="197" id="6fg-lX-opA"/>
<constraint firstItem="iHl-RB-2dW" firstAttribute="top" secondItem="2em-vB-7Bk" secondAttribute="bottom" constant="18" id="6hK-4z-XnC"/>
<constraint firstItem="mvV-Tz-xwH" firstAttribute="leading" secondItem="VJn-uW-7m1" secondAttribute="leading" id="7e8-7a-RmQ"/>
<constraint firstAttribute="trailing" relation="lessThanOrEqual" secondItem="ugt-d3-gCD" secondAttribute="trailing" constant="244.5" id="8D3-1H-M73"/>
Expand Down Expand Up @@ -464,7 +454,7 @@
<constraint firstItem="ndH-Zs-iae" firstAttribute="top" secondItem="UdA-LV-oKl" secondAttribute="top" id="xwt-QP-tX5"/>
</constraints>
</view>
<navigationItem key="navigationItem" id="0Hh-Qt-fv3"/>
<navigationItem key="navigationItem" title="[미노리키친] 규동 250g" id="0Hh-Qt-fv3"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="xqg-nJ-b0D" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
Expand Down
File renamed without changes.
Loading

0 comments on commit 8e59a4b

Please sign in to comment.