-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
92c120b
commit c7c1ebd
Showing
6 changed files
with
143 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+1.96 KB
(110%)
HackIllinois: QR.xcworkspace/xcuserdata/ymostofi.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // | ||
| // AddViewController.swift | ||
| // HackIllinois: QR | ||
| // | ||
| // Created by Yasha Mostofi on 2/18/17. | ||
| // Copyright © 2017 Yasha Mostofi. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class AddViewController: BaseViewController { | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| // Do any additional setup after loading the view. | ||
| } | ||
|
|
||
| override func didReceiveMemoryWarning() { | ||
| super.didReceiveMemoryWarning() | ||
| // Dispose of any resources that can be recreated. | ||
| } | ||
|
|
||
|
|
||
| /* | ||
| // 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.destinationViewController. | ||
| // Pass the selected object to the new view controller. | ||
| } | ||
| */ | ||
|
|
||
| @IBAction func cancelButton(_ sender: Any) { | ||
| print("cancel") | ||
| self.dismiss(animated: true, completion: nil) | ||
| } | ||
| @IBAction func saveButton(_ sender: Any) { | ||
| print("save") | ||
| self.dismiss(animated: true, completion: nil) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,14 +63,15 @@ class ViewController: BaseViewController { | |
| let image = UIImage(named: "hackillinois") | ||
| imageView.image = image | ||
| navigationItem.titleView = imageView | ||
| email_input.text = "[email protected]" | ||
| password_input.text = "qqqqqqqq" | ||
| // email_input.text = "[email protected]" | ||
| // password_input.text = "qqqqqqqq" | ||
| email_input.text = "[email protected]" | ||
|
|
||
| // TODO: make it so you don't have to click the log in each time | ||
| } | ||
|
|
||
| func logIn(email: String, password: String) { | ||
| if email == "" && password == "" { | ||
| if email == "" || password == "" { | ||
| let preferences = UserDefaults.standard | ||
| if preferences.object(forKey: "session") != nil | ||
| { | ||
|
|
||