Skip to content

Commit

Permalink
fix/#137 충돌 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaybei committed Jul 8, 2024
2 parents 58d8a19 + d39a618 commit 227c47f
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 21 deletions.
12 changes: 8 additions & 4 deletions KkuMulKum.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,15 @@
DE254ACA2C311DC200A4015E /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC12C311DC200A4015E /* Pretendard-Light.otf */; };
DE254ACB2C311DC200A4015E /* Pretendard-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC22C311DC200A4015E /* Pretendard-Black.otf */; };
DE254ACC2C311DC200A4015E /* Pretendard-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = DE254AC32C311DC200A4015E /* Pretendard-Thin.otf */; };
DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */; };
DE32D1D42C3BFB56006848DF /* UpdateProfileNameModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */; };
DE8247FD2C36E7C7000601BC /* MoyaLoggingPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8247FC2C36E7C7000601BC /* MoyaLoggingPlugin.swift */; };
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8247FF2C36E857000601BC /* ObservablePattern.swift */; };
DE9E18802C3BA4AA00DB76B4 /* CustomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E187F2C3BA4AA00DB76B4 /* CustomButton.swift */; };
DE9E18842C3BA84500DB76B4 /* CustomTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18832C3BA84500DB76B4 /* CustomTextField.swift */; };
DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18882C3BC91000DB76B4 /* ResponseBodyDTO.swift */; };
DE9E188B2C3BC92500DB76B4 /* EmptyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E188A2C3BC92500DB76B4 /* EmptyModel.swift */; };
DE9E18922C3BCC9D00DB76B4 /* AuthTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18912C3BCC9D00DB76B4 /* AuthTemp.swift */; };
DE9E18942C3BCCA300DB76B4 /* UsersTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */; };
DE9E18982C3BCCB800DB76B4 /* PromisesTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18972C3BCCB800DB76B4 /* PromisesTemp.swift */; };
DE9E189A2C3BCCBE00DB76B4 /* UtilsTemp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */; };
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED5DBEB2C345210006ECE7E /* BaseViewController.swift */; };
Expand Down Expand Up @@ -134,14 +135,15 @@
DE254AC12C311DC200A4015E /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
DE254AC22C311DC200A4015E /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = "<group>"; };
DE254AC32C311DC200A4015E /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = "<group>"; };
DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginUserResponseModel.swift; sourceTree = "<group>"; };
DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateProfileNameModel.swift; sourceTree = "<group>"; };
DE8247FC2C36E7C7000601BC /* MoyaLoggingPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoyaLoggingPlugin.swift; sourceTree = "<group>"; };
DE8247FF2C36E857000601BC /* ObservablePattern.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservablePattern.swift; sourceTree = "<group>"; };
DE9E187F2C3BA4AA00DB76B4 /* CustomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomButton.swift; sourceTree = "<group>"; };
DE9E18832C3BA84500DB76B4 /* CustomTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTextField.swift; sourceTree = "<group>"; };
DE9E18882C3BC91000DB76B4 /* ResponseBodyDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseBodyDTO.swift; sourceTree = "<group>"; };
DE9E188A2C3BC92500DB76B4 /* EmptyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyModel.swift; sourceTree = "<group>"; };
DE9E18912C3BCC9D00DB76B4 /* AuthTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthTemp.swift; sourceTree = "<group>"; };
DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsersTemp.swift; sourceTree = "<group>"; };
DE9E18972C3BCCB800DB76B4 /* PromisesTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PromisesTemp.swift; sourceTree = "<group>"; };
DE9E18992C3BCCBE00DB76B4 /* UtilsTemp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UtilsTemp.swift; sourceTree = "<group>"; };
DED5DBEB2C345210006ECE7E /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -410,7 +412,8 @@
DE9E188C2C3BCC3E00DB76B4 /* Users */ = {
isa = PBXGroup;
children = (
DE9E18932C3BCCA300DB76B4 /* UsersTemp.swift */,
DE32D1D12C3BF703006848DF /* LoginUserResponseModel.swift */,
DE32D1D32C3BFB56006848DF /* UpdateProfileNameModel.swift */,
);
path = Users;
sourceTree = "<group>";
Expand Down Expand Up @@ -601,7 +604,6 @@
files = (
DED5DBF22C34534A006ECE7E /* BaseCollectionReusableView.swift in Sources */,
DED5DBEC2C345210006ECE7E /* BaseViewController.swift in Sources */,
DE9E18942C3BCCA300DB76B4 /* UsersTemp.swift in Sources */,
A3FB18512C3BF531001483E5 /* RegisterMeetingsResponseModel.swift in Sources */,
DE9E188B2C3BC92500DB76B4 /* EmptyModel.swift in Sources */,
DDA2EE732C385EB9007C6059 /* MainTabBarController.swift in Sources */,
Expand All @@ -617,6 +619,7 @@
DE8248002C36E857000601BC /* ObservablePattern.swift in Sources */,
DE254AAA2C31190E00A4015E /* UIStackView+.swift in Sources */,
DED5DBF02C345317006ECE7E /* BaseCollectionViewCell.swift in Sources */,
DE32D1D42C3BFB56006848DF /* UpdateProfileNameModel.swift in Sources */,
DE9E18922C3BCC9D00DB76B4 /* AuthTemp.swift in Sources */,
DE254AA82C3118EA00A4015E /* UIView+.swift in Sources */,
DE254AAE2C31193600A4015E /* UIFont+.swift in Sources */,
Expand All @@ -630,6 +633,7 @@
DDA2EE792C385FCF007C6059 /* MyPageViewController.swift in Sources */,
A3FB185B2C3BF7DF001483E5 /* MeetingMembersResponseModel.swift in Sources */,
784E4D9B2C3BBD4D00BC943C /* KakaoLoginVC.swift in Sources */,
DE32D1D22C3BF703006848DF /* LoginUserResponseModel.swift in Sources */,
DE9E18892C3BC91000DB76B4 /* ResponseBodyDTO.swift in Sources */,
DE9E18982C3BCCB800DB76B4 /* PromisesTemp.swift in Sources */,
DED5DBEE2C34529A006ECE7E /* BaseView.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "e965e5bd1339de125bca61567185acfd41e7aa2dcfa1047d417a53865e4e70dc",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand Down Expand Up @@ -199,5 +200,5 @@
}
}
],
"version" : 2
"version" : 3
}
8 changes: 0 additions & 8 deletions KkuMulKum/Network/DTO/Model/Auth/AuthTemp.swift

This file was deleted.

15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/ResissueResponseModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// ResissueResponseModel.swift
// KkuMulKum
//
// Created by 이지훈 on 7/8/24.
//

import Foundation


// MARK: - ReissueResponseModel

struct ReissueResponseModel: Codable {
let accessToken, refreshToken: String?
}
15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/SocialLoginRequestModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// AuthTemp.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation


// MARK: - SocialLoginRequestModel

struct SocialLoginRequestModel: Codable {
let provider: String?
}
15 changes: 15 additions & 0 deletions KkuMulKum/Network/DTO/Model/Auth/SocialLoginResponceModle.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// SocialLoginResponceModle.swift
// KkuMulKum
//
// Created by 이지훈 on 7/8/24.
//

import Foundation


// MARK: - SocialLoginResponseModel

struct SocialLoginResponseModel: Codable {
let name, accessToken, refreshToken: String?
}
26 changes: 26 additions & 0 deletions KkuMulKum/Network/DTO/Model/Users/LoginUserResponseModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// LoginUserResponseModel.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation

struct LoginUserResponseModel: Codable {
let name: String
let level: Int
let promiseCount: Int
let tardyCount: Int
let tardySum: Int
let profileImageURL: String

enum CodingKeys: String, CodingKey {
case name
case level
case promiseCount
case tardyCount
case tardySum
case profileImageURL = "profileImg"
}
}
12 changes: 12 additions & 0 deletions KkuMulKum/Network/DTO/Model/Users/UpdateProfileNameModel.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// UpdateProfileNameModel.swift
// KkuMulKum
//
// Created by 김진웅 on 7/8/24.
//

import Foundation

struct UpdateProfileNameModel: Codable {
let name: String
}
8 changes: 0 additions & 8 deletions KkuMulKum/Network/DTO/Model/Users/UsersTemp.swift

This file was deleted.

0 comments on commit 227c47f

Please sign in to comment.