From 7983a6cf5967610699e44afd4590ceaf7fcc04ec Mon Sep 17 00:00:00 2001
From: Joseph <josephcrocker@josephs-macbook-pro-7.local>
Date: Wed, 12 Dec 2018 15:31:42 -0500
Subject: [PATCH 1/4] Got the search working

---
 Restaurant Royale.xcodeproj/project.pbxproj  |   8 ++
 RestaurantRoyale/Base.lproj/Main.storyboard  | 105 +++++++++++++++----
 RestaurantRoyale/RewardsViewController.swift |  80 ++++++++++++--
 RestaurantRoyale/TableViewCell.swift         |  24 +++++
 RestaurantRoyale/infoViewController.swift    |  40 +++++++
 5 files changed, 228 insertions(+), 29 deletions(-)
 create mode 100644 RestaurantRoyale/TableViewCell.swift
 create mode 100644 RestaurantRoyale/infoViewController.swift

diff --git a/Restaurant Royale.xcodeproj/project.pbxproj b/Restaurant Royale.xcodeproj/project.pbxproj
index 599961c..2e74726 100644
--- a/Restaurant Royale.xcodeproj/project.pbxproj	
+++ b/Restaurant Royale.xcodeproj/project.pbxproj	
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF621B08F3A0087BAA6 /* TabViewController.swift */; };
 		0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */; };
+		01A7E02121C1836700C5D5DC /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A7E02021C1836700C5D5DC /* TableViewCell.swift */; };
+		01A7E02321C184D900C5D5DC /* infoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A7E02221C184D900C5D5DC /* infoViewController.swift */; };
 		30362D0621B319FC00AB07E8 /* gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30362D0521B319FC00AB07E8 /* gif.swift */; };
 		CB00DE048DF123642887EB65 /* Pods_Restaurant_Royale.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E00D4DEFE6DFD07D30EAC895 /* Pods_Restaurant_Royale.framework */; };
 		D90CB6531A739B7A00228A1F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90CB6521A739B7A00228A1F /* AppDelegate.swift */; };
@@ -37,6 +39,8 @@
 /* Begin PBXFileReference section */
 		0131FCF621B08F3A0087BAA6 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
 		0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardsViewController.swift; sourceTree = "<group>"; };
+		01A7E02021C1836700C5D5DC /* TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
+		01A7E02221C184D900C5D5DC /* infoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = infoViewController.swift; sourceTree = "<group>"; };
 		2C7E16726DE474D67283AED2 /* Pods-Restaurant Royale.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Restaurant Royale.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Restaurant Royale/Pods-Restaurant Royale.debug.xcconfig"; sourceTree = "<group>"; };
 		30362D0521B319FC00AB07E8 /* gif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = gif.swift; sourceTree = "<group>"; };
 		308B7289218FDB950027F45B /* TollyToLocal.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = TollyToLocal.gpx; sourceTree = "<group>"; };
@@ -129,7 +133,9 @@
 				E978543521C053D5003313D1 /* slots.gif */,
 				E978543321C053CA003313D1 /* rouletteWheel.gif */,
 				D90CB6561A739B7A00228A1F /* Main.storyboard */,
+				01A7E02021C1836700C5D5DC /* TableViewCell.swift */,
 				0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */,
+				01A7E02221C184D900C5D5DC /* infoViewController.swift */,
 				E9FD90A221C07E0900864EA7 /* RestaurantManager.swift */,
 				0131FCF621B08F3A0087BAA6 /* TabViewController.swift */,
 				D90CB6591A739B7A00228A1F /* Images.xcassets */,
@@ -313,12 +319,14 @@
 				E9CC65E1219CDE5D00B3EDE1 /* SignUpViewController.swift in Sources */,
 				30362D0621B319FC00AB07E8 /* gif.swift in Sources */,
 				D90CB6531A739B7A00228A1F /* AppDelegate.swift in Sources */,
+				01A7E02121C1836700C5D5DC /* TableViewCell.swift in Sources */,
 				E9CC65E3219CDE6700B3EDE1 /* LoginViewController.swift in Sources */,
 				E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */,
 				E9FD90A321C07E0900864EA7 /* RestaurantManager.swift in Sources */,
 				D9835AF31AA6076800D265BC /* Utilities.swift in Sources */,
 				0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */,
 				0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */,
+				01A7E02321C184D900C5D5DC /* infoViewController.swift in Sources */,
 				E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */,
 				E9F340C221BF86B900779987 /* Constants.swift in Sources */,
 			);
diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard
index 8b5460d..44bb0fd 100644
--- a/RestaurantRoyale/Base.lproj/Main.storyboard
+++ b/RestaurantRoyale/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="roV-tE-Zlz">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="roV-tE-Zlz">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -472,15 +472,15 @@
                     </tabBar>
                     <connections>
                         <segue destination="MnW-gW-vyd" kind="relationship" relationship="viewControllers" id="VpR-OS-g5A"/>
-                        <segue destination="jly-z2-CkB" kind="relationship" relationship="viewControllers" id="Vvt-gM-grN"/>
                         <segue destination="jlM-bB-7qN" kind="relationship" relationship="viewControllers" id="0tp-eS-CN8"/>
+                        <segue destination="vbX-Zd-3k0" kind="relationship" relationship="viewControllers" id="50r-s2-wvk"/>
                     </connections>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4ve-nt-eVw" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-3249" y="244"/>
         </scene>
-        <!--Search-->
+        <!--Rewards View Controller-->
         <scene sceneID="VHq-yU-dQ4">
             <objects>
                 <viewController id="jly-z2-CkB" customClass="RewardsViewController" customModule="Restaurant_Royale" customModuleProvider="target" sceneMemberID="viewController">
@@ -492,29 +492,53 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <searchBar contentMode="redraw" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Jz-IM-j7r">
-                                <rect key="frame" x="0.0" y="44" width="375" height="56"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </searchBar>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="H5H-uj-W0s">
-                                <rect key="frame" x="16" y="100" width="343" height="629"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="H5H-uj-W0s">
+                                <rect key="frame" x="16" y="120" width="343" height="490"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="TableViewCell" id="bo0-sb-j7i" customClass="TableViewCell" customModule="Restaurant_Royale" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="343" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bo0-sb-j7i" id="3UH-RY-lFo">
+                                            <rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="w9Z-RJ-CGu" kind="show" id="LL7-wm-Thr"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
                             </tableView>
+                            <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="8Jz-IM-j7r">
+                                <rect key="frame" x="0.0" y="64" width="375" height="56"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </searchBar>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="8Jz-IM-j7r" firstAttribute="top" secondItem="sM5-yG-WZe" secondAttribute="bottom" id="2gZ-Az-0u8"/>
+                            <constraint firstItem="8Jz-IM-j7r" firstAttribute="centerX" secondItem="H5H-uj-W0s" secondAttribute="centerX" id="7kH-Cm-RZG"/>
+                            <constraint firstItem="8Jz-IM-j7r" firstAttribute="bottom" secondItem="H5H-uj-W0s" secondAttribute="top" id="DT7-Xk-aOD"/>
+                            <constraint firstItem="H5H-uj-W0s" firstAttribute="leading" secondItem="MrO-bt-cVI" secondAttribute="leadingMargin" id="ErB-r7-yZX"/>
+                            <constraint firstItem="6ri-dU-y7d" firstAttribute="top" secondItem="H5H-uj-W0s" secondAttribute="bottom" constant="8" symbolic="YES" id="Keu-cf-LLP"/>
+                            <constraint firstItem="8Jz-IM-j7r" firstAttribute="leading" secondItem="MrO-bt-cVI" secondAttribute="leading" id="N3x-da-fC0"/>
+                            <constraint firstAttribute="trailing" secondItem="8Jz-IM-j7r" secondAttribute="trailing" id="ukl-Ro-Pu1"/>
+                        </constraints>
                     </view>
-                    <tabBarItem key="tabBarItem" title="Search" id="WbC-em-0Ej" propertyAccessControl="all"/>
+                    <navigationItem key="navigationItem" id="Pl9-wb-ndX"/>
+                    <connections>
+                        <outlet property="searchBar" destination="8Jz-IM-j7r" id="Dq4-CS-itJ"/>
+                        <outlet property="tableView" destination="H5H-uj-W0s" id="OWq-d7-ZVv"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="HVI-OY-jG2" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2015.2" y="-730.04926108374389"/>
+            <point key="canvasLocation" x="1741.5999999999999" y="-730.88455772113946"/>
         </scene>
-        <!--View Controller-->
+        <!--Info View Controller-->
         <scene sceneID="3i6-gK-eRQ">
             <objects>
-                <viewController id="w9Z-RJ-CGu" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="infoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="w9Z-RJ-CGu" customClass="infoViewController" customModule="Restaurant_Royale" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="Y1e-Z7-uMz"/>
                         <viewControllerLayoutGuide type="bottom" id="ahM-68-U3a"/>
@@ -522,17 +546,62 @@
                     <view key="view" contentMode="scaleToFill" id="4tv-S9-3Px">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oek-dg-rlp">
+                                <rect key="frame" x="16" y="107" width="343" height="30"/>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uws-JO-6xv">
+                                <rect key="frame" x="16" y="210" width="343" height="30"/>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="oek-dg-rlp" firstAttribute="leading" secondItem="4tv-S9-3Px" secondAttribute="leadingMargin" id="5kP-hR-LEu"/>
+                            <constraint firstItem="oek-dg-rlp" firstAttribute="trailing" secondItem="uws-JO-6xv" secondAttribute="trailing" id="CZA-Mc-9gz"/>
+                            <constraint firstItem="uws-JO-6xv" firstAttribute="top" secondItem="oek-dg-rlp" secondAttribute="bottom" constant="73" id="J2V-HG-9pU"/>
+                            <constraint firstItem="oek-dg-rlp" firstAttribute="leading" secondItem="uws-JO-6xv" secondAttribute="leading" id="Zzo-Dp-j7e"/>
+                            <constraint firstItem="oek-dg-rlp" firstAttribute="top" secondItem="Y1e-Z7-uMz" secondAttribute="bottom" constant="43" id="vc8-iS-wf0"/>
+                            <constraint firstItem="oek-dg-rlp" firstAttribute="trailing" secondItem="4tv-S9-3Px" secondAttribute="trailingMargin" id="xWD-Qs-wRz"/>
+                        </constraints>
                     </view>
+                    <connections>
+                        <outlet property="categoryLabel" destination="uws-JO-6xv" id="ohk-wX-IVb"/>
+                        <outlet property="restaurantNameLabel" destination="oek-dg-rlp" id="LaN-AY-yXv"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="t6r-0y-SAM" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1176.8" y="-730.04926108374389"/>
+            <point key="canvasLocation" x="2580" y="-730.88455772113946"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="QjT-J6-yGp">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="vbX-Zd-3k0" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" systemItem="search" id="G4V-kY-CTb"/>
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="G0V-Q8-ict">
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="jly-z2-CkB" kind="relationship" relationship="rootViewController" id="OKj-Fm-atD"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="WMF-Vb-Cyr" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="802.39999999999998" y="-730.88455772113946"/>
         </scene>
     </scenes>
     <resources>
         <image name="CurrentLocation" width="15" height="15"/>
-        <image name="profileHeader" width="807" height="161"/>
+        <image name="profileHeader" width="1614" height="323"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="Rxu-yy-N72"/>
diff --git a/RestaurantRoyale/RewardsViewController.swift b/RestaurantRoyale/RewardsViewController.swift
index fe11f4a..d22f15d 100644
--- a/RestaurantRoyale/RewardsViewController.swift
+++ b/RestaurantRoyale/RewardsViewController.swift
@@ -8,22 +8,80 @@
 
 import UIKit
 
-class RewardsViewController: UIViewController {
-
+class RewardsViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate {
+    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet weak var searchBar: UISearchBar!
+    
   var manager = RestaurantManager()
   var restaurantArray = [Restaurant]()
   
     override func viewDidLoad() {
         super.viewDidLoad()
-
-      manager.GetEveryRestaurant(completion: { loaded in
-        self.restaurantArray = loaded
-        for restaurant in self.restaurantArray {
-          print(restaurant.name)
-        }
-        // Do Array things here, like updating the tableview
-      })
       
+      setupSearch()
+      loadData()
+      
+  }
+  
+  fileprivate func setupSearch()
+  {
+    searchBar.delegate = self
+    tableView.dataSource = self
+    tableView.delegate = self
+  }
+  
+  func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+    return matches.count
+  }
+  
+  func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+    let cell = tableView.dequeueReusableCell(withIdentifier: "TableViewCell") as! TableViewCell
+    
+    let text = matches[indexPath.row].name
+    
+    cell.textLabel?.text = text
+    
+    return cell
+  }
+  
+  func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    let vc = storyboard?.instantiateViewController(withIdentifier: "infoViewController") as! infoViewController
+    
+    vc.restaurantName = matches[indexPath.row].name
+    vc.location = matches[indexPath.row].location
+    vc.category = matches[indexPath.row].categories[0]
+    self.navigationController?.pushViewController(vc, animated: true)
+  }
+  
+  func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
+    if (searchText == ""){
+      matches = restaurantArray
     }
-
+    else{
+      matches = restaurantArray.filter{$0.name.contains(searchText)}
+      matches = matches.sorted { $0.name < $1.name }
+    }
+    tableView.reloadData()
+  }
+  
+  func numberOfSections(in tableView: UITableView) -> Int {
+    return 1
+  }
+    
+    fileprivate var matches: [Restaurant] = []
+  
+  func loadData(){
+    manager.GetEveryRestaurant(completion: { loaded in
+      self.restaurantArray = loaded
+      for restaurant in self.restaurantArray {
+        print(restaurant.name)
+        self.matches.append(restaurant)
+      }
+      self.tableView.reloadData()
+      // Do Array things here, like updating the tableview
+    })
+    matches = restaurantArray
+    matches = matches.sorted { $0.name < $1.name}
+  }
+  
 }
diff --git a/RestaurantRoyale/TableViewCell.swift b/RestaurantRoyale/TableViewCell.swift
new file mode 100644
index 0000000..051a380
--- /dev/null
+++ b/RestaurantRoyale/TableViewCell.swift
@@ -0,0 +1,24 @@
+//
+//  TableViewCell.swift
+//  Restaurant Royale
+//
+//  Created by Joseph Crocker on 12/12/18.
+//  Copyright © 2018 Ken Toh. All rights reserved.
+//
+
+import UIKit
+
+class TableViewCell: UITableViewCell {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
diff --git a/RestaurantRoyale/infoViewController.swift b/RestaurantRoyale/infoViewController.swift
new file mode 100644
index 0000000..bb09289
--- /dev/null
+++ b/RestaurantRoyale/infoViewController.swift
@@ -0,0 +1,40 @@
+//
+//  infoViewController.swift
+//  Restaurant Royale
+//
+//  Created by Joseph Crocker on 12/12/18.
+//  Copyright © 2018 Ken Toh. All rights reserved.
+//
+
+import UIKit
+import MapKit
+
+class infoViewController: UIViewController {
+    @IBOutlet weak var restaurantNameLabel: UITextField!
+    @IBOutlet weak var categoryLabel: UITextField!
+    
+  var restaurantName = ""
+  var location = CLLocationCoordinate2D()
+  var category = ""
+  
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+      restaurantNameLabel.text = restaurantName
+      categoryLabel.text = category
+    }
+    
+
+    /*
+    // 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.
+    }
+    */
+
+}

From 85e5182eca43cbc54fbe3d6834881d406a52a967 Mon Sep 17 00:00:00 2001
From: Joseph <josephcrocker@josephs-macbook-pro-7.local>
Date: Wed, 12 Dec 2018 15:46:27 -0500
Subject: [PATCH 2/4] Search function

---
 RestaurantRoyale/RewardsViewController.swift | 4 ++--
 RestaurantRoyale/infoViewController.swift    | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/RestaurantRoyale/RewardsViewController.swift b/RestaurantRoyale/RewardsViewController.swift
index d22f15d..bd3112e 100644
--- a/RestaurantRoyale/RewardsViewController.swift
+++ b/RestaurantRoyale/RewardsViewController.swift
@@ -47,8 +47,7 @@ class RewardsViewController: UIViewController, UITableViewDataSource, UITableVie
   func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
     let vc = storyboard?.instantiateViewController(withIdentifier: "infoViewController") as! infoViewController
     
-    vc.restaurantName = matches[indexPath.row].name
-    vc.location = matches[indexPath.row].location
+    vc.restaurant = matches[indexPath.row]
     vc.category = matches[indexPath.row].categories[0]
     self.navigationController?.pushViewController(vc, animated: true)
   }
@@ -82,6 +81,7 @@ class RewardsViewController: UIViewController, UITableViewDataSource, UITableVie
     })
     matches = restaurantArray
     matches = matches.sorted { $0.name < $1.name}
+    tableView.reloadData()
   }
   
 }
diff --git a/RestaurantRoyale/infoViewController.swift b/RestaurantRoyale/infoViewController.swift
index bb09289..0eea343 100644
--- a/RestaurantRoyale/infoViewController.swift
+++ b/RestaurantRoyale/infoViewController.swift
@@ -13,8 +13,7 @@ class infoViewController: UIViewController {
     @IBOutlet weak var restaurantNameLabel: UITextField!
     @IBOutlet weak var categoryLabel: UITextField!
     
-  var restaurantName = ""
-  var location = CLLocationCoordinate2D()
+  var restaurant = Restaurant()
   var category = ""
   
 
@@ -22,7 +21,7 @@ class infoViewController: UIViewController {
         super.viewDidLoad()
 
         // Do any additional setup after loading the view.
-      restaurantNameLabel.text = restaurantName
+      restaurantNameLabel.text = restaurant.name
       categoryLabel.text = category
     }
     

From f3759464d28c7b2a405876e8200700d46ca00677 Mon Sep 17 00:00:00 2001
From: Joseph <josephcrocker@josephs-macbook-pro-7.local>
Date: Wed, 12 Dec 2018 16:00:12 -0500
Subject: [PATCH 3/4] h

---
 RestaurantRoyale/Base.lproj/Main.storyboard  | 34 ++++++++++++++------
 RestaurantRoyale/RestaurantManager.swift     |  2 +-
 RestaurantRoyale/RewardsViewController.swift |  2 ++
 RestaurantRoyale/infoViewController.swift    |  5 ++-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard
index 44bb0fd..15202e5 100644
--- a/RestaurantRoyale/Base.lproj/Main.storyboard
+++ b/RestaurantRoyale/Base.lproj/Main.storyboard
@@ -496,16 +496,13 @@
                                 <rect key="frame" x="16" y="120" width="343" height="490"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="TableViewCell" id="bo0-sb-j7i" customClass="TableViewCell" customModule="Restaurant_Royale" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="TableViewCell" id="bo0-sb-j7i" customClass="TableViewCell" customModule="Restaurant_Royale" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="343" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bo0-sb-j7i" id="3UH-RY-lFo">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="310" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
-                                        <connections>
-                                            <segue destination="w9Z-RJ-CGu" kind="show" id="LL7-wm-Thr"/>
-                                        </connections>
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
@@ -547,29 +544,46 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oek-dg-rlp">
-                                <rect key="frame" x="16" y="107" width="343" height="30"/>
+                            <textField opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oek-dg-rlp">
+                                <rect key="frame" x="16" y="63" width="343" height="32"/>
                                 <nil key="textColor"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uws-JO-6xv">
-                                <rect key="frame" x="16" y="210" width="343" height="30"/>
+                            <textField opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uws-JO-6xv">
+                                <rect key="frame" x="16" y="168" width="343" height="17"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bXz-gl-F9d">
+                                <rect key="frame" x="30" y="313" width="329" height="110"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="110" id="Uv6-bs-J4A"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="32"/>
+                                <state key="normal" title="Go!">
+                                    <color key="titleColor" red="0.99153405429999997" green="0.095917247240000003" blue="0.0056222132410000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="mapButton:" destination="w9Z-RJ-CGu" eventType="primaryActionTriggered" id="Y5J-TT-Myj"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="oek-dg-rlp" firstAttribute="leading" secondItem="4tv-S9-3Px" secondAttribute="leadingMargin" id="5kP-hR-LEu"/>
                             <constraint firstItem="oek-dg-rlp" firstAttribute="trailing" secondItem="uws-JO-6xv" secondAttribute="trailing" id="CZA-Mc-9gz"/>
                             <constraint firstItem="uws-JO-6xv" firstAttribute="top" secondItem="oek-dg-rlp" secondAttribute="bottom" constant="73" id="J2V-HG-9pU"/>
+                            <constraint firstItem="bXz-gl-F9d" firstAttribute="trailing" secondItem="uws-JO-6xv" secondAttribute="trailing" id="W3r-AX-kDw"/>
                             <constraint firstItem="oek-dg-rlp" firstAttribute="leading" secondItem="uws-JO-6xv" secondAttribute="leading" id="Zzo-Dp-j7e"/>
+                            <constraint firstItem="bXz-gl-F9d" firstAttribute="leading" secondItem="4tv-S9-3Px" secondAttribute="leadingMargin" constant="14" id="l0h-Pt-Ua2"/>
                             <constraint firstItem="oek-dg-rlp" firstAttribute="top" secondItem="Y1e-Z7-uMz" secondAttribute="bottom" constant="43" id="vc8-iS-wf0"/>
                             <constraint firstItem="oek-dg-rlp" firstAttribute="trailing" secondItem="4tv-S9-3Px" secondAttribute="trailingMargin" id="xWD-Qs-wRz"/>
+                            <constraint firstItem="ahM-68-U3a" firstAttribute="top" secondItem="bXz-gl-F9d" secondAttribute="bottom" constant="244" id="zu1-Md-1Jc"/>
                         </constraints>
                     </view>
+                    <navigationItem key="navigationItem" id="NGt-m6-aUI"/>
                     <connections>
                         <outlet property="categoryLabel" destination="uws-JO-6xv" id="ohk-wX-IVb"/>
                         <outlet property="restaurantNameLabel" destination="oek-dg-rlp" id="LaN-AY-yXv"/>
diff --git a/RestaurantRoyale/RestaurantManager.swift b/RestaurantRoyale/RestaurantManager.swift
index 71a086b..fc74d2d 100644
--- a/RestaurantRoyale/RestaurantManager.swift
+++ b/RestaurantRoyale/RestaurantManager.swift
@@ -16,7 +16,7 @@ class RestaurantManager {
     
     var restaurantsArray = [Restaurant]()
     
-    db.collection("restaurants").getDocuments() { (querySnapshot, err) in
+    db.collection("restaurants").order(by: "name").getDocuments() { (querySnapshot, err) in
       if let err = err {
         print("Error getting documents: \(err)")
         completion(restaurantsArray)
diff --git a/RestaurantRoyale/RewardsViewController.swift b/RestaurantRoyale/RewardsViewController.swift
index bd3112e..e656019 100644
--- a/RestaurantRoyale/RewardsViewController.swift
+++ b/RestaurantRoyale/RewardsViewController.swift
@@ -37,6 +37,8 @@ class RewardsViewController: UIViewController, UITableViewDataSource, UITableVie
   func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
     let cell = tableView.dequeueReusableCell(withIdentifier: "TableViewCell") as! TableViewCell
     
+    matches = matches.sorted {$0.name < $1.name}
+    
     let text = matches[indexPath.row].name
     
     cell.textLabel?.text = text
diff --git a/RestaurantRoyale/infoViewController.swift b/RestaurantRoyale/infoViewController.swift
index 0eea343..38b23c7 100644
--- a/RestaurantRoyale/infoViewController.swift
+++ b/RestaurantRoyale/infoViewController.swift
@@ -25,7 +25,10 @@ class infoViewController: UIViewController {
       categoryLabel.text = category
     }
     
-
+    @IBAction func mapButton(_ sender: Any) {
+        restaurant.openMapToRestaurant()
+    }
+    
     /*
     // MARK: - Navigation
 

From d6e729f4d7b124dd478bf6e520c186736cd9ad5d Mon Sep 17 00:00:00 2001
From: Joseph <josephcrocker@josephs-macbook-pro-7.local>
Date: Wed, 12 Dec 2018 16:05:31 -0500
Subject: [PATCH 4/4] G

---
 Restaurant Royale.xcodeproj/project.pbxproj               | 8 ++++----
 RestaurantRoyale/Base.lproj/Main.storyboard               | 4 ++--
 ...rdsViewController.swift => SearchViewController.swift} | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename RestaurantRoyale/{RewardsViewController.swift => SearchViewController.swift} (94%)

diff --git a/Restaurant Royale.xcodeproj/project.pbxproj b/Restaurant Royale.xcodeproj/project.pbxproj
index 2e74726..43ee4dc 100644
--- a/Restaurant Royale.xcodeproj/project.pbxproj	
+++ b/Restaurant Royale.xcodeproj/project.pbxproj	
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF621B08F3A0087BAA6 /* TabViewController.swift */; };
-		0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */; };
+		0131FCF921B0933F0087BAA6 /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0131FCF821B0933F0087BAA6 /* SearchViewController.swift */; };
 		01A7E02121C1836700C5D5DC /* TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A7E02021C1836700C5D5DC /* TableViewCell.swift */; };
 		01A7E02321C184D900C5D5DC /* infoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01A7E02221C184D900C5D5DC /* infoViewController.swift */; };
 		30362D0621B319FC00AB07E8 /* gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30362D0521B319FC00AB07E8 /* gif.swift */; };
@@ -38,7 +38,7 @@
 
 /* Begin PBXFileReference section */
 		0131FCF621B08F3A0087BAA6 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
-		0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardsViewController.swift; sourceTree = "<group>"; };
+		0131FCF821B0933F0087BAA6 /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
 		01A7E02021C1836700C5D5DC /* TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewCell.swift; sourceTree = "<group>"; };
 		01A7E02221C184D900C5D5DC /* infoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = infoViewController.swift; sourceTree = "<group>"; };
 		2C7E16726DE474D67283AED2 /* Pods-Restaurant Royale.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Restaurant Royale.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Restaurant Royale/Pods-Restaurant Royale.debug.xcconfig"; sourceTree = "<group>"; };
@@ -134,7 +134,7 @@
 				E978543321C053CA003313D1 /* rouletteWheel.gif */,
 				D90CB6561A739B7A00228A1F /* Main.storyboard */,
 				01A7E02021C1836700C5D5DC /* TableViewCell.swift */,
-				0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */,
+				0131FCF821B0933F0087BAA6 /* SearchViewController.swift */,
 				01A7E02221C184D900C5D5DC /* infoViewController.swift */,
 				E9FD90A221C07E0900864EA7 /* RestaurantManager.swift */,
 				0131FCF621B08F3A0087BAA6 /* TabViewController.swift */,
@@ -325,7 +325,7 @@
 				E9FD90A321C07E0900864EA7 /* RestaurantManager.swift in Sources */,
 				D9835AF31AA6076800D265BC /* Utilities.swift in Sources */,
 				0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */,
-				0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */,
+				0131FCF921B0933F0087BAA6 /* SearchViewController.swift in Sources */,
 				01A7E02321C184D900C5D5DC /* infoViewController.swift in Sources */,
 				E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */,
 				E9F340C221BF86B900779987 /* Constants.swift in Sources */,
diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard
index 15202e5..3335194 100644
--- a/RestaurantRoyale/Base.lproj/Main.storyboard
+++ b/RestaurantRoyale/Base.lproj/Main.storyboard
@@ -480,10 +480,10 @@
             </objects>
             <point key="canvasLocation" x="-3249" y="244"/>
         </scene>
-        <!--Rewards View Controller-->
+        <!--Search View Controller-->
         <scene sceneID="VHq-yU-dQ4">
             <objects>
-                <viewController id="jly-z2-CkB" customClass="RewardsViewController" customModule="Restaurant_Royale" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="jly-z2-CkB" customClass="SearchViewController" customModule="Restaurant_Royale" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="sM5-yG-WZe"/>
                         <viewControllerLayoutGuide type="bottom" id="6ri-dU-y7d"/>
diff --git a/RestaurantRoyale/RewardsViewController.swift b/RestaurantRoyale/SearchViewController.swift
similarity index 94%
rename from RestaurantRoyale/RewardsViewController.swift
rename to RestaurantRoyale/SearchViewController.swift
index e656019..6ec87cf 100644
--- a/RestaurantRoyale/RewardsViewController.swift
+++ b/RestaurantRoyale/SearchViewController.swift
@@ -1,5 +1,5 @@
 //
-//  RewardsViewController.swift
+//  SearchViewController.swift
 //  Restaurant Royale
 //
 //  Created by Joseph Crocker on 11/29/18.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class RewardsViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate {
+class SearchViewController: UIViewController, UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate {
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var searchBar: UISearchBar!