diff --git a/momoIOS.xcodeproj/project.pbxproj b/momoIOS.xcodeproj/project.pbxproj index 257f7a4..1176ff2 100644 --- a/momoIOS.xcodeproj/project.pbxproj +++ b/momoIOS.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 3A75FC10298827BE00B36A46 /* MainAttendanceCodeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */; }; 3AA713C929884007006F922F /* MainAttendanceDoneCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA713C829884007006F922F /* MainAttendanceDoneCell.swift */; }; 3AA713D1298946FF006F922F /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA713D0298946FF006F922F /* UIColor+Extension.swift */; }; + 3ABBF74829975801004D4D0B /* NotActiveSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ABBF74729975801004D4D0B /* NotActiveSessionCell.swift */; }; + 3ABBF75129975EDA004D4D0B /* AdminSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ABBF74E29975ED9004D4D0B /* AdminSessionCell.swift */; }; + 3ABBF75229975EDA004D4D0B /* AdminSessionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ABBF74F29975ED9004D4D0B /* AdminSessionTableViewController.swift */; }; + 3ABBF75329975EDA004D4D0B /* AddSessionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ABBF75029975ED9004D4D0B /* AddSessionViewController.swift */; }; BF0408632987B3AA00F1129B /* LoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0408622987B3AA00F1129B /* LoginController.swift */; }; BF04086B2987E34800F1129B /* AuthCommonConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF04086A2987E34800F1129B /* AuthCommonConstants.swift */; }; BF04086D2987E38C00F1129B /* RegistrationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF04086C2987E38C00F1129B /* RegistrationController.swift */; }; @@ -48,6 +52,10 @@ 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAttendanceCodeCell.swift; sourceTree = ""; }; 3AA713C829884007006F922F /* MainAttendanceDoneCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAttendanceDoneCell.swift; sourceTree = ""; }; 3AA713D0298946FF006F922F /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = ""; }; + 3ABBF74729975801004D4D0B /* NotActiveSessionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotActiveSessionCell.swift; sourceTree = ""; }; + 3ABBF74E29975ED9004D4D0B /* AdminSessionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdminSessionCell.swift; sourceTree = ""; }; + 3ABBF74F29975ED9004D4D0B /* AdminSessionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdminSessionTableViewController.swift; sourceTree = ""; }; + 3ABBF75029975ED9004D4D0B /* AddSessionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddSessionViewController.swift; sourceTree = ""; }; BF0408622987B3AA00F1129B /* LoginController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginController.swift; sourceTree = ""; }; BF04086A2987E34800F1129B /* AuthCommonConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthCommonConstants.swift; sourceTree = ""; }; BF04086C2987E38C00F1129B /* RegistrationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationController.swift; sourceTree = ""; }; @@ -91,6 +99,77 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3ABBF73F29975082004D4D0B /* Common */ = { + isa = PBXGroup; + children = ( + E8207930298A163400B36FC9 /* Extensions */, + 3ABBF742299750A4004D4D0B /* UI */, + ); + path = Common; + sourceTree = ""; + }; + 3ABBF742299750A4004D4D0B /* UI */ = { + isa = PBXGroup; + children = ( + 3A5AC3092989784A0080323A /* AbsenceModalViewController.swift */, + BF43B57729951F0C0026DCE3 /* ProfileView.swift */, + ); + path = UI; + sourceTree = ""; + }; + 3ABBF743299752EB004D4D0B /* Main */ = { + isa = PBXGroup; + children = ( + E83238F0298506A000DC83C2 /* MainViewController.swift */, + 3ABBF7442997530D004D4D0B /* Cells */, + ); + path = Main; + sourceTree = ""; + }; + 3ABBF7442997530D004D4D0B /* Cells */ = { + isa = PBXGroup; + children = ( + E820792A298A119900B36FC9 /* MainSessionDetailCell.swift */, + E820792C298A137700B36FC9 /* MainSessionTimeCell.swift */, + E820792E298A138500B36FC9 /* MainSessionAbsentCell.swift */, + E8207933298A22D000B36FC9 /* MainSessionInfoCell.swift */, + E8207935298A248100B36FC9 /* MainSessionNoInfoCell.swift */, + 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */, + 3AA713C829884007006F922F /* MainAttendanceDoneCell.swift */, + 3ABBF74729975801004D4D0B /* NotActiveSessionCell.swift */, + ); + path = Cells; + sourceTree = ""; + }; + 3ABBF745299754AA004D4D0B /* UserSide */ = { + isa = PBXGroup; + children = ( + 3ABBF743299752EB004D4D0B /* Main */, + BF9988FA298AD002005723C7 /* PersonalInformation */, + ); + path = UserSide; + sourceTree = ""; + }; + 3ABBF746299754C0004D4D0B /* AdminSide */ = { + isa = PBXGroup; + children = ( + 3ABBF74D29975ED9004D4D0B /* AdminSession */, + BF43B57429951CB90026DCE3 /* MoimManagement */, + BF405C7629972C0700B5889D /* MemberManagement */, + ); + path = AdminSide; + sourceTree = ""; + }; + 3ABBF74D29975ED9004D4D0B /* AdminSession */ = { + isa = PBXGroup; + children = ( + 3ABBF74E29975ED9004D4D0B /* AdminSessionCell.swift */, + 3ABBF74F29975ED9004D4D0B /* AdminSessionTableViewController.swift */, + 3ABBF75029975ED9004D4D0B /* AddSessionViewController.swift */, + ); + path = AdminSession; + sourceTree = ""; + }; BF0408602987B3AA00F1129B /* Authentication */ = { isa = PBXGroup; children = ( @@ -111,21 +190,21 @@ path = Controller; sourceTree = ""; }; - BF43B57429951CB90026DCE3 /* MoimManagement */ = { + BF405C7629972C0700B5889D /* MemberManagement */ = { isa = PBXGroup; children = ( - BF43B57529951EAF0026DCE3 /* MoimManagementController.swift */, - BF43B57929952AFF0026DCE3 /* MoimSettingCell.swift */, + BF405C7729972C4900B5889D /* AddIndividualMemberViewController.swift */, ); - path = MoimManagement; + path = MemberManagement; sourceTree = ""; }; - BF405C7629972C0700B5889D /* MemberManagement */ = { + BF43B57429951CB90026DCE3 /* MoimManagement */ = { isa = PBXGroup; children = ( - BF405C7729972C4900B5889D /* AddIndividualMemberViewController.swift */, + BF43B57529951EAF0026DCE3 /* MoimManagementController.swift */, + BF43B57929952AFF0026DCE3 /* MoimSettingCell.swift */, ); - path = MemberManagement; + path = MoimManagement; sourceTree = ""; }; BF9988FA298AD002005723C7 /* PersonalInformation */ = { @@ -138,23 +217,13 @@ path = PersonalInformation; sourceTree = ""; }; - E8207929298A116700B36FC9 /* MainSession */ = { - isa = PBXGroup; - children = ( - E820792A298A119900B36FC9 /* MainSessionDetailCell.swift */, - E820792C298A137700B36FC9 /* MainSessionTimeCell.swift */, - E820792E298A138500B36FC9 /* MainSessionAbsentCell.swift */, - E8207933298A22D000B36FC9 /* MainSessionInfoCell.swift */, - E8207935298A248100B36FC9 /* MainSessionNoInfoCell.swift */, - ); - path = MainSession; - sourceTree = ""; - }; E8207930298A163400B36FC9 /* Extensions */ = { isa = PBXGroup; children = ( - E8207931298A163400B36FC9 /* UIView+Extension.swift */, + 3A5AC30F29898B330080323A /* UIButton+Extension.swift */, + 3AA713D0298946FF006F922F /* UIColor+Extension.swift */, BFB8431E298CFF9200BA11EC /* UIStackView+Extension.swift */, + E8207931298A163400B36FC9 /* UIView+Extension.swift */, ); path = Extensions; sourceTree = ""; @@ -162,9 +231,6 @@ E8D5C3E42984FC23003D1AD0 = { isa = PBXGroup; children = ( - BF9988FA298AD002005723C7 /* PersonalInformation */, - E8207930298A163400B36FC9 /* Extensions */, - E8207929298A116700B36FC9 /* MainSession */, E8D5C3EF2984FC23003D1AD0 /* momoIOS */, E8D5C3EE2984FC23003D1AD0 /* Products */, ); @@ -181,21 +247,15 @@ E8D5C3EF2984FC23003D1AD0 /* momoIOS */ = { isa = PBXGroup; children = ( - BF43B57429951CB90026DCE3 /* MoimManagement */, - BF405C7629972C0700B5889D /* MemberManagement */, - BF0408602987B3AA00F1129B /* Authentication */, - BF43B57729951F0C0026DCE3 /* ProfileView.swift */, E8D5C3F02984FC23003D1AD0 /* AppDelegate.swift */, E8D5C3F22984FC23003D1AD0 /* SceneDelegate.swift */, E8D5C3F42984FC23003D1AD0 /* ViewController.swift */, - E83238F0298506A000DC83C2 /* MainViewController.swift */, - 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */, - 3AA713C829884007006F922F /* MainAttendanceDoneCell.swift */, - 3A5AC3092989784A0080323A /* AbsenceModalViewController.swift */, - 3A5AC30F29898B330080323A /* UIButton+Extension.swift */, - 3AA713D0298946FF006F922F /* UIColor+Extension.swift */, E8D5C3F92984FC25003D1AD0 /* Assets.xcassets */, E8D5C3FE2984FC25003D1AD0 /* Info.plist */, + 3ABBF73F29975082004D4D0B /* Common */, + BF0408602987B3AA00F1129B /* Authentication */, + 3ABBF746299754C0004D4D0B /* AdminSide */, + 3ABBF745299754AA004D4D0B /* UserSide */, ); path = momoIOS; sourceTree = ""; @@ -308,6 +368,7 @@ E8D5C3F52984FC23003D1AD0 /* ViewController.swift in Sources */, BF405C7829972C4900B5889D /* AddIndividualMemberViewController.swift in Sources */, E8D5C3F12984FC23003D1AD0 /* AppDelegate.swift in Sources */, + 3ABBF75329975EDA004D4D0B /* AddSessionViewController.swift in Sources */, BF04086F2987E70200F1129B /* CheckSecurityCodeController.swift in Sources */, E8D5C3F32984FC23003D1AD0 /* SceneDelegate.swift in Sources */, 3A75FC10298827BE00B36A46 /* MainAttendanceCodeCell.swift in Sources */, @@ -320,8 +381,11 @@ 3A5AC31029898B330080323A /* UIButton+Extension.swift in Sources */, BF43B57829951F0C0026DCE3 /* ProfileView.swift in Sources */, E8207934298A22D000B36FC9 /* MainSessionInfoCell.swift in Sources */, + 3ABBF74829975801004D4D0B /* NotActiveSessionCell.swift in Sources */, + 3ABBF75229975EDA004D4D0B /* AdminSessionTableViewController.swift in Sources */, E8207932298A163400B36FC9 /* UIView+Extension.swift in Sources */, BFB8431F298CFF9200BA11EC /* UIStackView+Extension.swift in Sources */, + 3ABBF75129975EDA004D4D0B /* AdminSessionCell.swift in Sources */, E820792D298A137700B36FC9 /* MainSessionTimeCell.swift in Sources */, E820792B298A119900B36FC9 /* MainSessionDetailCell.swift in Sources */, E8207936298A248200B36FC9 /* MainSessionNoInfoCell.swift in Sources */, diff --git a/momoIOS/AdminSession/AddSessionViewController.swift b/momoIOS/AdminSide/AdminSession/AddSessionViewController.swift similarity index 100% rename from momoIOS/AdminSession/AddSessionViewController.swift rename to momoIOS/AdminSide/AdminSession/AddSessionViewController.swift diff --git a/momoIOS/AdminSession/AdminSessionCell.swift b/momoIOS/AdminSide/AdminSession/AdminSessionCell.swift similarity index 100% rename from momoIOS/AdminSession/AdminSessionCell.swift rename to momoIOS/AdminSide/AdminSession/AdminSessionCell.swift diff --git a/momoIOS/AdminSession/AdminSessionTableViewController.swift b/momoIOS/AdminSide/AdminSession/AdminSessionTableViewController.swift similarity index 100% rename from momoIOS/AdminSession/AdminSessionTableViewController.swift rename to momoIOS/AdminSide/AdminSession/AdminSessionTableViewController.swift diff --git a/momoIOS/MemberManagement/AddIndividualMemberViewController.swift b/momoIOS/AdminSide/MemberManagement/AddIndividualMemberViewController.swift similarity index 100% rename from momoIOS/MemberManagement/AddIndividualMemberViewController.swift rename to momoIOS/AdminSide/MemberManagement/AddIndividualMemberViewController.swift diff --git a/momoIOS/MoimManagement/MoimManagementController.swift b/momoIOS/AdminSide/MoimManagement/MoimManagementController.swift similarity index 100% rename from momoIOS/MoimManagement/MoimManagementController.swift rename to momoIOS/AdminSide/MoimManagement/MoimManagementController.swift diff --git a/momoIOS/MoimManagement/MoimSettingCell.swift b/momoIOS/AdminSide/MoimManagement/MoimSettingCell.swift similarity index 100% rename from momoIOS/MoimManagement/MoimSettingCell.swift rename to momoIOS/AdminSide/MoimManagement/MoimSettingCell.swift diff --git a/momoIOS/UIButton+Extension.swift b/momoIOS/Common/Extensions/UIButton+Extension.swift similarity index 100% rename from momoIOS/UIButton+Extension.swift rename to momoIOS/Common/Extensions/UIButton+Extension.swift diff --git a/momoIOS/UIColor+Extension.swift b/momoIOS/Common/Extensions/UIColor+Extension.swift similarity index 100% rename from momoIOS/UIColor+Extension.swift rename to momoIOS/Common/Extensions/UIColor+Extension.swift diff --git a/Extensions/UIStackView+Extension.swift b/momoIOS/Common/Extensions/UIStackView+Extension.swift similarity index 100% rename from Extensions/UIStackView+Extension.swift rename to momoIOS/Common/Extensions/UIStackView+Extension.swift diff --git a/Extensions/UIView+Extension.swift b/momoIOS/Common/Extensions/UIView+Extension.swift similarity index 100% rename from Extensions/UIView+Extension.swift rename to momoIOS/Common/Extensions/UIView+Extension.swift diff --git a/momoIOS/AbsenceModalViewController.swift b/momoIOS/Common/UI/AbsenceModalViewController.swift similarity index 100% rename from momoIOS/AbsenceModalViewController.swift rename to momoIOS/Common/UI/AbsenceModalViewController.swift diff --git a/momoIOS/ProfileView.swift b/momoIOS/Common/UI/ProfileView.swift similarity index 100% rename from momoIOS/ProfileView.swift rename to momoIOS/Common/UI/ProfileView.swift diff --git a/momoIOS/MainAttendanceCodeCell.swift b/momoIOS/UserSide/Main/Cells/MainAttendanceCodeCell.swift similarity index 100% rename from momoIOS/MainAttendanceCodeCell.swift rename to momoIOS/UserSide/Main/Cells/MainAttendanceCodeCell.swift diff --git a/momoIOS/MainAttendanceDoneCell.swift b/momoIOS/UserSide/Main/Cells/MainAttendanceDoneCell.swift similarity index 100% rename from momoIOS/MainAttendanceDoneCell.swift rename to momoIOS/UserSide/Main/Cells/MainAttendanceDoneCell.swift diff --git a/MainSession/MainSessionAbsentCell.swift b/momoIOS/UserSide/Main/Cells/MainSessionAbsentCell.swift similarity index 100% rename from MainSession/MainSessionAbsentCell.swift rename to momoIOS/UserSide/Main/Cells/MainSessionAbsentCell.swift diff --git a/MainSession/MainSessionDetailCell.swift b/momoIOS/UserSide/Main/Cells/MainSessionDetailCell.swift similarity index 100% rename from MainSession/MainSessionDetailCell.swift rename to momoIOS/UserSide/Main/Cells/MainSessionDetailCell.swift diff --git a/MainSession/MainSessionInfoCell.swift b/momoIOS/UserSide/Main/Cells/MainSessionInfoCell.swift similarity index 100% rename from MainSession/MainSessionInfoCell.swift rename to momoIOS/UserSide/Main/Cells/MainSessionInfoCell.swift diff --git a/MainSession/MainSessionNoInfoCell.swift b/momoIOS/UserSide/Main/Cells/MainSessionNoInfoCell.swift similarity index 100% rename from MainSession/MainSessionNoInfoCell.swift rename to momoIOS/UserSide/Main/Cells/MainSessionNoInfoCell.swift diff --git a/MainSession/MainSessionTimeCell.swift b/momoIOS/UserSide/Main/Cells/MainSessionTimeCell.swift similarity index 100% rename from MainSession/MainSessionTimeCell.swift rename to momoIOS/UserSide/Main/Cells/MainSessionTimeCell.swift diff --git a/momoIOS/NotActiveSessionCell.swift b/momoIOS/UserSide/Main/Cells/NotActiveSessionCell.swift similarity index 100% rename from momoIOS/NotActiveSessionCell.swift rename to momoIOS/UserSide/Main/Cells/NotActiveSessionCell.swift diff --git a/momoIOS/MainViewController.swift b/momoIOS/UserSide/Main/MainViewController.swift similarity index 100% rename from momoIOS/MainViewController.swift rename to momoIOS/UserSide/Main/MainViewController.swift diff --git a/PersonalInformation/AttendanceHistoryCell.swift b/momoIOS/UserSide/PersonalInformation/AttendanceHistoryCell.swift similarity index 100% rename from PersonalInformation/AttendanceHistoryCell.swift rename to momoIOS/UserSide/PersonalInformation/AttendanceHistoryCell.swift diff --git a/PersonalInformation/AttendanceResultCell.swift b/momoIOS/UserSide/PersonalInformation/AttendanceResultCell.swift similarity index 100% rename from PersonalInformation/AttendanceResultCell.swift rename to momoIOS/UserSide/PersonalInformation/AttendanceResultCell.swift diff --git a/PersonalInformation/PersonalInformationController.swift b/momoIOS/UserSide/PersonalInformation/PersonalInformationController.swift similarity index 100% rename from PersonalInformation/PersonalInformationController.swift rename to momoIOS/UserSide/PersonalInformation/PersonalInformationController.swift