-
Notifications
You must be signed in to change notification settings - Fork 1
[#234] 제휴 지도 v3.0.0 업데이트 #310
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
Merged
Changes from all commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
6514ccf
[#234]하단 탭바 1차 구현
Hrepay 06debfd
[#234]하단 탭바 UI 2차 구현
Hrepay e4bdfeb
[#234] 로그인 안했을 때 alert 처리 구현
Hrepay 2d74843
[#234] tabBar 관련 파일 Base 코드로 수정
Hrepay 4009621
[#234] HomeViewController 네비게이션 버그 수정
Hrepay 5c43819
[#234] 네이버 맵 1차 연동 완료
Hrepay 470e95b
[#234] map UI 1차 구현
Hrepay d46417e
[#234] 마이페이지 1차 수정
Hrepay fbc511c
[#234] 마이페이지 UI 구현 완료
Hrepay b1ea93a
[#234] 마이페이지 소속 설정 완료
Hrepay 917e5a6
[#234] 닉네임 설정 텍스트 필드 여백 수정
Hrepay 9314358
[#234] 소속 설정 API 연결
Hrepay e1e2a56
[#234] 전체 제휴 지도 1차 연결 및 pin 이미지 추가
Hrepay df0b102
[#234] 전체 제휴 지도 마커 UI 설정 완료
Hrepay c11e1f3
[#234] 음식점 디테일 뷰 1차 구현
Hrepay b0f9f97
[#234] 제휴 지도 API에 맞춰서 수정
Hrepay ffdfe5b
[#234] 제휴 지도 디테일 뷰 레이아웃 수정 완료
Hrepay 912c879
Merge branch 'develop' into feat/#234
Hrepay 86d3a3e
[#234] 마이페이지 학과 선택 시 버튼 활성화 및 문구 변경
Hrepay a2ec5c9
[#234] 제휴 지도에 학과 띄우기 연결 완료
Hrepay 42a857a
[#234] 제휴지도 학과 음식점 띄우기 완료
Hrepay 21d4c8c
[#234] 하단 탭으로 새로고침 진행시 선택한 메뉴에 맞춰서 제휴 음식점 띄우기 수정
Hrepay 18f16dd
[#234] 드롭메뉴 중복 생성 방지
Hrepay 068b591
Merge branch 'develop' into feat/#234
Hrepay 45e855e
[#234] merge 버그 수정
Hrepay ee82096
[#234] 자신의 위치 찍기 임시 커밋
Hrepay 193cda6
[#234] 학과 설정 안했을 경우 뜨는 바텀시트 구현
Hrepay a529720
[#234] 바텀 시트에서 마이페이지-내 정보로 네비게이션 설정 완료
Hrepay cbe4e96
[#234] 마이페이지연결된 계정 수정 완료
Hrepay dd6b840
[#234] 내 제휴 관련 주석 제거 및 학과 설정 뷰 레이아웃 버그 수정
Hrepay 893e1bc
[#234] 제휴 마커 레이아웃 버그 수정
Hrepay 14801c3
[#234] 찜 아이콘 제거
Hrepay fd55113
[#234] 학과 변경 바로 반영안되는 버그 수정
Hrepay da6562d
[#234] 제휴지도 관련 파일 주석 및 MARK 정리, BaseView 적용
Hrepay 5435f22
[#234] 내 위치 자동 활성화 해제 및 단과대 버그 수정
Hrepay 5df4d1d
[#234] 마이페이지 정보 수정 시 뜨는 멘트 수정
Hrepay fea5ae5
[#234] 제휴 지도 탭으로 복귀시 전체 버튼으로 세팅 설정
Hrepay 5d8adc3
[#234] 제휴 지도 dto 버그 수정 완료
Hrepay b345701
Merge branch 'develop' into feat/#234
Hrepay a938a7f
[#234] 단과대/학과 API 연결 완료
Hrepay 51d882e
[#234] 내정보 불러오기 dto 수정
Hrepay a8965c5
Merge branch 'develop' into feat/#234
Hrepay 956d2c9
[#234] 학과 설정 API 파라미터 변경 (departmentName -> departmentId)
Hrepay 44cb3f3
[#234] 마이페이지 내 정보 리스트 추가 및 기능 연결
Hrepay b4330ac
[#234] 내 정보 관련 기능 1차 수정
Hrepay 83481bc
[#234] SetNickNameViewController 파일 리팩토링, AppDelegate에 Realm 마이크레이션 추가
Hrepay c2e4e20
[#234] myPageTableView의 height가 유동적으로 동작하게끔 리펙토링
Hrepay 9de5077
Merge branch 'develop' into feat/#234
Hrepay a8d19e3
[#234 하단 탭바 높이 수정
Hrepay 1fba51b
[#234] 제휴 바텀 시트 iOS 16.0 버전 일때, Height가 유동적으로 바뀌게 수정
Hrepay 2ae22f3
[#234] 하단 탭바 추가 수정
Hrepay cd54e60
[#234] 아이콘 이미지 수정
Hrepay 61dba7b
[#234] profile 이미지 리뷰 페이지에서 크기에 맞게 수정
Hrepay 96c3b1b
[#234] 둘러보기 상태에서 지도 선택 시 로그인유도 alert 설정 완료
Hrepay 3409f0e
[#234] 학과 설정을 하지 않은 상태에서 닉네임만 수정하고 저장할 경우 뜨던 버그 수정
Hrepay fbc6c31
[#234] 마이-내정보를 띄울 때 UI 중복 처리되는 버그 수정
Hrepay a77518c
[#234] iOS 버전에 따른 문법 분기
Hrepay File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
EATSSU/App/Sources/Data/Network/DTO/My/GetDepartmentResponse.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // | ||
| // GetDepartmentResponse.swift | ||
| // EATSSU | ||
| // | ||
| // Created by 황상환 on 7/7/25. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct GetDepartmentResponse: Codable { | ||
| let departmentName: String | ||
| } |
16 changes: 16 additions & 0 deletions
16
EATSSU/App/Sources/Data/Network/DTO/My/LookupItemDTO.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // | ||
| // LookupItemDTO.swift | ||
| // EATSSU | ||
| // | ||
| // Created by 황상환 on 8/13/25. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct LookupItemDTO: Codable { | ||
| let id: Int | ||
| let name: String | ||
| } | ||
|
|
||
| typealias CollegesResponseDTO = BaseResponse<[LookupItemDTO]> | ||
| typealias DepartmentsResponseDTO = BaseResponse<[LookupItemDTO]> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
EATSSU/App/Sources/Data/Network/DTO/Partnership/PartnershipDTO.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // | ||
| // PartnershipDTO.swift | ||
| // EATSSU | ||
| // | ||
| // Created by 황상환 on 7/1/25. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct PartnershipDTO: Codable { | ||
| let storeName: String | ||
| let longitude: Double | ||
| let latitude: Double | ||
| let restaurantType: String | ||
| let partnershipInfos: [PartnershipInfoDTO] | ||
| } | ||
|
|
||
| struct PartnershipInfoDTO: Codable { | ||
| let id: Int | ||
| let partnershipType: String | ||
| let collegeName: String? | ||
| let departmentName: String? | ||
| let likeCount: Int | ||
| let isLiked: Bool | ||
| let description: String | ||
| let startDate: String | ||
| let endDate: String | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
EATSSU/App/Sources/Data/Network/Router/PartnershipRouter.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // | ||
| // PartnershipRouter.swift | ||
| // EATSSU | ||
| // | ||
| // Created by 황상환 on 7/1/25. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| import Moya | ||
|
|
||
| enum PartnershipRouter { | ||
| case getAllPartnerships | ||
| } | ||
|
|
||
| extension PartnershipRouter: TargetType { | ||
| var baseURL: URL { | ||
| URL(string: Config.baseURL)! | ||
| } | ||
|
|
||
| var path: String { | ||
| switch self { | ||
| case .getAllPartnerships: | ||
| return "/partnerships" | ||
| } | ||
| } | ||
|
|
||
| var method: Moya.Method { | ||
| return .get | ||
| } | ||
|
|
||
| var task: Task { | ||
| return .requestPlain | ||
| } | ||
|
|
||
| var headers: [String: String]? { | ||
| switch self { | ||
| default: | ||
| return ["Content-Type": "application/json"] | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updateUserInfo메서드와updateDepartment메서드 간에 중복되는 코드가 있습니다. 코드 재사용성을 높이고 중복을 줄이기 위해updateUserInfo내부에서updateDepartment를 호출하는 방식으로 리팩토링하는 것을 제안합니다.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
중복 제거하려는 의도는 좋은데, 굳이 updateDepartment()로 나누지 않아도 괜찮을 것 같네요