diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 3c1e513..fe23b11 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 2b6a113..f33afc7 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -67,5 +67,117 @@ landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Vendoo/AppDelegate.swift b/Vendoo/AppDelegate.swift index cf9c9cc..a38a8a6 100644 --- a/Vendoo/AppDelegate.swift +++ b/Vendoo/AppDelegate.swift @@ -19,11 +19,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { - // Override point for customization after application launch. //configures firebase for app use FIRApp.configure() + // Override point for customization after application launch. + self.window = UIWindow(frame: UIScreen.mainScreen().bounds) + + let storyboard = UIStoryboard(name: "Main", bundle: nil) + let view: UIViewController! + if NSUserDefaults.standardUserDefaults().boolForKey("signedIn"){ + view = storyboard.instantiateViewControllerWithIdentifier("SignInViewController") + }else { + view = storyboard.instantiateViewControllerWithIdentifier("SignUp") + } + + + self.window?.rootViewController = view + self.window?.makeKeyAndVisible() + //configure facebook for app return FBSDKApplicationDelegate.sharedInstance().application(application, didFinishLaunchingWithOptions: launchOptions) diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard index 8005536..cb927f7 100755 --- a/Vendoo/Main.storyboard +++ b/Vendoo/Main.storyboard @@ -157,7 +157,7 @@ - + @@ -2501,9 +2501,9 @@ - - + +