diff --git a/Check/modal/infobox/ico/line.png b/Check/modal/infobox/ico/line.png deleted file mode 100644 index 421badb4..00000000 Binary files a/Check/modal/infobox/ico/line.png and /dev/null differ diff --git a/Map/Tmap/modal/ico/logo/logo/square.png b/Map/Tmap/modal/ico/logo/logo/square.png deleted file mode 100644 index 30cb0be8..00000000 Binary files a/Map/Tmap/modal/ico/logo/logo/square.png and /dev/null differ diff --git a/Map/Tmap/naver/modal/ico/logo/logo/square.png b/Map/Tmap/naver/modal/ico/logo/logo/square.png deleted file mode 100644 index 7bfb5658..00000000 Binary files a/Map/Tmap/naver/modal/ico/logo/logo/square.png and /dev/null differ diff --git a/Map/modal/ico/logo/logo/modal/ico/logo/logo/square.png b/Map/modal/ico/logo/logo/modal/ico/logo/logo/square.png deleted file mode 100644 index ed269737..00000000 Binary files a/Map/modal/ico/logo/logo/modal/ico/logo/logo/square.png and /dev/null differ diff --git a/Map/modal/ico/logo/logo/square.png b/Map/modal/ico/logo/logo/square.png deleted file mode 100644 index 5eb0bfb0..00000000 Binary files a/Map/modal/ico/logo/logo/square.png and /dev/null differ diff --git a/Map/modal/ico/search/ico/ico/line.png b/Map/modal/ico/search/ico/ico/line.png deleted file mode 100644 index 10972352..00000000 Binary files a/Map/modal/ico/search/ico/ico/line.png and /dev/null differ diff --git a/Map/modal/ico/search/ico/ico/line@2x.png b/Map/modal/ico/search/ico/ico/line@2x.png deleted file mode 100644 index 4d632200..00000000 Binary files a/Map/modal/ico/search/ico/ico/line@2x.png and /dev/null differ diff --git a/Map/modal/ico/search/ico/ico/line@3x.png b/Map/modal/ico/search/ico/ico/line@3x.png deleted file mode 100644 index fbea4688..00000000 Binary files a/Map/modal/ico/search/ico/ico/line@3x.png and /dev/null differ diff --git a/Marker/UnTapMarker/search/ico/solid.png b/Marker/UnTapMarker/search/ico/solid.png deleted file mode 100644 index 10ce11cd..00000000 Binary files a/Marker/UnTapMarker/search/ico/solid.png and /dev/null differ diff --git a/Marker/search/ico/solid.png b/Marker/search/ico/solid.png deleted file mode 100644 index 39f13b31..00000000 Binary files a/Marker/search/ico/solid.png and /dev/null differ diff --git a/Poppool/Poppool.xcodeproj/project.pbxproj b/Poppool/Poppool.xcodeproj/project.pbxproj index 8227f3a4..f8e92c85 100644 --- a/Poppool/Poppool.xcodeproj/project.pbxproj +++ b/Poppool/Poppool.xcodeproj/project.pbxproj @@ -461,7 +461,6 @@ BD9103932CF6166800BBCCAE /* SplashController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103902CF6166800BBCCAE /* SplashController.swift */; }; BDCA41C12CF35AC0005EECF6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDCA41C02CF35AC0005EECF6 /* AppDelegate.swift */; }; BDCA41C32CF35AC0005EECF6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDCA41C22CF35AC0005EECF6 /* SceneDelegate.swift */; }; - BDCA41C52CF35AC0005EECF6 /* TestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDCA41C42CF35AC0005EECF6 /* TestViewController.swift */; }; BDCA41CA2CF35AC1005EECF6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BDCA41C92CF35AC1005EECF6 /* Assets.xcassets */; }; BDCA41CD2CF35AC1005EECF6 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = BDCA41CC2CF35AC1005EECF6 /* Base */; }; BDCA41F22CF35D0D005EECF6 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = BDCA41F12CF35D0D005EECF6 /* SnapKit */; }; @@ -924,7 +923,6 @@ BDCA41BD2CF35AC0005EECF6 /* Poppool.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Poppool.app; sourceTree = BUILT_PRODUCTS_DIR; }; BDCA41C02CF35AC0005EECF6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; BDCA41C22CF35AC0005EECF6 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - BDCA41C42CF35AC0005EECF6 /* TestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestViewController.swift; sourceTree = ""; }; BDCA41C92CF35AC1005EECF6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; BDCA41CC2CF35AC1005EECF6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; BDCA41CE2CF35AC1005EECF6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -961,6 +959,43 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 05FBCABE2DABE79A00215BE6 /* AdminAPI */ = { + isa = PBXGroup; + children = ( + 05FBCABF2DABE7AC00215BE6 /* ResponseDTO */, + 4E755B1E2D2B9AE500ADFB21 /* AdminAPIEndpoint.swift */, + ); + path = AdminAPI; + sourceTree = ""; + }; + 05FBCABF2DABE7AC00215BE6 /* ResponseDTO */ = { + isa = PBXGroup; + children = ( + 4E755B1C2D2B9AD300ADFB21 /* GetAdminPopUpStoreListResponseDTO.swift */, + 4E755B202D2B9BAB00ADFB21 /* AdminResponseDTO.swift */, + ); + path = ResponseDTO; + sourceTree = ""; + }; + 05FBCAC02DABEB1100215BE6 /* MapAPI */ = { + isa = PBXGroup; + children = ( + 4EA2C9422D424DF900F4D97C /* FindDirectionEndPoint.swift */, + 4E685EBA2D12CEB6001EF91C /* MapAPIEndpoint.swift */, + 05FBCAC12DABEB3B00215BE6 /* ResponseDTO */, + ); + path = MapAPI; + sourceTree = ""; + }; + 05FBCAC12DABEB3B00215BE6 /* ResponseDTO */ = { + isa = PBXGroup; + children = ( + 4E685EBC2D12CEB6001EF91C /* MapPopUpStoreDTO.swift */, + 4EA2C9402D424D8400F4D97C /* GetPopUpDirectionResponseDTO.swift */, + ); + path = ResponseDTO; + sourceTree = ""; + }; 0818988C2D295DAD0067BF01 /* MyPageLogoutSection */ = { isa = PBXGroup; children = ( @@ -1339,7 +1374,6 @@ children = ( BDCA41C02CF35AC0005EECF6 /* AppDelegate.swift */, BDCA41C22CF35AC0005EECF6 /* SceneDelegate.swift */, - BDCA41C42CF35AC0005EECF6 /* TestViewController.swift */, ); path = Application; sourceTree = ""; @@ -1363,8 +1397,6 @@ 083A256D2CF3613C0099B58E /* Presentation */ = { isa = PBXGroup; children = ( - 4E755B1B2D2B9ABF00ADFB21 /* Admin */, - 4E685ECD2D12CEB6001EF91C /* Map */, 08B1915F2CF430D40057BC04 /* Components */, 083A25C22CF3635B0099B58E /* Scene */, 083A259D2CF3620B0099B58E /* Utills */, @@ -1407,6 +1439,7 @@ 083A25982CF362090099B58E /* Interfaces */, 083A25812CF361EF0099B58E /* Controllers */, 08CBEA382D3FABD300248007 /* ToastMaker */, + 4EDDEFB22D2D284B00CFAFA5 /* Common */, ); path = Utills; sourceTree = ""; @@ -1525,6 +1558,8 @@ BD9103912CF6166800BBCCAE /* Splash */, 083C86092D073A08003F441C /* Detail */, 083C86332D0C7EDB003F441C /* Comment */, + 4E755B1B2D2B9ABF00ADFB21 /* Admin */, + 4E685ECD2D12CEB6001EF91C /* Map */, ); path = Scene; sourceTree = ""; @@ -2644,34 +2679,6 @@ path = FillterSheetView; sourceTree = ""; }; - 4E685EB72D12CEB6001EF91C /* Repository */ = { - isa = PBXGroup; - children = ( - 4E685EB62D12CEB6001EF91C /* MapRepository.swift */, - ); - path = Repository; - sourceTree = ""; - }; - 4E685EB92D12CEB6001EF91C /* UseCase */ = { - isa = PBXGroup; - children = ( - 4E685EB82D12CEB6001EF91C /* MapUseCase.swift */, - ); - path = UseCase; - sourceTree = ""; - }; - 4E685EBD2D12CEB6001EF91C /* MapDomain */ = { - isa = PBXGroup; - children = ( - 4E685EB72D12CEB6001EF91C /* Repository */, - 4E685EB92D12CEB6001EF91C /* UseCase */, - 4E685EBA2D12CEB6001EF91C /* MapAPIEndpoint.swift */, - 4E685EBB2D12CEB6001EF91C /* MapPopUpStore.swift */, - 4E685EBC2D12CEB6001EF91C /* MapPopUpStoreDTO.swift */, - ); - path = MapDomain; - sourceTree = ""; - }; 4E685EC02D12CEB6001EF91C /* MapPopupCardView */ = { isa = PBXGroup; children = ( @@ -2699,7 +2706,7 @@ 4EC23F432D6F7E6D00558673 /* MapView */, 4E685EB52D12CEB6001EF91C /* FillterSheetView */, 4E685EC52D12CEB6001EF91C /* StoreListView */, - 4EED9BAA2D2272F500B288E7 /* Common */, + 4E685EC02D12CEB6001EF91C /* MapPopupCardView */, 4EE5A3D12D40E3B100A2469A /* FindMap */, ); path = Map; @@ -2708,8 +2715,6 @@ 4E755B1B2D2B9ABF00ADFB21 /* Admin */ = { isa = PBXGroup; children = ( - 4E9C127F2D2BD01F006744D6 /* Domain */, - 4E9C127B2D2BCFE4006744D6 /* Data */, 4E755B222D2B9C5D00ADFB21 /* AdminViewController.swift */, 4E755B242D2B9C6C00ADFB21 /* AdminView.swift */, 4E755B262D2B9C7C00ADFB21 /* AdminStoreCell.swift */, @@ -2717,7 +2722,6 @@ 4E9405302D6F7C790002B590 /* AdminRegister */, 4E94052F2D6F7C670002B590 /* AdminBottomSheet */, 4EEA1D8E2D352012003E7DE9 /* ImageCell.swift */, - 4EDDEFB22D2D284B00CFAFA5 /* Common */, ); path = Admin; sourceTree = ""; @@ -2743,60 +2747,12 @@ path = AdminRegister; sourceTree = ""; }; - 4E9C127B2D2BCFE4006744D6 /* Data */ = { - isa = PBXGroup; - children = ( - 4E685EBD2D12CEB6001EF91C /* MapDomain */, - 4E9C127E2D2BD012006744D6 /* Remote */, - 4E9C127D2D2BD007006744D6 /* Repository */, - 4E9C127C2D2BCFF1006744D6 /* DTO */, - ); - path = Data; - sourceTree = ""; - }; - 4E9C127C2D2BCFF1006744D6 /* DTO */ = { - isa = PBXGroup; - children = ( - 4E755B1C2D2B9AD300ADFB21 /* GetAdminPopUpStoreListResponseDTO.swift */, - 4E755B202D2B9BAB00ADFB21 /* AdminResponseDTO.swift */, - ); - path = DTO; - sourceTree = ""; - }; - 4E9C127D2D2BD007006744D6 /* Repository */ = { - isa = PBXGroup; - children = ( - 4E755B2E2D2BA7FB00ADFB21 /* AdminRepository.swift */, - ); - path = Repository; - sourceTree = ""; - }; - 4E9C127E2D2BD012006744D6 /* Remote */ = { - isa = PBXGroup; - children = ( - 4E755B1E2D2B9AE500ADFB21 /* AdminAPIEndpoint.swift */, - ); - path = Remote; - sourceTree = ""; - }; - 4E9C127F2D2BD01F006744D6 /* Domain */ = { - isa = PBXGroup; - children = ( - 4E755B2A2D2BA76E00ADFB21 /* AdminUseCase.swift */, - ); - path = Domain; - sourceTree = ""; - }; 4EA2C93B2D424D2600F4D97C /* MapGuideView */ = { isa = PBXGroup; children = ( 4E6A066F2D42A96100B2A658 /* FullScreenMapViewController.swift */, - 4EA2C93C2D424D3300F4D97C /* MapDirectionRepository.swift */, - 4EA2C93E2D424D7400F4D97C /* MapDirectionUseCase.swift */, - 4EA2C9402D424D8400F4D97C /* GetPopUpDirectionResponseDTO.swift */, 4E9790C42D40E13500210499 /* MapGuideViewController.swift */, 4EE5A3D22D40E4A600A2469A /* MapGuideReactor.swift */, - 4EA2C9422D424DF900F4D97C /* FindDirectionEndPoint.swift */, ); path = MapGuideView; sourceTree = ""; @@ -2817,6 +2773,15 @@ 4EDDEFB22D2D284B00CFAFA5 /* Common */ = { isa = PBXGroup; children = ( + 4EAB809C2D3F78AA0041AF30 /* NMFMapViewDelegateProxy.swift */, + 4EAB809E2D3F8EF50041AF30 /* ViewportBounds.swift */, + 4EED9BAB2D22730400B288E7 /* FilterType.swift */, + 4E6C07052D4B6E56008A962A /* RegionDefinitions.swift */, + 4E685EC62D12CEB6001EF91C /* MapFilterChips.swift */, + 4E9A465F2D55D1270010578A /* MapUtilities.swift */, + 4E6C07092D4B6E81008A962A /* ClusteringManager.swift */, + 4E6C07072D4B6E74008A962A /* ClusteringModels.swift */, + 4EDE57022D5E70650014D924 /* LocationPermissionBottomSheet.swift */, 4EDDEFB32D2D285900CFAFA5 /* DateTimePickerManager.swift */, 4EEA1D902D352027003E7DE9 /* ExtendedImage.swift */, ); @@ -2831,23 +2796,6 @@ path = FindMap; sourceTree = ""; }; - 4EED9BAA2D2272F500B288E7 /* Common */ = { - isa = PBXGroup; - children = ( - 4EAB809C2D3F78AA0041AF30 /* NMFMapViewDelegateProxy.swift */, - 4EAB809E2D3F8EF50041AF30 /* ViewportBounds.swift */, - 4EED9BAB2D22730400B288E7 /* FilterType.swift */, - 4E6C07052D4B6E56008A962A /* RegionDefinitions.swift */, - 4E685EC62D12CEB6001EF91C /* MapFilterChips.swift */, - 4E9A465F2D55D1270010578A /* MapUtilities.swift */, - 4E6C07092D4B6E81008A962A /* ClusteringManager.swift */, - 4E6C07072D4B6E74008A962A /* ClusteringModels.swift */, - 4EDE57022D5E70650014D924 /* LocationPermissionBottomSheet.swift */, - 4E685EC02D12CEB6001EF91C /* MapPopupCardView */, - ); - path = Common; - sourceTree = ""; - }; BD9103502CF6149D00BBCCAE /* AuthAPI */ = { isa = PBXGroup; children = ( @@ -2869,12 +2817,14 @@ BD91035A2CF6149D00BBCCAE /* Repository */ = { isa = PBXGroup; children = ( + 4E755B2E2D2BA7FB00ADFB21 /* AdminRepository.swift */, BD9103572CF6149D00BBCCAE /* AuthAPIRepositoryImpl.swift */, BD9103582CF6149D00BBCCAE /* HomeAPIRepository.swift */, BD9103592CF6149D00BBCCAE /* SignUpRepositoryImpl.swift */, 086DD8D92CFF194700B97D3B /* UserAPIRepositoryImpl.swift */, 089952522D033C940022AEF9 /* PopUpAPIRepositoryImpl.swift */, 083C86772D0EE382003F441C /* CommentAPIRepository.swift */, + 4E685EB62D12CEB6001EF91C /* MapRepository.swift */, ); path = Repository; sourceTree = ""; @@ -2894,6 +2844,8 @@ isa = PBXGroup; children = ( 08DC62102CF8B446002A2F44 /* SortedRequestDTO.swift */, + 05FBCAC02DABEB1100215BE6 /* MapAPI */, + 05FBCABE2DABE79A00215BE6 /* AdminAPI */, 083C86712D0EE2A3003F441C /* CommentAPI */, 089952472D033A0E0022AEF9 /* PopUpAPI */, 086DD8D42CFF181500B97D3B /* UserAPI */, @@ -2911,8 +2863,11 @@ BD9103722CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift */, BD9103742CF614A900BBCCAE /* AuthAPIUseCaseImpl.swift */, 086DD8DD2CFF19C400B97D3B /* UserAPIUseCaseImpl.swift */, + 4EA2C93E2D424D7400F4D97C /* MapDirectionUseCase.swift */, 089952542D033D480022AEF9 /* PopUpAPIUseCaseImpl.swift */, 083C86792D0EE3BB003F441C /* CommentAPIUseCaseImpl.swift */, + 4E755B2A2D2BA76E00ADFB21 /* AdminUseCase.swift */, + 4E685EB82D12CEB6001EF91C /* MapUseCase.swift */, ); path = UseCase; sourceTree = ""; @@ -2923,6 +2878,7 @@ 08CBEA042D38990600248007 /* AuthAPI */, 086F89DE2D1E7CBE00CA4FC9 /* UserAPI */, BD9103762CF614A900BBCCAE /* BannerPopUpStore.swift */, + 4E685EBB2D12CEB6001EF91C /* MapPopUpStore.swift */, BD9103772CF614A900BBCCAE /* Category.swift */, BD9103782CF614A900BBCCAE /* GetHomeInfoResponse.swift */, BD9103792CF614A900BBCCAE /* PopUpStoreResponse.swift */, @@ -2934,6 +2890,7 @@ BD91037F2CF614A900BBCCAE /* Repository */ = { isa = PBXGroup; children = ( + 4EA2C93C2D424D3300F4D97C /* MapDirectionRepository.swift */, BD91037C2CF614A900BBCCAE /* AuthRepository.swift */, ); path = Repository; @@ -3238,7 +3195,6 @@ 0841BAB82CFAC41300049E31 /* SectionBackGroundDecorationView.swift in Sources */, 086F89F52D2269E300CA4FC9 /* MyPageReactor.swift in Sources */, 089952682D046CD80022AEF9 /* SearchResultReactor.swift in Sources */, - BDCA41C52CF35AC0005EECF6 /* TestViewController.swift in Sources */, 086DD9402D01EEEB00B97D3B /* SearchCountTitleSection.swift in Sources */, 083C864C2D0DCF9B003F441C /* AddCommentDescriptionSectionCell.swift in Sources */, 086DD8CE2CFDFEB000B97D3B /* HomeListView.swift in Sources */, diff --git a/Poppool/Poppool/Application/TestViewController.swift b/Poppool/Poppool/Application/TestViewController.swift deleted file mode 100644 index 528e61d1..00000000 --- a/Poppool/Poppool/Application/TestViewController.swift +++ /dev/null @@ -1,154 +0,0 @@ -// -// ViewController.swift -// Poppool -// -// Created by Porori on 11/24/24. -// - -import UIKit - -import RxCocoa -import RxGesture -import RxSwift -import SnapKit - -class TestViewController: UIViewController { - - private let topView: UIView = { - let view = UIView() - view.backgroundColor = .w100 - view.alpha = 0 - return view - }() - - private let topViewLabel: UILabel = { - let label = UILabel() - label.text = "Top View Label" - return label - }() - - private let bottomView: UIView = { - let view = UIView() - view.backgroundColor = .w100 - return view - }() - - private let gestureBar: UIView = { - let view = UIView() - view.backgroundColor = .g200 - return view - }() - - private let listButton: PPButton = { - return PPButton(style: .secondary, text: "리스트 버튼") - }() - - private let disposeBag = DisposeBag() - - private var bottomViewTopConstraints: Constraint? - - enum ModalState { - case top - case middle - case bottom - } - - var modalState: ModalState = .bottom - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .blue - setUpConstratins() - bind() - } - - func setUpConstratins() { - view.addSubview(listButton) - listButton.snp.makeConstraints { make in - make.leading.trailing.bottom.equalToSuperview().inset(20) - make.height.equalTo(50) - } - - view.addSubview(topView) - topView.snp.makeConstraints { make in - make.top.leading.trailing.equalToSuperview() - make.bottom.equalTo(view.safeAreaLayoutGuide.snp.top).offset(104) - } - - topView.addSubview(topViewLabel) - topViewLabel.snp.makeConstraints { make in - make.center.equalToSuperview() - } - - view.addSubview(bottomView) - bottomView.snp.makeConstraints { make in - make.leading.trailing.equalToSuperview() - bottomViewTopConstraints = make.top.equalTo(topView.snp.bottom).offset(700).constraint - make.height.equalTo(700) - } - - bottomView.addSubview(gestureBar) - gestureBar.snp.makeConstraints { make in - make.width.equalTo(50) - make.height.equalTo(20) - make.top.equalToSuperview().inset(20) - make.centerX.equalToSuperview() - } - } - - func bind() { - listButton.rx.tap - .withUnretained(self) - .subscribe { (owner, _) in - print("listButtonTapped") - UIView.animate(withDuration: 0.3) { - owner.bottomViewTopConstraints?.update(offset: 124) - owner.topView.alpha = 0 - owner.view.layoutIfNeeded() - owner.modalState = .middle - } - } - .disposed(by: disposeBag) - - gestureBar.rx.swipeGesture(.up) - .skip(1) - .withUnretained(self) - .subscribe { (owner, _) in - print("swipe up") - UIView.animate(withDuration: 0.3) { - owner.bottomViewTopConstraints?.update(offset: 0) - owner.topView.alpha = 1 - owner.view.layoutIfNeeded() - owner.modalState = .top - } - } - .disposed(by: disposeBag) - - gestureBar.rx.swipeGesture(.down) - .skip(1) - .withUnretained(self) - .subscribe { (owner, _) in - print("swipe down") - switch owner.modalState { - case .top: - UIView.animate(withDuration: 0.3) { - owner.bottomViewTopConstraints?.update(offset: 124) - owner.topView.alpha = 0 - owner.view.layoutIfNeeded() - owner.modalState = .middle - } - case .middle: - UIView.animate(withDuration: 0.3) { - owner.bottomViewTopConstraints?.update(offset: 700) - owner.topView.alpha = 0 - owner.view.layoutIfNeeded() - owner.modalState = .bottom - } - case .bottom: - break - } - - } - .disposed(by: disposeBag) - } -} diff --git a/Poppool/Poppool/Presentation/Admin/Data/Remote/AdminAPIEndpoint.swift b/Poppool/Poppool/Data/Network/AdminAPI/AdminAPIEndpoint.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/Remote/AdminAPIEndpoint.swift rename to Poppool/Poppool/Data/Network/AdminAPI/AdminAPIEndpoint.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/DTO/AdminResponseDTO.swift b/Poppool/Poppool/Data/Network/AdminAPI/ResponseDTO/AdminResponseDTO.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/DTO/AdminResponseDTO.swift rename to Poppool/Poppool/Data/Network/AdminAPI/ResponseDTO/AdminResponseDTO.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/DTO/GetAdminPopUpStoreListResponseDTO.swift b/Poppool/Poppool/Data/Network/AdminAPI/ResponseDTO/GetAdminPopUpStoreListResponseDTO.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/DTO/GetAdminPopUpStoreListResponseDTO.swift rename to Poppool/Poppool/Data/Network/AdminAPI/ResponseDTO/GetAdminPopUpStoreListResponseDTO.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/FindDirectionEndPoint.swift b/Poppool/Poppool/Data/Network/MapAPI/FindDirectionEndPoint.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/FindDirectionEndPoint.swift rename to Poppool/Poppool/Data/Network/MapAPI/FindDirectionEndPoint.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapAPIEndpoint.swift b/Poppool/Poppool/Data/Network/MapAPI/MapAPIEndpoint.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapAPIEndpoint.swift rename to Poppool/Poppool/Data/Network/MapAPI/MapAPIEndpoint.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/GetPopUpDirectionResponseDTO.swift b/Poppool/Poppool/Data/Network/MapAPI/ResponseDTO/GetPopUpDirectionResponseDTO.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/GetPopUpDirectionResponseDTO.swift rename to Poppool/Poppool/Data/Network/MapAPI/ResponseDTO/GetPopUpDirectionResponseDTO.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapPopUpStoreDTO.swift b/Poppool/Poppool/Data/Network/MapAPI/ResponseDTO/MapPopUpStoreDTO.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapPopUpStoreDTO.swift rename to Poppool/Poppool/Data/Network/MapAPI/ResponseDTO/MapPopUpStoreDTO.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/Repository/AdminRepository.swift b/Poppool/Poppool/Data/Repository/AdminRepository.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/Repository/AdminRepository.swift rename to Poppool/Poppool/Data/Repository/AdminRepository.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/MapDomain/Repository/MapRepository.swift b/Poppool/Poppool/Data/Repository/MapRepository.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/MapDomain/Repository/MapRepository.swift rename to Poppool/Poppool/Data/Repository/MapRepository.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapPopUpStore.swift b/Poppool/Poppool/Domain/Entities/MapPopUpStore.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/MapDomain/MapPopUpStore.swift rename to Poppool/Poppool/Domain/Entities/MapPopUpStore.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapDirectionRepository.swift b/Poppool/Poppool/Domain/Repository/MapDirectionRepository.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapDirectionRepository.swift rename to Poppool/Poppool/Domain/Repository/MapDirectionRepository.swift diff --git a/Poppool/Poppool/Presentation/Admin/Domain/AdminUseCase.swift b/Poppool/Poppool/Domain/UseCase/AdminUseCase.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Domain/AdminUseCase.swift rename to Poppool/Poppool/Domain/UseCase/AdminUseCase.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapDirectionUseCase.swift b/Poppool/Poppool/Domain/UseCase/MapDirectionUseCase.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapDirectionUseCase.swift rename to Poppool/Poppool/Domain/UseCase/MapDirectionUseCase.swift diff --git a/Poppool/Poppool/Presentation/Admin/Data/MapDomain/UseCase/MapUseCase.swift b/Poppool/Poppool/Domain/UseCase/MapUseCase.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Data/MapDomain/UseCase/MapUseCase.swift rename to Poppool/Poppool/Domain/UseCase/MapUseCase.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetReactor.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetReactor.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetReactor.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetView.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetView.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetView.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetViewController.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminBottomSheet/AdminBottomSheetViewController.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminBottomSheet/AdminBottomSheetViewController.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminReactor.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminReactor.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminReactor.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpImagesCollectionView.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpImagesCollectionView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpImagesCollectionView.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpImagesCollectionView.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterReactor.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterReactor.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterReactor.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterView.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterView.swift similarity index 99% rename from Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterView.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterView.swift index f071b3f5..f33fb43b 100644 --- a/Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterView.swift +++ b/Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterView.swift @@ -18,6 +18,7 @@ final class PopUpRegisterView: UIView { // 네비게이션 영역 let navigationContainer = UIView() + var writerLabel: UILabel! let logoImageView: UIImageView = { let imageView = UIImageView() @@ -300,7 +301,9 @@ private extension PopUpRegisterView { } // 이미지 영역 - let buttonStack = self.contentView.subviews.first as! UIStackView + guard let buttonStack = contentView.subviews.first as? UIStackView else { + return + } buttonStack.snp.makeConstraints { make in make.top.equalToSuperview().offset(16) make.left.right.equalToSuperview().inset(16) diff --git a/Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterViewController.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterViewController.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminRegister/PopUpStoreRegisterViewController.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminStoreCell.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminStoreCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminStoreCell.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminStoreCell.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminView.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminView.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminView.swift diff --git a/Poppool/Poppool/Presentation/Admin/AdminViewController.swift b/Poppool/Poppool/Presentation/Scene/Admin/AdminViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/AdminViewController.swift rename to Poppool/Poppool/Presentation/Scene/Admin/AdminViewController.swift diff --git a/Poppool/Poppool/Presentation/Admin/ImageCell.swift b/Poppool/Poppool/Presentation/Scene/Admin/ImageCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/ImageCell.swift rename to Poppool/Poppool/Presentation/Scene/Admin/ImageCell.swift diff --git a/Poppool/Poppool/Presentation/Admin/PopUpStoreRegisterReactor.swift b/Poppool/Poppool/Presentation/Scene/Admin/PopUpStoreRegisterReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/PopUpStoreRegisterReactor.swift rename to Poppool/Poppool/Presentation/Scene/Admin/PopUpStoreRegisterReactor.swift diff --git a/Poppool/Poppool/Presentation/Admin/PopUpStoreRegisterView.swift b/Poppool/Poppool/Presentation/Scene/Admin/PopUpStoreRegisterView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/PopUpStoreRegisterView.swift rename to Poppool/Poppool/Presentation/Scene/Admin/PopUpStoreRegisterView.swift diff --git a/Poppool/Poppool/Presentation/Map/CustomClusterRenderer.swift b/Poppool/Poppool/Presentation/Scene/Map/CustomClusterRenderer.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/CustomClusterRenderer.swift rename to Poppool/Poppool/Presentation/Scene/Map/CustomClusterRenderer.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/BalloonBackgroundView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/BalloonBackgroundView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/BalloonBackgroundView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/BalloonBackgroundView.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/BalloonChipCell.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/BalloonChipCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/BalloonChipCell.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/BalloonChipCell.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/CategoryFilterView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/CategoryFilterView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/CategoryFilterView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/CategoryFilterView.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetReactor.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetReactor.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetReactor.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetView.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterBottomSheetViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterBottomSheetViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterCell.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterCell.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterCell.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterChip.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterChip.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterChip.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterChip.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterChipsView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterChipsView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterChipsView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterChipsView.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/FilterTabsView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterTabsView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/FilterTabsView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/FilterTabsView.swift diff --git a/Poppool/Poppool/Presentation/Map/FillterSheetView/LocationFilterView.swift b/Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/LocationFilterView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FillterSheetView/LocationFilterView.swift rename to Poppool/Poppool/Presentation/Scene/Map/FillterSheetView/LocationFilterView.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/GuideMapViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/FindMap/GuideMapViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/GuideMapViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/FindMap/GuideMapViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/FullScreenMapViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/FullScreenMapViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/FullScreenMapViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideAppService.swift b/Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideAppService.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideAppService.swift rename to Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideAppService.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideReactor.swift b/Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideReactor.swift rename to Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideReactor.swift diff --git a/Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/FindMap/MapGuideView/MapGuideViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/FindMap/MapGuideView/MapGuideViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/MapPopupCardView/MapPopupCarouselView.swift b/Poppool/Poppool/Presentation/Scene/Map/MapPopupCardView/MapPopupCarouselView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/MapPopupCardView/MapPopupCarouselView.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapPopupCardView/MapPopupCarouselView.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/MapPopupCardView/PopupCardCell.swift b/Poppool/Poppool/Presentation/Scene/Map/MapPopupCardView/PopupCardCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/MapPopupCardView/PopupCardCell.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapPopupCardView/PopupCardCell.swift diff --git a/Poppool/Poppool/Presentation/Map/MapStoreCard.swift b/Poppool/Poppool/Presentation/Scene/Map/MapStoreCard.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapStoreCard.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapStoreCard.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MapMarker.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MapMarker.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MapMarker.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MapMarker.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MapReactor.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MapReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MapReactor.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MapReactor.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MapSearchInput.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MapSearchInput.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MapSearchInput.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MapSearchInput.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MapView.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MapView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MapView.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MapView.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MapViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MapViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MapViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MapViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/MapView/MarkerTooltipView.swift b/Poppool/Poppool/Presentation/Scene/Map/MapView/MarkerTooltipView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MapView/MarkerTooltipView.swift rename to Poppool/Poppool/Presentation/Scene/Map/MapView/MarkerTooltipView.swift diff --git a/Poppool/Poppool/Presentation/Map/MicroClusterMarkerView.swift b/Poppool/Poppool/Presentation/Scene/Map/MicroClusterMarkerView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/MicroClusterMarkerView.swift rename to Poppool/Poppool/Presentation/Scene/Map/MicroClusterMarkerView.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListPanelLayout.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListPanelLayout.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListPanelLayout.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListPanelLayout.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListCell.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListCell.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListCell.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListCell.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListHeaderView.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListHeaderView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListHeaderView.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListHeaderView.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListPanelLayout.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListPanelLayout.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListPanelLayout.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListPanelLayout.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListReactor.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListReactor.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListReactor.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListReactor.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListSection.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListSection.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListSection.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListSection.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListView.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListView.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListView.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListView.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreListView/StoreListViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreListView/StoreListViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreListView/StoreListViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/StoreLocation.swift b/Poppool/Poppool/Presentation/Scene/Map/StoreLocation.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/StoreLocation.swift rename to Poppool/Poppool/Presentation/Scene/Map/StoreLocation.swift diff --git a/Poppool/Poppool/Presentation/Map/TestViewController.swift b/Poppool/Poppool/Presentation/Scene/Map/TestViewController.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/TestViewController.swift rename to Poppool/Poppool/Presentation/Scene/Map/TestViewController.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/ClusteringManager.swift b/Poppool/Poppool/Presentation/Utills/Common/ClusteringManager.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/ClusteringManager.swift rename to Poppool/Poppool/Presentation/Utills/Common/ClusteringManager.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/ClusteringModels.swift b/Poppool/Poppool/Presentation/Utills/Common/ClusteringModels.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/ClusteringModels.swift rename to Poppool/Poppool/Presentation/Utills/Common/ClusteringModels.swift diff --git a/Poppool/Poppool/Presentation/Admin/Common/DateTimePickerManager.swift b/Poppool/Poppool/Presentation/Utills/Common/DateTimePickerManager.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Common/DateTimePickerManager.swift rename to Poppool/Poppool/Presentation/Utills/Common/DateTimePickerManager.swift diff --git a/Poppool/Poppool/Presentation/Admin/Common/ExtendedImage.swift b/Poppool/Poppool/Presentation/Utills/Common/ExtendedImage.swift similarity index 100% rename from Poppool/Poppool/Presentation/Admin/Common/ExtendedImage.swift rename to Poppool/Poppool/Presentation/Utills/Common/ExtendedImage.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/FilterType.swift b/Poppool/Poppool/Presentation/Utills/Common/FilterType.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/FilterType.swift rename to Poppool/Poppool/Presentation/Utills/Common/FilterType.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/LocationPermissionBottomSheet.swift b/Poppool/Poppool/Presentation/Utills/Common/LocationPermissionBottomSheet.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/LocationPermissionBottomSheet.swift rename to Poppool/Poppool/Presentation/Utills/Common/LocationPermissionBottomSheet.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/MapFilterChips.swift b/Poppool/Poppool/Presentation/Utills/Common/MapFilterChips.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/MapFilterChips.swift rename to Poppool/Poppool/Presentation/Utills/Common/MapFilterChips.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/MapUtilities.swift b/Poppool/Poppool/Presentation/Utills/Common/MapUtilities.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/MapUtilities.swift rename to Poppool/Poppool/Presentation/Utills/Common/MapUtilities.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/NMFMapViewDelegateProxy.swift b/Poppool/Poppool/Presentation/Utills/Common/NMFMapViewDelegateProxy.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/NMFMapViewDelegateProxy.swift rename to Poppool/Poppool/Presentation/Utills/Common/NMFMapViewDelegateProxy.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/RegionDefinitions.swift b/Poppool/Poppool/Presentation/Utills/Common/RegionDefinitions.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/RegionDefinitions.swift rename to Poppool/Poppool/Presentation/Utills/Common/RegionDefinitions.swift diff --git a/Poppool/Poppool/Presentation/Map/Common/ViewportBounds.swift b/Poppool/Poppool/Presentation/Utills/Common/ViewportBounds.swift similarity index 100% rename from Poppool/Poppool/Presentation/Map/Common/ViewportBounds.swift rename to Poppool/Poppool/Presentation/Utills/Common/ViewportBounds.swift diff --git a/back/search/ico/ico/line.png b/back/search/ico/ico/line.png deleted file mode 100644 index 4a809c58..00000000 Binary files a/back/search/ico/ico/line.png and /dev/null differ diff --git a/back/search/ico/ico/search/ico/ico/line.png b/back/search/ico/ico/search/ico/ico/line.png deleted file mode 100644 index 10972352..00000000 Binary files a/back/search/ico/ico/search/ico/ico/line.png and /dev/null differ diff --git a/back/search/ico/ico/search/ico/ico/line@2x.png b/back/search/ico/ico/search/ico/ico/line@2x.png deleted file mode 100644 index 4d632200..00000000 Binary files a/back/search/ico/ico/search/ico/ico/line@2x.png and /dev/null differ diff --git a/back/search/ico/ico/search/ico/ico/line@3x.png b/back/search/ico/ico/search/ico/ico/line@3x.png deleted file mode 100644 index fbea4688..00000000 Binary files a/back/search/ico/ico/search/ico/ico/line@3x.png and /dev/null differ