FIX: Added loading page

Signed-off-by: ParsaKargari <[email protected]>
techstartucalgary · Feb 12, 2024 · 91a6608 · 91a6608
1 parent 9c4ead2
commit 91a6608
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Rethread/Rethread/Core/ContentView.swift b/Rethread/Rethread/Core/ContentView.swift
@@ -3,14 +3,19 @@ import SwiftUI
 struct ContentView: View {
     @EnvironmentObject var viewModel: AuthViewModel
 
+
     var body: some View {
         Group {
-            if viewModel.currentUser?.onboardingComplete == false{
-                WelcomeView()
-            } else if viewModel.userSession != nil {
-                HomeView()
+            if viewModel.isLoading {
+                ProgressView("Loading...")
             } else {
-                MainView()
+                if viewModel.currentUser?.onboardingComplete == false {
+                    WelcomeView()
+                } else if viewModel.userSession != nil {
+                    HomeView()
+                } else {
+                    MainView()
+                }
             }
         }
     }

diff --git a/Rethread/Rethread/UserAuthentication/AuthViewModel.swift b/Rethread/Rethread/UserAuthentication/AuthViewModel.swift
@@ -10,12 +10,14 @@ class AuthViewModel: ObservableObject {
     @Published var currentUser: User?
     @Published var CLIENT_CODE: String = ""
     private var verificationId: String?
+    @Published var isLoading: Bool = true
 
     init(){
         self.userSession = Auth.auth().currentUser
-
+        self.isLoading = true
         Task {
             await fetchUser()
+            self.isLoading = false
         }
     }
 

diff --git a/Rethread/Rethread/Views/WelcomeView.swift b/Rethread/Rethread/Views/WelcomeView.swift
@@ -17,7 +17,7 @@ struct WelcomeView: View {
 
             VStack(alignment: .center, spacing: 40) {
                 VStack (alignment: .leading, spacing: 20) {
-                    Text("Hi, " + ("there") + "!")
+                    Text("Hi, " + (viewModel.currentUser?.firstname ?? "there") + "!")
                         .font(.system(size: 32))
                         .fontWeight(.bold)
                         .foregroundColor(Color.primaryDark.opacity(0.5))