From 589876bb36cc77d40eb84b811675d11d2dbf3b86 Mon Sep 17 00:00:00 2001
From: Enayatullah Naseri <enayatullahna@gmail.com>
Date: Mon, 6 Jan 2020 20:21:08 -0800
Subject: [PATCH 1/2] Added signout code for firebase, and a simple alert for
 public to sign up.

---
 .../PrivateJokesTableViewController.swift           | 10 +++++++++-
 .../PublicJokesTableViewController.swift            | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift b/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift
index 446c06e..2d603c7 100644
--- a/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift	
+++ b/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift	
@@ -8,6 +8,7 @@
 
 import UIKit
 import CoreData
+import Firebase
 
 class PrivateJokesTableViewController: UITableViewController {
     
@@ -39,8 +40,15 @@ class PrivateJokesTableViewController: UITableViewController {
         tableView.reloadData()
     }
     
+    // Sign out firebase
     @IBAction func signOutTapped(_ sender: Any) {
-        self.navigationController?.popToRootViewController(animated: true)
+        let firebaseAuth = Auth.auth()
+        do {
+          try firebaseAuth.signOut()
+          self.navigationController?.popToRootViewController(animated: true)
+        } catch let signOutError as NSError {
+          print ("Error signing out: %@", signOutError)
+        }
     }
     
     // MARK: - Table view data source
diff --git a/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift b/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift
index 6ab711d..442e3fa 100644
--- a/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift	
+++ b/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift	
@@ -14,12 +14,23 @@ class PublicJokesTableViewController: UITableViewController {
         super.viewDidLoad()
     }
     
+    // alert 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        
+        let alert = UIAlertController(title: "Sign up Alert!", message: "To view more or add dad jokes please sign up, under private tab.", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Default action"), style: .default, handler: { _ in
+        NSLog("The \"OK\" alert occured.")
+        }))
+        self.present(alert, animated: true, completion: nil)
     }
 
     // MARK: - Table view data source
-
+// Creating an alert to sign up
+//    func createAlert(title: String, message: String) {
+//        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.alert)
+//
+//    }
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return 0
     }

From 010222befe22449014a474021a9d9323a5c71337 Mon Sep 17 00:00:00 2001
From: Enayatullah Naseri <enayatullahna@gmail.com>
Date: Thu, 9 Jan 2020 19:16:11 -0800
Subject: [PATCH 2/2] Added custom alert and updated sign out error

---
 DadJokes/DadJokes/Base.lproj/Main.storyboard  |  5 +---
 .../DadJokes/Helpers/DJErrorMessage.swift     |  5 ++++
 .../PrivateJokesTableViewController.swift     |  4 +--
 .../PublicJokesTableViewController.swift      | 25 +++++++++++--------
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/DadJokes/DadJokes/Base.lproj/Main.storyboard b/DadJokes/DadJokes/Base.lproj/Main.storyboard
index 1ec411b..4526a45 100644
--- a/DadJokes/DadJokes/Base.lproj/Main.storyboard
+++ b/DadJokes/DadJokes/Base.lproj/Main.storyboard
@@ -280,9 +280,6 @@
                                         </label>
                                     </subviews>
                                 </tableViewCellContentView>
-                                <connections>
-                                    <segue destination="CIX-hh-4eC" kind="show" id="idT-nb-BtE"/>
-                                </connections>
                             </tableViewCell>
                         </prototypes>
                         <connections>
@@ -305,7 +302,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="z9y-IH-k5P">
-                                <rect key="frame" x="16" y="128" width="382" height="134.5"/>
+                                <rect key="frame" x="16" y="84" width="382" height="134.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Question" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HXR-3A-pxm">
                                         <rect key="frame" x="0.0" y="0.0" width="382" height="43"/>
diff --git a/DadJokes/DadJokes/Helpers/DJErrorMessage.swift b/DadJokes/DadJokes/Helpers/DJErrorMessage.swift
index a60c247..df60226 100644
--- a/DadJokes/DadJokes/Helpers/DJErrorMessage.swift
+++ b/DadJokes/DadJokes/Helpers/DJErrorMessage.swift
@@ -17,4 +17,9 @@ enum DJError: String, Error {
     case invalidEmail = "The email you entered is not valid. Please try again."
     case emailAlreadyInUse = "The email you entered is already in use. Please use a different email address."
     case generalSignUpError = "There was an issue trying to sign up. Please try again."
+    
+    // Sign Out alert
+    case signoutError = "There was an error signing out!"
+    // Signup alert
+    case singupError = "To view more or add dad jokes please sign up, under private tab."
 }
diff --git a/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift b/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift
index 2d603c7..f45bfc0 100644
--- a/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift	
+++ b/DadJokes/DadJokes/View Controllers/PrivateJokesTableViewController.swift	
@@ -46,8 +46,8 @@ class PrivateJokesTableViewController: UITableViewController {
         do {
           try firebaseAuth.signOut()
           self.navigationController?.popToRootViewController(animated: true)
-        } catch let signOutError as NSError {
-          print ("Error signing out: %@", signOutError)
+        } catch {
+          presentDJAlertOnMainThread(title: "Error", message: DJError.signoutError.rawValue, buttonTitle: "Ok")
         }
     }
     
diff --git a/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift b/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift
index 442e3fa..fa1a188 100644
--- a/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift	
+++ b/DadJokes/DadJokes/View Controllers/PublicJokesTableViewController.swift	
@@ -13,33 +13,38 @@ class PublicJokesTableViewController: UITableViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
     }
+//    var jokesTest = [String]()
     
-    // alert 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        let alert = UIAlertController(title: "Sign up Alert!", message: "To view more or add dad jokes please sign up, under private tab.", preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Default action"), style: .default, handler: { _ in
-        NSLog("The \"OK\" alert occured.")
-        }))
-        self.present(alert, animated: true, completion: nil)
+//        jokesTest = ["Joke1", "Joke2", "Joke3"]
+
     }
 
     // MARK: - Table view data source
-// Creating an alert to sign up
-//    func createAlert(title: String, message: String) {
-//        let alert = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.alert)
-//
+
+//    override func numberOfSections(in tableView: UITableView) -> Int {
+//        return 1 // test
 //    }
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+//        return jokesTest.count
         return 0
     }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "PublicJokeCell", for: indexPath)
         
+//        cell.textLabel?.text = jokesTest[indexPath.row]
+
         return cell
     }
+    
+    // Alert
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+
+        self.presentDJAlertOnMainThread(title: "Sign Up Alert!", message: DJError.singupError.rawValue, buttonTitle: "Ok")
+    }
 
     /*
     // MARK: - Navigation