Merge pull request #10 from codeRIT/peter-scheduleparse

Schedule, Phase 2: Live server interaction

Author: cbaudouinjr

BrickHack-Mobile.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		31C5F546219B29CD00E3E1AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F544219B29CD00E3E1AF /* Main.storyboard */; };
 		31C5F548219B29CF00E3E1AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F547219B29CF00E3E1AF /* Assets.xcassets */; };
 		D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D750E81723DF67360075C639 /* FavoriteButton.swift */; };
+		D772876C23DFF92800C2D541 /* ScheduleParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D772876B23DFF92800C2D541 /* ScheduleParser.swift */; };
 		D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978123D652ED0058060A /* ScheduleTableViewController.swift */; };
 		D789978523D6A4DC0058060A /* ProfileTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D789978423D6A4DC0058060A /* ProfileTableViewController.swift */; };
 		D79AA2B823425DFA009C469D /* APIRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D79AA2B723425DFA009C469D /* APIRoutes.swift */; };
@@ -51,6 +52,7 @@
 		31E39209219F765E00F7A3BE /* BrickHack-Mobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "BrickHack-Mobile.entitlements"; sourceTree = "<group>"; };
 		C029FC28202ED2177D811FF7 /* Pods-BrickHack-Mobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BrickHack-Mobile.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BrickHack-Mobile/Pods-BrickHack-Mobile.debug.xcconfig"; sourceTree = "<group>"; };
 		D750E81723DF67360075C639 /* FavoriteButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FavoriteButton.swift; path = "BrickHack-Mobile/Views/FavoriteButton.swift"; sourceTree = SOURCE_ROOT; };
+		D772876B23DFF92800C2D541 /* ScheduleParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleParser.swift; sourceTree = "<group>"; };
 		D789978123D652ED0058060A /* ScheduleTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleTableViewController.swift; sourceTree = "<group>"; };
 		D789978423D6A4DC0058060A /* ProfileTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ProfileTableViewController.swift; path = "/Users/peterkos/Code/Github/brickhack-mobile-ios/BrickHack-Mobile/Controllers/ProfileTableViewController.swift"; sourceTree = "<absolute>"; };
 		D79AA2B723425DFA009C469D /* APIRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIRoutes.swift; sourceTree = "<group>"; };
@@ -138,6 +140,7 @@
 			isa = PBXGroup;
 			children = (
 				D79AA2B723425DFA009C469D /* APIRoutes.swift */,
+				D772876B23DFF92800C2D541 /* ScheduleParser.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -286,6 +289,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D789978223D652ED0058060A /* ScheduleTableViewController.swift in Sources */,
+				D772876C23DFF92800C2D541 /* ScheduleParser.swift in Sources */,
 				D7C07885233EDBA300089193 /* LoginViewController.swift in Sources */,
 				D7C41E2523637D650091C480 /* MainTabBarController.swift in Sources */,
 				D750E81823DF67360075C639 /* FavoriteButton.swift in Sources */,

BrickHack-Mobile/Controllers/LoginViewController.swift

@@ -87,7 +87,7 @@ class LoginViewController: UIViewController {
         "client_id": "745251411cbd86b08c69c7c504f83a319ea60bc0253e6ad9e9953f536d2c3003",
         "authorize_uri": Routes.authorize,
         "redirect_uris": ["brickhack-ios://oauth/callback"],
-        "scope": ""] as OAuth2JSON)
+        "scope": "Access-your-bricks"] as OAuth2JSON)
 
     // @TODO: Nonexistent value is 0 by default, maybe wrap somehow to nil?
     var userID: Int {
@@ -121,7 +121,7 @@ class LoginViewController: UIViewController {
         if (segue.identifier == "authSuccessSegue") {
 
             // Check for MainTabBarController (skip through nav controller)
-            if let tabVC = segue.destination.children.first! as? MainTabBarController {
+            if let tabVC = segue.destination.children.first as? MainTabBarController {
 
                 // Check if valid user (on error, user will reauth)
                 guard userID != 0 else {
@@ -215,7 +215,9 @@ class LoginViewController: UIViewController {
 
             // @FIXME: Bypass name functionality for now
             // Segue to main app
-            self.performSegue(withIdentifier: "authSuccessSegue", sender: self)
+            DispatchQueue.main.async {
+                self.performSegue(withIdentifier: "authSuccessSegue", sender: self)
+            }
 
             // Now that we have the user ID, append it and
             // request the user info.