diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 8756027..126c874 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -160,6 +160,7 @@ 891A15F62765639B00B26659 /* Views */ = { isa = PBXGroup; children = ( + 89AD5570276DBBD4001658E0 /* New Group */, 89BCABEE276D2DD6009E9B10 /* PhoneVerification */, 89BDCDED2769B3EB00577829 /* Contacts */, 89F1386B2767EB07006680ED /* SignIn */, @@ -241,6 +242,13 @@ path = FooterControlsView; sourceTree = ""; }; + 89AD5570276DBBD4001658E0 /* New Group */ = { + isa = PBXGroup; + children = ( + ); + path = "New Group"; + sourceTree = ""; + }; 89BCABDF276B3588009E9B10 /* InnerCircle */ = { isa = PBXGroup; children = ( diff --git a/nirvana-ios/ContentView.swift b/nirvana-ios/ContentView.swift index c1c9bc8..51f93f5 100644 --- a/nirvana-ios/ContentView.swift +++ b/nirvana-ios/ContentView.swift @@ -13,12 +13,16 @@ struct ContentView: View { var body: some View { NavigationStackView { - switch self.authSessionStore.sessionState { - case SessionState.isAuthenticated: - InnerCircleView() - case SessionState.isLoggedOut: - WelcomeView() - } + // MARK: temporary + PhoneVerificationView() + + // TODO: remove this commenting to enable natural user flow +// switch self.authSessionStore.sessionState { +// case SessionState.isAuthenticated: +// InnerCircleView() +// case SessionState.isLoggedOut: +// WelcomeView() +// } } } } diff --git a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift index 3a35207..9ab6a51 100644 --- a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift +++ b/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift @@ -8,6 +8,8 @@ import SwiftUI struct InnerCircleView: View { + @EnvironmentObject var authSessionStore: AuthSessionStore + let universalSize = UIScreen.main.bounds // TESTING @@ -341,6 +343,8 @@ struct InnerCircleView: View { Menu { Button("Log out") { print("log out button clicked") + + authSessionStore.logOut() } Button("Friends") { print("manage friends page") @@ -366,7 +370,7 @@ struct InnerCircleView: View { struct InnerCircleView_Previews: PreviewProvider { static var previews: some View { - InnerCircleView() + InnerCircleView().environmentObject(AuthSessionStore()) } }