From 6b0e78c9821d102dbfc99a671daee185711e9cd0 Mon Sep 17 00:00:00 2001 From: lena Date: Thu, 10 Jun 2021 11:36:43 +0900 Subject: [PATCH] chore: :wrench: clean up directory --- .../issue-tracker.xcodeproj/project.pbxproj | 54 ++++++++++++------- .../AddViewController.swift | 0 .../LabelViewController.swift | 0 .../LoginViewController.swift | 0 .../MilestoneViewController.swift | 0 .../issue-tracker/Model/Endpoint.swift | 25 --------- .../OAuthManager.swift} | 2 +- .../View/{ => Label}/AddButton.swift | 0 .../{ => Label}/LabelTabelHeaderView.swift | 0 .../{ => View/Label}/LabelTableViewCell.swift | 0 .../View/{ => Label}/PaddingLabel.swift | 0 .../{ => View}/Milestone/InputView.swift | 0 .../Milestone/MilestoneTableViewCell.swift | 0 13 files changed, 36 insertions(+), 45 deletions(-) rename iOS/issue-tracker/issue-tracker/{Milestone => Controller}/AddViewController.swift (100%) rename iOS/issue-tracker/issue-tracker/{View => Controller}/LabelViewController.swift (100%) rename iOS/issue-tracker/issue-tracker/{ => Controller}/LoginViewController.swift (100%) rename iOS/issue-tracker/issue-tracker/{Milestone => Controller}/MilestoneViewController.swift (100%) rename iOS/issue-tracker/issue-tracker/{AuthManager.swift => Model/OAuthManager.swift} (98%) rename iOS/issue-tracker/issue-tracker/View/{ => Label}/AddButton.swift (100%) rename iOS/issue-tracker/issue-tracker/View/{ => Label}/LabelTabelHeaderView.swift (100%) rename iOS/issue-tracker/issue-tracker/{ => View/Label}/LabelTableViewCell.swift (100%) rename iOS/issue-tracker/issue-tracker/View/{ => Label}/PaddingLabel.swift (100%) rename iOS/issue-tracker/issue-tracker/{ => View}/Milestone/InputView.swift (100%) rename iOS/issue-tracker/issue-tracker/{ => View}/Milestone/MilestoneTableViewCell.swift (100%) diff --git a/iOS/issue-tracker/issue-tracker.xcodeproj/project.pbxproj b/iOS/issue-tracker/issue-tracker.xcodeproj/project.pbxproj index 2a55fd814..ce7315c6e 100644 --- a/iOS/issue-tracker/issue-tracker.xcodeproj/project.pbxproj +++ b/iOS/issue-tracker/issue-tracker.xcodeproj/project.pbxproj @@ -22,7 +22,6 @@ B3B559F8266E096000901C55 /* issue_trackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3B559F7266E096000901C55 /* issue_trackerTests.swift */; }; B3B55A03266E096000901C55 /* issue_trackerUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3B55A02266E096000901C55 /* issue_trackerUITests.swift */; }; B3F527512670968F002B0812 /* LabelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F527502670968F002B0812 /* LabelViewController.swift */; }; - B3F52753267096EC002B0812 /* LabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F52752267096EC002B0812 /* LabelTableViewCell.swift */; }; B3F527552670A0CD002B0812 /* UIColor+HexInit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F527542670A0CD002B0812 /* UIColor+HexInit.swift */; }; B3F527582670A3F3002B0812 /* LabelTabelHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F527572670A3F3002B0812 /* LabelTabelHeaderView.swift */; }; B3F5275A2670A4BD002B0812 /* AddButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F527592670A4BD002B0812 /* AddButton.swift */; }; @@ -33,12 +32,13 @@ D0ADB6D1266F4F3D00E0762C /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = D0ADB6D0266F4F3D00E0762C /* RxCocoa */; }; D0ADB6D5266F4F3D00E0762C /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = D0ADB6D4266F4F3D00E0762C /* RxSwift */; }; D0ADB6D7266F4F4700E0762C /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = D0ADB6D6266F4F4700E0762C /* SnapKit */; }; - D0ADB6F8266F5BBE00E0762C /* AuthManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0ADB6F7266F5BBE00E0762C /* AuthManager.swift */; }; + D0ADB6F8266F5BBE00E0762C /* OAuthManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0ADB6F7266F5BBE00E0762C /* OAuthManager.swift */; }; D0FD509E26708DDE008C6031 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3B559E4266E095E00901C55 /* LoginViewController.swift */; }; D0FD50AA267096C0008C6031 /* MilestoneViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FD50A9267096C0008C6031 /* MilestoneViewController.swift */; }; D0FD50BB26709F8B008C6031 /* MilestoneTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FD50BA26709F8B008C6031 /* MilestoneTableViewCell.swift */; }; D0FD50D4267192AF008C6031 /* AddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FD50D3267192AF008C6031 /* AddViewController.swift */; }; D0FD50DC2671AA04008C6031 /* InputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FD50DB2671AA04008C6031 /* InputView.swift */; }; + D0FD50F72671B156008C6031 /* LabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FD50F62671B156008C6031 /* LabelTableViewCell.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -83,8 +83,7 @@ B3B559FE266E096000901C55 /* issue-trackerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "issue-trackerUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; B3B55A02266E096000901C55 /* issue_trackerUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = issue_trackerUITests.swift; sourceTree = ""; }; B3B55A04266E096000901C55 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B3F527502670968F002B0812 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LabelViewController.swift; path = View/LabelViewController.swift; sourceTree = ""; }; - B3F52752267096EC002B0812 /* LabelTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LabelTableViewCell.swift; path = "issue-tracker/LabelTableViewCell.swift"; sourceTree = SOURCE_ROOT; }; + B3F527502670968F002B0812 /* LabelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelViewController.swift; sourceTree = ""; }; B3F527542670A0CD002B0812 /* UIColor+HexInit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+HexInit.swift"; sourceTree = ""; }; B3F527572670A3F3002B0812 /* LabelTabelHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LabelTabelHeaderView.swift; sourceTree = ""; }; B3F527592670A4BD002B0812 /* AddButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddButton.swift; sourceTree = ""; }; @@ -92,11 +91,12 @@ CCF0F131FB8BE0BC0EF7FE4E /* Pods-issue-tracker.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-issue-tracker.release.xcconfig"; path = "Target Support Files/Pods-issue-tracker/Pods-issue-tracker.release.xcconfig"; sourceTree = ""; }; D0ADB693266F0A5000E0762C /* Endpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = ""; }; D0ADB698266F0C1300E0762C /* NetworkManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkManager.swift; sourceTree = ""; }; - D0ADB6F7266F5BBE00E0762C /* AuthManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthManager.swift; sourceTree = ""; }; + D0ADB6F7266F5BBE00E0762C /* OAuthManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuthManager.swift; sourceTree = ""; }; D0FD50A9267096C0008C6031 /* MilestoneViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MilestoneViewController.swift; sourceTree = ""; }; D0FD50BA26709F8B008C6031 /* MilestoneTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MilestoneTableViewCell.swift; sourceTree = ""; }; D0FD50D3267192AF008C6031 /* AddViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddViewController.swift; sourceTree = ""; }; D0FD50DB2671AA04008C6031 /* InputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputView.swift; sourceTree = ""; }; + D0FD50F62671B156008C6031 /* LabelTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LabelTableViewCell.swift; sourceTree = ""; }; E7F242466FC866CAD16EFF69 /* Pods-issue-tracker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-issue-tracker.debug.xcconfig"; path = "Target Support Files/Pods-issue-tracker/Pods-issue-tracker.debug.xcconfig"; sourceTree = ""; }; F0166F39C919837292E32AEF /* Pods_issue_tracker_issue_trackerUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_issue_tracker_issue_trackerUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -136,10 +136,8 @@ 49903DAC266F558700D2A6DD /* View */ = { isa = PBXGroup; children = ( - B3F52752267096EC002B0812 /* LabelTableViewCell.swift */, - B3F527572670A3F3002B0812 /* LabelTabelHeaderView.swift */, - B3F527592670A4BD002B0812 /* AddButton.swift */, - B3F5275B2670C0EF002B0812 /* PaddingLabel.swift */, + D0FD50F12671B108008C6031 /* Label */, + D0FD50ED2671B0E8008C6031 /* Milestone */, B3F5274F26709614002B0812 /* Login */, ); path = View; @@ -170,16 +168,13 @@ B3B559DF266E095E00901C55 /* issue-tracker */ = { isa = PBXGroup; children = ( + B3B559EE266E096000901C55 /* Info.plist */, + B3B559E6266E095E00901C55 /* Main.storyboard */, D0ADB68F266F0A2200E0762C /* Supporting Files */, - B3B559E4266E095E00901C55 /* LoginViewController.swift */, - B3F527502670968F002B0812 /* LabelViewController.swift */, + D0FD50E92671B0AD008C6031 /* Controller */, B3F527562670A0D5002B0812 /* Extension */, 49903DAC266F558700D2A6DD /* View */, - B3B559E6266E095E00901C55 /* Main.storyboard */, - B3B559EE266E096000901C55 /* Info.plist */, D0ADB69D266F0E7900E0762C /* Model */, - D0ADB6F7266F5BBE00E0762C /* AuthManager.swift */, - D0FD50B126709E19008C6031 /* Milestone */, ); path = "issue-tracker"; sourceTree = ""; @@ -237,21 +232,42 @@ children = ( D0ADB693266F0A5000E0762C /* Endpoint.swift */, D0ADB698266F0C1300E0762C /* NetworkManager.swift */, + D0ADB6F7266F5BBE00E0762C /* OAuthManager.swift */, ); path = Model; sourceTree = ""; }; - D0FD50B126709E19008C6031 /* Milestone */ = { + D0FD50E92671B0AD008C6031 /* Controller */ = { isa = PBXGroup; children = ( + B3B559E4266E095E00901C55 /* LoginViewController.swift */, + B3F527502670968F002B0812 /* LabelViewController.swift */, D0FD50A9267096C0008C6031 /* MilestoneViewController.swift */, + D0FD50D3267192AF008C6031 /* AddViewController.swift */, + ); + path = Controller; + sourceTree = ""; + }; + D0FD50ED2671B0E8008C6031 /* Milestone */ = { + isa = PBXGroup; + children = ( D0FD50BA26709F8B008C6031 /* MilestoneTableViewCell.swift */, D0FD50DB2671AA04008C6031 /* InputView.swift */, - D0FD50D3267192AF008C6031 /* AddViewController.swift */, ); path = Milestone; sourceTree = ""; }; + D0FD50F12671B108008C6031 /* Label */ = { + isa = PBXGroup; + children = ( + D0FD50F62671B156008C6031 /* LabelTableViewCell.swift */, + B3F527572670A3F3002B0812 /* LabelTabelHeaderView.swift */, + B3F527592670A4BD002B0812 /* AddButton.swift */, + B3F5275B2670C0EF002B0812 /* PaddingLabel.swift */, + ); + path = Label; + sourceTree = ""; + }; DD720597B58AE4F3E0B9F4F7 /* Pods */ = { isa = PBXGroup; children = ( @@ -490,17 +506,17 @@ files = ( B3F527512670968F002B0812 /* LabelViewController.swift in Sources */, D0FD509E26708DDE008C6031 /* LoginViewController.swift in Sources */, - B3F52753267096EC002B0812 /* LabelTableViewCell.swift in Sources */, B3F5275A2670A4BD002B0812 /* AddButton.swift in Sources */, B3F5275C2670C0EF002B0812 /* PaddingLabel.swift in Sources */, D0FD50DC2671AA04008C6031 /* InputView.swift in Sources */, 49903DAB266F558300D2A6DD /* LoginView.swift in Sources */, + D0FD50F72671B156008C6031 /* LabelTableViewCell.swift in Sources */, D0FD50D4267192AF008C6031 /* AddViewController.swift in Sources */, 49903DAE266F588B00D2A6DD /* IDPasswordTextField.swift in Sources */, B349997D266F8D0B0091A44A /* GitHubLoginButton.swift in Sources */, B3F527552670A0CD002B0812 /* UIColor+HexInit.swift in Sources */, B349997F266F90710091A44A /* AppleLoginButton.swift in Sources */, - D0ADB6F8266F5BBE00E0762C /* AuthManager.swift in Sources */, + D0ADB6F8266F5BBE00E0762C /* OAuthManager.swift in Sources */, B3B559E1266E095E00901C55 /* AppDelegate.swift in Sources */, D0ADB699266F0C1300E0762C /* NetworkManager.swift in Sources */, B3F527582670A3F3002B0812 /* LabelTabelHeaderView.swift in Sources */, diff --git a/iOS/issue-tracker/issue-tracker/Milestone/AddViewController.swift b/iOS/issue-tracker/issue-tracker/Controller/AddViewController.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/Milestone/AddViewController.swift rename to iOS/issue-tracker/issue-tracker/Controller/AddViewController.swift diff --git a/iOS/issue-tracker/issue-tracker/View/LabelViewController.swift b/iOS/issue-tracker/issue-tracker/Controller/LabelViewController.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/View/LabelViewController.swift rename to iOS/issue-tracker/issue-tracker/Controller/LabelViewController.swift diff --git a/iOS/issue-tracker/issue-tracker/LoginViewController.swift b/iOS/issue-tracker/issue-tracker/Controller/LoginViewController.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/LoginViewController.swift rename to iOS/issue-tracker/issue-tracker/Controller/LoginViewController.swift diff --git a/iOS/issue-tracker/issue-tracker/Milestone/MilestoneViewController.swift b/iOS/issue-tracker/issue-tracker/Controller/MilestoneViewController.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/Milestone/MilestoneViewController.swift rename to iOS/issue-tracker/issue-tracker/Controller/MilestoneViewController.swift diff --git a/iOS/issue-tracker/issue-tracker/Model/Endpoint.swift b/iOS/issue-tracker/issue-tracker/Model/Endpoint.swift index 83b0018cc..76599bccc 100644 --- a/iOS/issue-tracker/issue-tracker/Model/Endpoint.swift +++ b/iOS/issue-tracker/issue-tracker/Model/Endpoint.swift @@ -7,31 +7,6 @@ import Foundation -//struct Endpoint { -// static let scheme: String = "https" -// static let host: String = "" -// static let port: Int = 8080 -// //static let path: String = "" -// -// static func url(path: String, queryItems: [URLQueryItem] = []) -> URL? { -// var urlComponents = URLComponents() -// urlComponents.scheme = scheme -// urlComponents.host = host -// urlComponents.port = port -// urlComponents.path = path -// urlComponents.queryItems = queryItems -// return urlComponents.url -// } -// -// enum Path: String { -// case login = "/login" -// -// var pathString: String { -// return self.rawValue -// } -// } -//} - struct Endpoint { let scheme: String = "https" let host: String = "" diff --git a/iOS/issue-tracker/issue-tracker/AuthManager.swift b/iOS/issue-tracker/issue-tracker/Model/OAuthManager.swift similarity index 98% rename from iOS/issue-tracker/issue-tracker/AuthManager.swift rename to iOS/issue-tracker/issue-tracker/Model/OAuthManager.swift index 5cb219415..accb90fc4 100644 --- a/iOS/issue-tracker/issue-tracker/AuthManager.swift +++ b/iOS/issue-tracker/issue-tracker/Model/OAuthManager.swift @@ -8,7 +8,7 @@ import Foundation import AuthenticationServices -class AuthManager { +class OAuthManager { private let cliendId = "" private lazy var authURL = URL(string: "https://github.com/login/oauth/authorize?client_id=\(cliendId)&scope=user:email")! private let callbackUrlScheme = "issueTracker" diff --git a/iOS/issue-tracker/issue-tracker/View/AddButton.swift b/iOS/issue-tracker/issue-tracker/View/Label/AddButton.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/View/AddButton.swift rename to iOS/issue-tracker/issue-tracker/View/Label/AddButton.swift diff --git a/iOS/issue-tracker/issue-tracker/View/LabelTabelHeaderView.swift b/iOS/issue-tracker/issue-tracker/View/Label/LabelTabelHeaderView.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/View/LabelTabelHeaderView.swift rename to iOS/issue-tracker/issue-tracker/View/Label/LabelTabelHeaderView.swift diff --git a/iOS/issue-tracker/issue-tracker/LabelTableViewCell.swift b/iOS/issue-tracker/issue-tracker/View/Label/LabelTableViewCell.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/LabelTableViewCell.swift rename to iOS/issue-tracker/issue-tracker/View/Label/LabelTableViewCell.swift diff --git a/iOS/issue-tracker/issue-tracker/View/PaddingLabel.swift b/iOS/issue-tracker/issue-tracker/View/Label/PaddingLabel.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/View/PaddingLabel.swift rename to iOS/issue-tracker/issue-tracker/View/Label/PaddingLabel.swift diff --git a/iOS/issue-tracker/issue-tracker/Milestone/InputView.swift b/iOS/issue-tracker/issue-tracker/View/Milestone/InputView.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/Milestone/InputView.swift rename to iOS/issue-tracker/issue-tracker/View/Milestone/InputView.swift diff --git a/iOS/issue-tracker/issue-tracker/Milestone/MilestoneTableViewCell.swift b/iOS/issue-tracker/issue-tracker/View/Milestone/MilestoneTableViewCell.swift similarity index 100% rename from iOS/issue-tracker/issue-tracker/Milestone/MilestoneTableViewCell.swift rename to iOS/issue-tracker/issue-tracker/View/Milestone/MilestoneTableViewCell.swift