Skip to content

Commit

Permalink
Merge pull request #68 from Drink-Easy/DY
Browse files Browse the repository at this point in the history
#40 취향찾기 중복 방문 제거
  • Loading branch information
doyeonk429 authored Aug 18, 2024
2 parents 7ff420f + c3324d7 commit 6bdf462
Show file tree
Hide file tree
Showing 21 changed files with 30 additions and 679 deletions.
4 changes: 4 additions & 0 deletions Drink-EG/Drink-EG.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
16B97D182C4C0F6E00D8B453 /* SearchVideoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16B97D172C4C0F6E00D8B453 /* SearchVideoViewController.swift */; };
16C19AA62C70B67200E93FD0 /* ShoppingListManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C19AA52C70B67200E93FD0 /* ShoppingListManager.swift */; };
16C19AA92C70B8D500E93FD0 /* UserWineData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C19AA82C70B8D500E93FD0 /* UserWineData.swift */; };
16C19AAB2C7194D200E93FD0 /* LoginResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16C19AAA2C7194D200E93FD0 /* LoginResponse.swift */; };
1F205A312C68BB5200E80659 /* CartListCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F205A302C68BB5200E80659 /* CartListCollectionViewCell.swift */; };
1F205A332C69FE9800E80659 /* JoinNLoginRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F205A322C69FE9800E80659 /* JoinNLoginRequest.swift */; };
1F205A372C6A71BC00E80659 /* APIResponseLoginResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F205A362C6A71BC00E80659 /* APIResponseLoginResponse.swift */; };
Expand Down Expand Up @@ -185,6 +186,7 @@
16C19AA12C70723200E93FD0 /* Drink-EG.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Drink-EG.entitlements"; sourceTree = "<group>"; };
16C19AA52C70B67200E93FD0 /* ShoppingListManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingListManager.swift; sourceTree = "<group>"; };
16C19AA82C70B8D500E93FD0 /* UserWineData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserWineData.swift; sourceTree = "<group>"; };
16C19AAA2C7194D200E93FD0 /* LoginResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginResponse.swift; sourceTree = "<group>"; };
1F205A302C68BB5200E80659 /* CartListCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartListCollectionViewCell.swift; sourceTree = "<group>"; };
1F205A322C69FE9800E80659 /* JoinNLoginRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinNLoginRequest.swift; sourceTree = "<group>"; };
1F205A362C6A71BC00E80659 /* APIResponseLoginResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIResponseLoginResponse.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -345,6 +347,7 @@
children = (
1F205A322C69FE9800E80659 /* JoinNLoginRequest.swift */,
165401062C6BA5D8008A9DBF /* MemberInfoRequest.swift */,
16C19AAA2C7194D200E93FD0 /* LoginResponse.swift */,
);
path = User;
sourceTree = "<group>";
Expand Down Expand Up @@ -755,6 +758,7 @@
16B97D182C4C0F6E00D8B453 /* SearchVideoViewController.swift in Sources */,
1F598EEC2C524D2E000CE79F /* RecomCollectionViewCell.swift in Sources */,
1654010D2C6C7FBB008A9DBF /* APIResponseMemberResponse.swift in Sources */,
16C19AAB2C7194D200E93FD0 /* LoginResponse.swift in Sources */,
1F8F99F52C6F40F400EAEF6C /* APIResponseWineSearchResponse.swift in Sources */,
165401072C6BA5D8008A9DBF /* MemberInfoRequest.swift in Sources */,
1F205A372C6A71BC00E80659 /* APIResponseLoginResponse.swift in Sources */,
Expand Down
71 changes: 0 additions & 71 deletions Drink-EG/Drink-EG/Resources/APIs/SearchAPI 2.swift

This file was deleted.

This file was deleted.

This file was deleted.

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.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Drink-EG/Drink-EG/Resources/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
// 화면을 구성하는 UIWindow 인스턴스 생성
let window = UIWindow(windowScene: windowScene)
// 실제 첫 화면이 되는 MainViewController 인스턴스 생성
let vc = MainTabBarViewController()
let vc = EnterLoginViewController()
// NavigationController을 사용할 경우, MainViewController를 rootViewController로 갖는 NavigationController을 생성해야한다.
let navigationController = UINavigationController(rootViewController: vc)
navigationController.isNavigationBarHidden = true
Expand Down
26 changes: 0 additions & 26 deletions Drink-EG/Drink-EG/Sources/Datas/Search/WineInfoResponse 2.swift

This file was deleted.

16 changes: 0 additions & 16 deletions Drink-EG/Drink-EG/Sources/Datas/Search/WineSearchResponse 2.swift

This file was deleted.

14 changes: 14 additions & 0 deletions Drink-EG/Drink-EG/Sources/Datas/User/LoginResponse.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// LoginResponse.swift
// Drink-EG
//
// Created by 김도연 on 8/18/24.
//

import Foundation

struct LoginResponse : Codable {
let isFirst : Bool
let role : String
let username : String
}

This file was deleted.

This file was deleted.

49 changes: 0 additions & 49 deletions Drink-EG/Drink-EG/Sources/Models/SelectionManager 2.swift

This file was deleted.

Loading

0 comments on commit 6bdf462

Please sign in to comment.