From 8c11cc69dbe40ee27682bcc768e9aea72585ac88 Mon Sep 17 00:00:00 2001 From: Jordan Menchen <33770832+jmench@users.noreply.github.com> Date: Sat, 1 Dec 2018 15:20:10 -0500 Subject: [PATCH 1/3] Revert "Ui redesign" --- Restaurant Royale.xcodeproj/project.pbxproj | 18 +- RestaurantRoyale/Base.lproj/Main.storyboard | 344 +++--------------- RestaurantRoyale/LoginViewController.swift | 30 +- RestaurantRoyale/ProfileViewController.swift | 44 --- ...ler.swift => SettingsViewController.swift} | 12 +- RestaurantRoyale/SignUpViewController.swift | 47 ++- RestaurantRoyale/TabViewController.swift | 30 -- RestaurantRoyale/Utilities.swift | 15 - 8 files changed, 94 insertions(+), 446 deletions(-) delete mode 100644 RestaurantRoyale/ProfileViewController.swift rename RestaurantRoyale/{RewardsViewController.swift => SettingsViewController.swift} (68%) delete mode 100644 RestaurantRoyale/TabViewController.swift diff --git a/Restaurant Royale.xcodeproj/project.pbxproj b/Restaurant Royale.xcodeproj/project.pbxproj index 49911fb..46a61fa 100644 --- a/Restaurant Royale.xcodeproj/project.pbxproj +++ b/Restaurant Royale.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* 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 */; }; 30362D0621B319FC00AB07E8 /* gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30362D0521B319FC00AB07E8 /* gif.swift */; }; 30362D0821B31A1700AB07E8 /* money.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0721B31A1600AB07E8 /* money.gif */; }; 30362D0A21B31A2100AB07E8 /* slots.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0921B31A2100AB07E8 /* slots.gif */; }; @@ -28,12 +26,10 @@ E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65DE219CD82500B3EDE1 /* InitialViewController.swift */; }; E9CC65E1219CDE5D00B3EDE1 /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E0219CDE5D00B3EDE1 /* SignUpViewController.swift */; }; E9CC65E3219CDE6700B3EDE1 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */; }; - E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */; }; + E9CC65E5219CE1E500B3EDE1 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0131FCF621B08F3A0087BAA6 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = ""; }; - 0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RewardsViewController.swift; sourceTree = ""; }; 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 = ""; }; 30362D0521B319FC00AB07E8 /* gif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = gif.swift; sourceTree = ""; }; 30362D0721B31A1600AB07E8 /* money.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = money.gif; sourceTree = ""; }; @@ -60,7 +56,7 @@ E9CC65DE219CD82500B3EDE1 /* InitialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InitialViewController.swift; sourceTree = ""; }; E9CC65E0219CDE5D00B3EDE1 /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = ""; }; E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = ""; }; - E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; + E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -115,15 +111,13 @@ E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */, D90CB6761A73B1ED00228A1F /* GeotificationsViewController.swift */, D90CB67C1A73B2BD00228A1F /* AddGeotificationViewController.swift */, - E9CC65E4219CE1E500B3EDE1 /* ProfileViewController.swift */, + E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */, D90CB67E1A73C4B200228A1F /* Geotification.swift */, D9835AF21AA6076800D265BC /* Utilities.swift */, 30362D0721B31A1600AB07E8 /* money.gif */, 30362D0921B31A2100AB07E8 /* slots.gif */, 30362D0521B319FC00AB07E8 /* gif.swift */, D90CB6561A739B7A00228A1F /* Main.storyboard */, - 0131FCF821B0933F0087BAA6 /* RewardsViewController.swift */, - 0131FCF621B08F3A0087BAA6 /* TabViewController.swift */, D90CB6591A739B7A00228A1F /* Images.xcassets */, D90CB65B1A739B7A00228A1F /* LaunchScreen.xib */, D90CB6501A739B7A00228A1F /* Supporting Files */, @@ -306,11 +300,7 @@ E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */, D9835AF31AA6076800D265BC /* Utilities.swift in Sources */, D90CB6801A73C9E200228A1F /* Geotification.swift in Sources */, - - 0131FCF721B08F3A0087BAA6 /* TabViewController.swift in Sources */, - 0131FCF921B0933F0087BAA6 /* RewardsViewController.swift in Sources */, - E9CC65E5219CE1E500B3EDE1 /* ProfileViewController.swift in Sources */, - + E9CC65E5219CE1E500B3EDE1 /* SettingsViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard index 3d949a7..5bbd6a4 100644 --- a/RestaurantRoyale/Base.lproj/Main.storyboard +++ b/RestaurantRoyale/Base.lproj/Main.storyboard @@ -76,7 +76,7 @@ - + @@ -86,77 +86,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -171,44 +115,31 @@ - - - - - - - - - - - - - - + + + - + @@ -222,38 +153,28 @@ - - + + + - + - - + + - + - - - - - - - - - - - - - - - - - - @@ -264,7 +185,7 @@ - + @@ -278,45 +199,35 @@ - - + + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - @@ -328,7 +239,7 @@ - + @@ -338,187 +249,20 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/RestaurantRoyale/LoginViewController.swift b/RestaurantRoyale/LoginViewController.swift index 5cca307..a2470b0 100644 --- a/RestaurantRoyale/LoginViewController.swift +++ b/RestaurantRoyale/LoginViewController.swift @@ -2,7 +2,7 @@ // LoginViewController.swift // RestaurantRoyale // -// Created by Carrier, Kenton on 11/4/18. +// Created by Netreconlab on 11/4/18. // Copyright © 2018 University of Kentucky. All rights reserved. // @@ -20,20 +20,22 @@ class LoginViewController: UIViewController { // Do any additional setup after loading the view. } - @IBAction func handleLogin(_ sender: Any) { - guard let email = emailField.text else { return } - guard let password = passwordField.text else { return } - - Auth.auth().signIn(withEmail: email, password: password) { user, error in - - if error == nil && user != nil { - self.dismiss(animated: false, completion: nil) - } else { - print("Error logging in: \(error!.localizedDescription)") - } - } - + @IBAction func handleLogin(_ sender: Any) { + + guard let email = emailField.text else { return } + guard let password = passwordField.text else { return } + + Auth.auth().signIn(withEmail: email, password: password) { user, error in + + if error == nil && user != nil { + self.dismiss(animated: false, completion: nil) + } else { + print("Error logging in: \(error!.localizedDescription)") + } + } + + } /* // MARK: - Navigation diff --git a/RestaurantRoyale/ProfileViewController.swift b/RestaurantRoyale/ProfileViewController.swift deleted file mode 100644 index 146478f..0000000 --- a/RestaurantRoyale/ProfileViewController.swift +++ /dev/null @@ -1,44 +0,0 @@ -// -// ProfileViewController.swift -// Restaurant Royale -// -// Created by Carrier, Kenton on 11/14/18. -// Copyright © 2018 Ken Toh. All rights reserved. -// - -import UIKit -import Firebase - -class ProfileViewController: UIViewController { - - @IBOutlet weak var favFoodDisplay: UILabel! - @IBOutlet weak var usernameDisplay: UILabel! - @IBOutlet weak var profilePic: UIImageView! - @IBOutlet weak var nameDisplay: UILabel! - - override func viewDidLoad() { - super.viewDidLoad() - - let user = Auth.auth().currentUser - let userDocRef = db.collection("userData").document((user?.uid)!) - - userDocRef.getDocument() { (document, error) in - if let document = document { - self.favFoodDisplay.text = document.get("favFood") as? String - self.nameDisplay.text = document.get("fullName") as? String - } else { - print("Document does not exist") - } - } - - usernameDisplay.text = user?.displayName - profilePic.load(url: (user?.photoURL)!) - - } - - @IBAction func handleLogout(_ sender: Any) { - try! Auth.auth().signOut() - self.dismiss(animated: false, completion: nil) - } - -} diff --git a/RestaurantRoyale/RewardsViewController.swift b/RestaurantRoyale/SettingsViewController.swift similarity index 68% rename from RestaurantRoyale/RewardsViewController.swift rename to RestaurantRoyale/SettingsViewController.swift index 50ea4d3..fecf7f5 100644 --- a/RestaurantRoyale/RewardsViewController.swift +++ b/RestaurantRoyale/SettingsViewController.swift @@ -1,20 +1,26 @@ // -// RewardsViewController.swift +// SettingsViewController.swift // Restaurant Royale // -// Created by Joseph Crocker on 11/29/18. +// Created by Netreconlab on 11/14/18. // Copyright © 2018 Ken Toh. All rights reserved. // import UIKit +import Firebase -class RewardsViewController: UIViewController { +class SettingsViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. } + + @IBAction func handleLogout(_ sender: Any) { + try! Auth.auth().signOut() + self.dismiss(animated: false, completion: nil) + } /* diff --git a/RestaurantRoyale/SignUpViewController.swift b/RestaurantRoyale/SignUpViewController.swift index cda7038..dddbb1e 100644 --- a/RestaurantRoyale/SignUpViewController.swift +++ b/RestaurantRoyale/SignUpViewController.swift @@ -22,9 +22,7 @@ class SignUpViewController: UIViewController { // Do any additional setup after loading the view. } - @IBAction func backButtonPressed(_ sender: UIButton) { - } - + /* // MARK: - Navigation @@ -35,30 +33,27 @@ class SignUpViewController: UIViewController { } */ - - @IBAction func handleSignUp(_ sender: Any) { - guard let username = usernameField.text else { return } - guard let email = emailField.text else { return } - guard let password = passwordField.text else { return } + @IBAction func handleSignUp(_ sender: Any) { + guard let username = usernameField.text else { return } + guard let email = emailField.text else { return } + guard let password = passwordField.text else { return } + + Auth.auth().createUser(withEmail: email, password: password) { user, error in + if error == nil && user != nil { + print("User created!") - Auth.auth().createUser(withEmail: email, password: password) { user, error in - if error == nil && user != nil { - print("User created!") - - let changeRequest = Auth.auth().currentUser?.createProfileChangeRequest() - changeRequest?.displayName = username - changeRequest?.commitChanges { error in - if error == nil { - print("User display name changed!") - self.dismiss(animated: false, completion: nil) - } - } - - } else { - print("Error creating user: \(error!.localizedDescription)") - } + let changeRequest = Auth.auth().currentUser?.createProfileChangeRequest() + changeRequest?.displayName = username + changeRequest?.commitChanges { error in + if error == nil { + print("User display name changed!") + self.dismiss(animated: false, completion: nil) + } } + + } else { + print("Error creating user: \(error!.localizedDescription)") + } } - - + } } diff --git a/RestaurantRoyale/TabViewController.swift b/RestaurantRoyale/TabViewController.swift deleted file mode 100644 index 255c119..0000000 --- a/RestaurantRoyale/TabViewController.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// TabViewController.swift -// Restaurant Royale -// -// Created by Joseph Crocker on 11/29/18. -// Copyright © 2018 Ken Toh. All rights reserved. -// - -import UIKit - -class TabViewController: UITabBarController { - - override func viewDidLoad() { - super.viewDidLoad() - - // 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. - } - */ - -} diff --git a/RestaurantRoyale/Utilities.swift b/RestaurantRoyale/Utilities.swift index b3a5f1e..b5d1d29 100644 --- a/RestaurantRoyale/Utilities.swift +++ b/RestaurantRoyale/Utilities.swift @@ -19,18 +19,3 @@ extension MKMapView { } } -// From https://www.hackingwithswift.com/example-code/uikit/how-to-load-a-remote-image-url-into-uiimageview -// Loads images from a remote URL into an UIImageView -extension UIImageView { - func load(url: URL) { - DispatchQueue.global().async { [weak self] in - if let data = try? Data(contentsOf: url) { - if let image = UIImage(data: data) { - DispatchQueue.main.async { - self?.image = image - } - } - } - } - } -} From b4a9d94b30b8d645eb600a4d8bfcce2e808b57ae Mon Sep 17 00:00:00 2001 From: jmench Date: Mon, 3 Dec 2018 23:37:27 -0500 Subject: [PATCH 2/3] - GUI changes --- Restaurant Royale.xcodeproj/project.pbxproj | 11 ++- RestaurantRoyale/Base.lproj/Main.storyboard | 74 ++++++++++++++++++- RestaurantRoyale/Info.plist | 2 - .../RestaurantViewController.swift | 20 +++++ RestaurantRoyale/gif.swift | 24 +++++- 5 files changed, 119 insertions(+), 12 deletions(-) create mode 100644 RestaurantRoyale/RestaurantViewController.swift diff --git a/Restaurant Royale.xcodeproj/project.pbxproj b/Restaurant Royale.xcodeproj/project.pbxproj index 46a61fa..1da2920 100644 --- a/Restaurant Royale.xcodeproj/project.pbxproj +++ b/Restaurant Royale.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 30362D0621B319FC00AB07E8 /* gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30362D0521B319FC00AB07E8 /* gif.swift */; }; 30362D0821B31A1700AB07E8 /* money.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0721B31A1600AB07E8 /* money.gif */; }; 30362D0A21B31A2100AB07E8 /* slots.gif in Resources */ = {isa = PBXBuildFile; fileRef = 30362D0921B31A2100AB07E8 /* slots.gif */; }; + 304951D121B5E5DC0022CF5D /* RestaurantViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 304951D021B5E5DC0022CF5D /* RestaurantViewController.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 */; }; D90CB6581A739B7A00228A1F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D90CB6561A739B7A00228A1F /* Main.storyboard */; }; @@ -34,6 +35,7 @@ 30362D0521B319FC00AB07E8 /* gif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = gif.swift; sourceTree = ""; }; 30362D0721B31A1600AB07E8 /* money.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = money.gif; sourceTree = ""; }; 30362D0921B31A2100AB07E8 /* slots.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slots.gif; sourceTree = ""; }; + 304951D021B5E5DC0022CF5D /* RestaurantViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestaurantViewController.swift; sourceTree = ""; }; 308B7289218FDB950027F45B /* TollyToLocal.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = TollyToLocal.gpx; sourceTree = ""; }; 7DBB1DD8B77C6707E9D01F9D /* Pods-Restaurant Royale.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Restaurant Royale.release.xcconfig"; path = "Pods/Target Support Files/Pods-Restaurant Royale/Pods-Restaurant Royale.release.xcconfig"; sourceTree = ""; }; A16373B92054471A0065C2D9 /* Google.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Google.gpx; sourceTree = ""; }; @@ -111,12 +113,13 @@ E9CC65E2219CDE6700B3EDE1 /* LoginViewController.swift */, D90CB6761A73B1ED00228A1F /* GeotificationsViewController.swift */, D90CB67C1A73B2BD00228A1F /* AddGeotificationViewController.swift */, + 304951D021B5E5DC0022CF5D /* RestaurantViewController.swift */, E9CC65E4219CE1E500B3EDE1 /* SettingsViewController.swift */, D90CB67E1A73C4B200228A1F /* Geotification.swift */, D9835AF21AA6076800D265BC /* Utilities.swift */, + 30362D0521B319FC00AB07E8 /* gif.swift */, 30362D0721B31A1600AB07E8 /* money.gif */, 30362D0921B31A2100AB07E8 /* slots.gif */, - 30362D0521B319FC00AB07E8 /* gif.swift */, D90CB6561A739B7A00228A1F /* Main.storyboard */, D90CB6591A739B7A00228A1F /* Images.xcassets */, D90CB65B1A739B7A00228A1F /* LaunchScreen.xib */, @@ -183,6 +186,7 @@ TargetAttributes = { D90CB64C1A739B7A00228A1F = { CreatedOnToolsVersion = 6.1.1; + DevelopmentTeam = BH9BS3QV7C; LastSwiftMigration = 0920; SystemCapabilities = { com.apple.BackgroundModes = { @@ -300,6 +304,7 @@ E9CC65DF219CD82500B3EDE1 /* InitialViewController.swift in Sources */, D9835AF31AA6076800D265BC /* Utilities.swift in Sources */, D90CB6801A73C9E200228A1F /* Geotification.swift in Sources */, + 304951D121B5E5DC0022CF5D /* RestaurantViewController.swift in Sources */, E9CC65E5219CE1E500B3EDE1 /* SettingsViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -432,7 +437,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = BH9BS3QV7C; INFOPLIST_FILE = "$(SRCROOT)/RestaurantRoyale/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -449,7 +454,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = BH9BS3QV7C; INFOPLIST_FILE = "$(SRCROOT)/RestaurantRoyale/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard index 5bbd6a4..fa6936a 100644 --- a/RestaurantRoyale/Base.lproj/Main.storyboard +++ b/RestaurantRoyale/Base.lproj/Main.storyboard @@ -47,6 +47,9 @@ + + + + @@ -71,7 +76,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93,6 +152,15 @@ + + + + + + + + + @@ -252,8 +320,8 @@ - - + + diff --git a/RestaurantRoyale/Info.plist b/RestaurantRoyale/Info.plist index f73f936..84fac1e 100644 --- a/RestaurantRoyale/Info.plist +++ b/RestaurantRoyale/Info.plist @@ -39,8 +39,6 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight diff --git a/RestaurantRoyale/RestaurantViewController.swift b/RestaurantRoyale/RestaurantViewController.swift new file mode 100644 index 0000000..fbf22ef --- /dev/null +++ b/RestaurantRoyale/RestaurantViewController.swift @@ -0,0 +1,20 @@ +// +// RestaurantViewController.swift +// Restaurant Royale +// +// Created by Jordan Menchen on 12/3/18. +// Copyright © 2018 Ken Toh. All rights reserved. +// + +import UIKit + +class RestaurantViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + +} diff --git a/RestaurantRoyale/gif.swift b/RestaurantRoyale/gif.swift index b77d759..e43d023 100644 --- a/RestaurantRoyale/gif.swift +++ b/RestaurantRoyale/gif.swift @@ -1,9 +1,25 @@ // -// gif.swift -// Restaurant Royale +// The MIT License (MIT) // -// Created by Jordan Menchen on 12/1/18. -// Copyright © 2018 Ken Toh. All rights reserved. +// Copyright (c) 2016 Arne Bahlo +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. // import Foundation From 0f745b44fb7466a7fc34e7ead9fcf262c0285864 Mon Sep 17 00:00:00 2001 From: jmench Date: Tue, 4 Dec 2018 00:37:48 -0500 Subject: [PATCH 3/3] more gui changes --- RestaurantRoyale/Base.lproj/Main.storyboard | 69 +++++++++++++++++++-- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/RestaurantRoyale/Base.lproj/Main.storyboard b/RestaurantRoyale/Base.lproj/Main.storyboard index fa6936a..abc09cd 100644 --- a/RestaurantRoyale/Base.lproj/Main.storyboard +++ b/RestaurantRoyale/Base.lproj/Main.storyboard @@ -20,13 +20,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -117,6 +154,7 @@ + @@ -144,31 +182,50 @@ - - + - + + + + + + + + + + + + + + - +