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

[Feat] 암튼 과제 완료~... #4

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8d792d8
<feat>: 상품목록화면 네비게이션 바 구현
yunsun99 Nov 22, 2022
7c3d39a
<feat>: ProductModel 구현
yunsun99 Nov 23, 2022
4475f2e
<fix>: ProductModel 수정
yunsun99 Nov 23, 2022
3b652f4
<feat>: Variables 추가
yunsun99 Nov 23, 2022
28ff75a
<Feat>: ProductModel 재변경
yunsun99 Nov 23, 2022
904f41e
<Feat>: productList 변경
yunsun99 Nov 23, 2022
2113363
<Feat>: recommendedCollectionView 기본 틀 구현
yunsun99 Nov 24, 2022
e9948b5
<Fix>: ProductModel 이름 변경
yunsun99 Nov 24, 2022
f23fbac
<Feat>: Constants 1차 설정
yunsun99 Nov 24, 2022
3a08326
<Feat>: recommendedProductsHeaderView 생성
yunsun99 Nov 24, 2022
3fbfef7
<Feat>: Constants 2차 설정
yunsun99 Nov 24, 2022
ac80b1a
<Feat>: model 이름 UpperCamelCase로 변경
yunsun99 Nov 24, 2022
f8c164c
<Feat>: RecommendedProductsCollectionViewCell의 dataBind 함수 생성
yunsun99 Nov 24, 2022
ebc53a1
<Feat>: RecommendedProductsCollectionViewCell autolayout 설정
yunsun99 Nov 24, 2022
30acd0d
<Feat>: RecommendedProductsCollectionCollectionView register 함수 구현
yunsun99 Nov 24, 2022
67d8edd
<Feat>: recommendedProductsCollectionView의 delegate와 dataSource를 VC로 지정
yunsun99 Nov 24, 2022
0906cec
<Feat>: ProductsViewController: UICollectionViewDelegateFlowLayout 구현
yunsun99 Nov 24, 2022
0c8a551
<Feat>: ProductsViewContoller: UICollectionViewDataSource 구현
yunsun99 Nov 24, 2022
b385f72
<Feat>: RecommendedProductsCollectionView 구현 완료
yunsun99 Nov 25, 2022
db61d0e
<Fix>: 파일명 불일치 오류 해결
yunsun99 Nov 25, 2022
5a6dac2
<Feat>: borderView 추가
yunsun99 Nov 25, 2022
a989f4c
<Refactor>: imageView를 imageContainer로 감쌈
yunsun99 Nov 25, 2022
4116507
<Refactor>: backImageView를 backImageContainer로 감쌈
yunsun99 Nov 25, 2022
ff777cb
<Refactor>: alarmImageView를 alarmImageContainer로 감쌈
yunsun99 Nov 25, 2022
d290e6b
<Refactor>: cartImageView를 cartImageContainer로 감쌈
yunsun99 Nov 25, 2022
a676551
<Feat>: bestProductsHeaderView 변수 생성 및 일부 변수 이름 변경
yunsun99 Nov 25, 2022
0be7970
<Refactor>: 모든 imageContainer의 이름을 imageContainerView로 변경
yunsun99 Nov 25, 2022
8c9d422
<Feat>: BestProductModel 구현
yunsun99 Nov 25, 2022
d5b48fa
<Feat>: bestProductList 변수 추가
yunsun99 Nov 25, 2022
6823fdf
<Feat>: CollectionView의 height를 상수에서 변수로 수정, bestProductCell 기본 간격 추가
yunsun99 Nov 25, 2022
c53532a
<Feat>: bestProductsCollectionView 레이아웃 설정
yunsun99 Nov 25, 2022
04d7198
<Feat>: BestProductsCollectionViewCell 생성
yunsun99 Nov 25, 2022
7fb6f35
<Feat>: register 함수에 bestProductsCollectionView 추가
yunsun99 Nov 25, 2022
0ff893f
<Refactor>: seeMore~ 변수를 goTo~Page~ 로 이름변경
yunsun99 Nov 25, 2022
340b5e3
<Feat>: 베스트 상품 더보기 버튼 추가
yunsun99 Nov 25, 2022
be6c08c
<Fea>: VC 원래대로 카테고리로 돌림
yunsun99 Nov 25, 2022
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
24 changes: 24 additions & 0 deletions TMON-iOS/TMON-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
4C5064872927930800A575CE /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C5064862927930800A575CE /* ProductsViewController.swift */; };
4C506489292795B300A575CE /* ProductDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C506488292795B300A575CE /* ProductDetailViewController.swift */; };
4C8927222930C3AF0046AE93 /* BestProductsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C8927212930C3AF0046AE93 /* BestProductsCollectionViewCell.swift */; };
4CB29AF3292DB8660057F0C4 /* RecommendedProductModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB29AF2292DB8660057F0C4 /* RecommendedProductModel.swift */; };
4CB29AF5292F4BBF0057F0C4 /* RecommendedProductsCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB29AF4292F4BBF0057F0C4 /* RecommendedProductsCollectionViewCell.swift */; };
4CB29AF729308A770057F0C4 /* BestProductModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB29AF629308A770057F0C4 /* BestProductModel.swift */; };
EA887A5D29248CD100F1E38E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA887A5C29248CD100F1E38E /* AppDelegate.swift */; };
EA887A5F29248CD100F1E38E /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA887A5E29248CD100F1E38E /* SceneDelegate.swift */; };
EA887A6629248CD300F1E38E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA887A6529248CD300F1E38E /* Assets.xcassets */; };
Expand Down Expand Up @@ -34,6 +40,12 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
4C5064862927930800A575CE /* ProductsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductsViewController.swift; sourceTree = "<group>"; };
4C506488292795B300A575CE /* ProductDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailViewController.swift; sourceTree = "<group>"; };
4C8927212930C3AF0046AE93 /* BestProductsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BestProductsCollectionViewCell.swift; sourceTree = "<group>"; };
4CB29AF2292DB8660057F0C4 /* RecommendedProductModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendedProductModel.swift; sourceTree = "<group>"; };
4CB29AF4292F4BBF0057F0C4 /* RecommendedProductsCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendedProductsCollectionViewCell.swift; sourceTree = "<group>"; };
4CB29AF629308A770057F0C4 /* BestProductModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BestProductModel.swift; sourceTree = "<group>"; };
EA887A5929248CD100F1E38E /* TMON-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "TMON-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
EA887A5C29248CD100F1E38E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
EA887A5E29248CD100F1E38E /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -173,6 +185,10 @@
EA887A80292490E100F1E38E /* UIComponents */ = {
isa = PBXGroup;
children = (
4CB29AF2292DB8660057F0C4 /* RecommendedProductModel.swift */,
4CB29AF4292F4BBF0057F0C4 /* RecommendedProductsCollectionViewCell.swift */,
4CB29AF629308A770057F0C4 /* BestProductModel.swift */,
4C8927212930C3AF0046AE93 /* BestProductsCollectionViewCell.swift */,
);
path = UIComponents;
sourceTree = "<group>";
Expand Down Expand Up @@ -258,6 +274,8 @@
EA8F38842924C6BD00517CD4 /* ProductScene */ = {
isa = PBXGroup;
children = (
4C5064862927930800A575CE /* ProductsViewController.swift */,
4C506488292795B300A575CE /* ProductDetailViewController.swift */,
);
path = ProductScene;
sourceTree = "<group>";
Expand Down Expand Up @@ -353,12 +371,18 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4CB29AF5292F4BBF0057F0C4 /* RecommendedProductsCollectionViewCell.swift in Sources */,
EA887AA1292498EE00F1E38E /* ColorLiterals.swift in Sources */,
EA887A5D29248CD100F1E38E /* AppDelegate.swift in Sources */,
EA8F38892924C71D00517CD4 /* CategoryMainViewController.swift in Sources */,
EA8F387D2924C0E500517CD4 /* imageLiterals.swift in Sources */,
EA8F38802924C4C800517CD4 /* TabBarViewController.swift in Sources */,
EA887A5F29248CD100F1E38E /* SceneDelegate.swift in Sources */,
4CB29AF729308A770057F0C4 /* BestProductModel.swift in Sources */,
4C5064872927930800A575CE /* ProductsViewController.swift in Sources */,
4CB29AF3292DB8660057F0C4 /* RecommendedProductModel.swift in Sources */,
4C8927222930C3AF0046AE93 /* BestProductsCollectionViewCell.swift in Sources */,
4C506489292795B300A575CE /* ProductDetailViewController.swift in Sources */,
EA8F38872924C6DC00517CD4 /* HomeViewController.swift in Sources */,
EA8F387B2924BFF900517CD4 /* FontLiterals.swift in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion TMON-iOS/TMON-iOS/Global/Literal/FontLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import UIKit
enum FontName: String {
case suitSemiBold = "SUIT-SemiBold"
case suitRegular = "SUIT-Regular"
}
}

extension UIFont {
static func font(_ style: FontName, ofSize size: CGFloat) -> UIFont {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "food_img_ad.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" : "food_img_apple.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" : "food_img_candy.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" : "food_img_chestnut.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" : "food_img_ chocolate.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" : "food_img_lemon.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" : "food_img_macaroon.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" : "food_img_onion.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" : "tmon_btn_down.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.
15 changes: 15 additions & 0 deletions TMON-iOS/TMON-iOS/Global/UIComponents/BestProductModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// BestProductModel.swift
// TMON-iOS
//
// Created by 정윤선 on 2022/11/25.
//

import Foundation

struct BestProductModel {
let productRanking: String
let productImage: String
let productName: String
let productPrice: String
}
Loading