develop -> main

GRAMO/GRAMO.xcodeproj/xcuserdata/jangseoyoung.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>GRAMO.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

GRAMO/GRAMO.xcworkspace/xcuserdata/jangseoyoung.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -30,8 +30,8 @@
             filePath = "GRAMO/VC/info/InfoListViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "125"
-            endingLineNumber = "125"
+            startingLineNumber = "97"
+            endingLineNumber = "97"
             landmarkName = "secondGetList()"
             landmarkType = "7">
          </BreakpointContent>

GRAMO/GRAMO/VC/SideMenu/SideMenuNavigationController.swift

@@ -8,28 +8,13 @@
 import UIKit
 import SideMenu
 
-class SideMenuNav: SideMenuNavigationController {
+final class SideMenuNav: SideMenuNavigationController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         self.presentationStyle = .menuSlideIn
         self.leftSide = true
         self.menuWidth = self.view.frame.width * 0.45
-        // Do any additional setup after loading the view.
     }
-
-
-
-
-    /*
-     // MARK: - Navigation
-
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
-
 }

GRAMO/GRAMO/VC/SideMenu/SideMenuViewController.swift

@@ -7,10 +7,10 @@
 
 import UIKit
 
-class SideMenuViewController: UIViewController {
+final class SideMenuViewController: UIViewController {
 
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var majorLabel: UILabel!
+    @IBOutlet weak private var nameLabel: UILabel!
+    @IBOutlet weak private var majorLabel: UILabel!
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -39,48 +39,40 @@ class SideMenuViewController: UIViewController {
     }
 
     @IBAction func logOut(_ sender: UIButton){
-        let alert = UIAlertController(title: "로그아웃 하시겠습니까?", message: nil, preferredStyle: .alert)
-        let cancelAction = UIAlertAction(title: "아니오", style: .cancel, handler: nil)
-        let deleteAction = UIAlertAction(title: "예", style: .destructive){ (action) in
-            self.logout() }
-
-        alert.addAction(cancelAction)
-        alert.addAction(deleteAction)
-
-        self.present(alert, animated: true, completion: nil)
+        showDeleteAlert(title: "로그아웃 하시겠습니까?", action: { [self](action) in logout() }, message: nil)
     }
 
     @IBAction func withdrawal(_ sender: UIButton){
         HTTPClient().delete(url: AuthAPI.withDrawel.path(), params: nil, header: Header.token.header()).responseJSON(completionHandler: { res in
             switch res.response?.statusCode {
-            case 204 : print("OK")
+            case 204 :
                 let sub = UIStoryboard(name: "Auth", bundle: nil)
                 let calendar = sub.instantiateViewController(withIdentifier: "LoginVC")
                 self.navigationController?.pushViewController(calendar, animated: false)
 
             case 401: print("401 - could not find token user")
-                self.showAlert(title: "허가되지 않은 요청입니다.")
+                self.showAlert(title: "허가되지 않은 요청입니다.",message: nil)
 
             default:
                 print(res.response?.statusCode ?? "default")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             }
         })
     }
 
     func logout() {
         HTTPClient().delete(url: AuthAPI.logout.path(), params: nil, header: Header.token.header()).responseJSON(completionHandler: { res in
             switch res.response?.statusCode {
-            case 204 : print("OK")
+            case 204 :
                 let sub = UIStoryboard(name: "Auth", bundle: nil)
                 let calendar = sub.instantiateViewController(withIdentifier: "LoginVC")
                 self.navigationController?.pushViewController(calendar, animated: false)
 
             case 401: print("401 - could not find token user")
-                self.showAlert(title: "허가되지 않은 요청입니다.")
+                self.showAlert(title: "허가되지 않은 요청입니다.", message: nil)
             default:
                 print(res.response?.statusCode ?? "default")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             }
         })
     }

GRAMO/GRAMO/VC/UIextiention.swift

@@ -47,11 +47,20 @@ extension UIViewController {
         bar.backgroundColor = UIColor.clear
     }
 
-    func showAlert(title : String) {
-        let alert = UIAlertController(title: title, message: nil, preferredStyle: UIAlertController.Style.alert)
+    func showAlert(title : String, message: String?) {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.Style.alert)
         let cancelAction = UIAlertAction(title: "확인", style: .cancel, handler: nil)
         alert.addAction(cancelAction)
         self.present(alert, animated: true, completion: nil)
     }
 
+    func showDeleteAlert(title: String, action: ((UIAlertAction) -> Void)?, message: String?) {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.Style.alert)
+        let cancelAction = UIAlertAction(title: "아니오", style: .cancel, handler: nil)
+        let deleteAction = UIAlertAction(title: "예", style: .destructive, handler: action)
+        alert.addAction(cancelAction)
+        alert.addAction(deleteAction)
+        self.present(alert, animated: true, completion: nil)
+    }
+
 }

GRAMO/GRAMO/VC/homework/HomeworkAddViewController.swift

@@ -9,15 +9,15 @@ import UIKit
 import DropDown
 import Alamofire
 
-class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFieldDelegate {
+final class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFieldDelegate {
 
-    @IBOutlet weak var dateLabel: UILabel!
-    @IBOutlet weak var selectMajorButton: UIButton!
-    @IBOutlet weak var deadLinetTextField: UITextField!
-    @IBOutlet weak var allocatorButton: UIButton!
-    @IBOutlet weak var titleTextField: UITextField!
-    @IBOutlet weak var detailTextView: UITextView!
-    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet weak private var dateLabel: UILabel!
+    @IBOutlet weak private var selectMajorButton: UIButton!
+    @IBOutlet weak private var deadLinetTextField: UITextField!
+    @IBOutlet weak private var allocatorButton: UIButton!
+    @IBOutlet weak private var titleTextField: UITextField!
+    @IBOutlet weak private var detailTextView: UITextView!
+    @IBOutlet weak private var nameLabel: UILabel!
 
     let datePicker = UIDatePicker()
 
@@ -57,8 +57,6 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
         setNavigationBar()
 
         NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_ :)), name: UITextField.textDidChangeNotification, object: titleTextField)
-
-        // Do any additional setup after loading the view.
     }
 
     @IBAction func cancelButton(_ sender: UIBarButtonItem){
@@ -67,10 +65,7 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
 
     @IBAction func addButton(_ sender: UIBarButtonItem) {
         if titleTextField.textColor == UIColor.lightGray || detailTextView.textColor == UIColor.lightGray {
-            let alert = UIAlertController(title: "제목 또는 내용을 입력해주세요.", message: nil, preferredStyle: UIAlertController.Style.alert)
-            let cancelAction = UIAlertAction(title: "확인", style: .cancel, handler: nil)
-            alert.addAction(cancelAction)
-            self.present(alert, animated: true, completion: nil)
+            showAlert(title: "제목 또는 내용을 입력해주세요.", message: nil)
         }
         addHomework(major: requestMajor, endDate: requestDate, studentEmail: studentEmail, description: detailTextView.text!, title: titleTextField.text!)
     }
@@ -94,12 +89,10 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
             case "서버" : requestMajor = "BACKEND"
             case "디자인" : requestMajor = "DESIGN"
             default:
-                print("TTI YONG")
+                print("error")
             }
         }
-
         dropdown.anchorView = selectMajorButton
-
     }
 
     @IBAction func selectAllocator(_ sender: UIButton){
@@ -130,20 +123,34 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
                         allocatorButton.setTitle("\(item)", for: .normal)
                         self.studentEmail = model.userInfoResponses[index].email
                     }
-
                     dropDown.anchorView = allocatorButton
-
                 }
                 catch {
                     print(error)
                 }
             case 401 : print("401 - Unauthorized")
+                self.showAlert(title: "허가되지 않은 요청입니다.",message: nil)
             default : print(res.response?.statusCode ?? "default")
             }
         }
-
-
     }
+
+    func addHomework(major: String, endDate: String, studentEmail: String, description: String, title: String) {
+        httpclient.post(url: HomeworkAPI.createHomework.path(), params: ["major":major, "endDate":endDate, "studentEmail":studentEmail, "description":description, "title":title], header: Header.token.header()).responseJSON{(res) in
+            switch res.response?.statusCode{
+            case 201 :
+                self.navigationController?.popViewController(animated: true)
+
+            case 400 : print("400 - BAD REQUEST")
+                self.showAlert(title: "잘못된 요청입니다.", message: nil)
+            case 404 : print("404 - NOT FOUND createHw")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
+            default : print(res.response?.statusCode ?? "default")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
+            }
+        }
+    }
+
     func placeholderSetting() {
         detailTextView.delegate = self
         detailTextView.text = "내용을 입력하세요"
@@ -202,29 +209,6 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
         self.view.endEditing(true)
     }
 
-
-    func addHomework(major: String, endDate: String, studentEmail: String, description: String, title: String) {
-        httpclient.post(url: HomeworkAPI.createHomework.path(), params: ["major":major, "endDate":endDate, "studentEmail":studentEmail, "description":description, "title":title], header: Header.token.header()).responseJSON{(res) in
-            switch res.response?.statusCode{
-            case 201 :
-                do{
-                    print(res.response?.statusCode ?? "default")
-                    self.navigationController?.popViewController(animated: true)
-                }
-                catch {
-                    print("error: \(error)")
-                }
-            case 400 : print("400 - BAD REQUEST")
-                self.showAlert(title: "잘못된 요청입니다.")
-            case 404 : print("404 - NOT FOUND createHw")
-                self.showAlert(title: "오류가 발생했습니다.")
-            default : print(res.response?.statusCode ?? "default")
-                self.showAlert(title: "오류가 발생했습니다.")
-            }
-        }
-    }
-
-
     func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
         let currentText = textView.text ?? ""
         guard let stringRange = Range(range, in: currentText) else { return false }
@@ -250,16 +234,4 @@ class HomeworkAddViewController: UIViewController, UITextViewDelegate, UITextFie
             }
         }
     }
-
-
-    /*
-     // MARK: - Navigation
-
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
-
 }

GRAMO/GRAMO/VC/homework/HomeworkAssignedViewController.swift

@@ -7,15 +7,15 @@
 
 import UIKit
 
-class HomeworkAssignedViewController: UIViewController {
+final class HomeworkAssignedViewController: UIViewController {
 
-    @IBOutlet weak var nameLabel: UILabel!
-    @IBOutlet weak var dateLabel: UILabel!
-    @IBOutlet weak var majorButton: UIButton!
-    @IBOutlet weak var selectDeadLineTextField: UITextField!
-    @IBOutlet weak var titleTextField: UITextField!
-    @IBOutlet weak var contentTextView: UITextView!
-    @IBOutlet weak var submitButton: UIButton!
+    @IBOutlet weak private var nameLabel: UILabel!
+    @IBOutlet weak private var dateLabel: UILabel!
+    @IBOutlet weak private var majorButton: UIButton!
+    @IBOutlet weak private var selectDeadLineTextField: UITextField!
+    @IBOutlet weak private var titleTextField: UITextField!
+    @IBOutlet weak private var contentTextView: UITextView!
+    @IBOutlet weak private var submitButton: UIButton!
 
     var httpClient = HTTPClient()
     var model : [HwContent] = [HwContent]()
@@ -25,7 +25,6 @@ class HomeworkAssignedViewController: UIViewController {
         super.viewDidLoad()
         setNavigationBar()
         getContent(id: id)
-        // Do any additional setup after loading the view.
     }
 
     @IBAction func backButton1(_ sender: UIBarButtonItem){
@@ -42,32 +41,32 @@ class HomeworkAssignedViewController: UIViewController {
     }
 
     func getContent(id: Int) {
-        httpClient.get(url: HomeworkAPI.getHomeworkContent(id).path(), params: nil, header: Header.token.header()).responseJSON {(res) in
+        httpClient.get(url: HomeworkAPI.getHomeworkContent(id).path(), params: nil, header: Header.token.header()).responseJSON { [self](res) in
             switch res.response?.statusCode {
             case 200 :
                 do{
                     let data = res.data
                     let model = try JSONDecoder().decode(HwContent.self, from: data!)
 
-                    self.selectDeadLineTextField.text = self.formatEndDate(model.endDate)
-                    self.dateLabel.text = self.formatStartDate(model.startDate)
-                    self.nameLabel.text = model.teacherName
-                    self.majorButton.setTitle(self.setMajor(model.major), for: .normal)
-                    self.titleTextField.text = model.title
-                    self.contentTextView.text = model.description
+                    selectDeadLineTextField.text = formatEndDate(model.endDate)
+                    dateLabel.text = formatStartDate(model.startDate)
+                    nameLabel.text = model.teacherName
+                    majorButton.setTitle(setMajor(model.major), for: .normal)
+                    titleTextField.text = model.title
+                    contentTextView.text = model.description
                 }
                 catch{
                     print("error: \(error)")
                 }
 
             case 400 : print("400 - BAD REQUEST")
-                self.showAlert(title: "잘못된 요청입니다.")
+                self.showAlert(title: "잘못된 요청입니다.", message: nil)
             case 401 : print("401 - Unauthorized")
-                self.showAlert(title: "허가되지 않았습니다.")
+                self.showAlert(title: "허가되지 않았습니다.", message: nil)
             case 404 : print("404 - NOT FOUND")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             default : print(res.response?.statusCode ?? "default")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             }
         }
 
@@ -79,26 +78,14 @@ class HomeworkAssignedViewController: UIViewController {
             case 201 :
                 self.navigationController?.popViewController(animated: true)
             case 400 : print("400 - BAD REQUEST")
-                self.showAlert(title: "잘못된 요청입니다.")
+                self.showAlert(title: "잘못된 요청입니다.", message: nil)
             case 401 : print("401 - Unauthorized")
-                self.showAlert(title: "허가되지 않았습니다.")
+                self.showAlert(title: "허가되지 않았습니다.", message: nil)
             case 404 : print("404 - NOT FOUND")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             default : print(res.response?.statusCode ?? "default")
-                self.showAlert(title: "오류가 발생했습니다.")
+                self.showAlert(title: "오류가 발생했습니다.", message: nil)
             }
         }
     }
-
-
-    /*
-     // MARK: - Navigation
-
-     // In a storyboard-based application, you will often want to do a little preparation before navigation
-     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-     // Get the new view controller using segue.destination.
-     // Pass the selected object to the new view controller.
-     }
-     */
-
 }