wip

composeApp/src/commonMain/kotlin/com/example/mycrib/App.kt

@@ -23,6 +23,7 @@ import com.mycrib.android.ui.screens.RegisterScreen
 import com.mycrib.android.ui.screens.ResidenceDetailScreen
 import com.mycrib.android.ui.screens.ResidencesScreen
 import com.mycrib.android.ui.screens.TasksScreen
+import com.mycrib.android.ui.screens.VerifyEmailScreen
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.ui.tooling.preview.Preview
 
@@ -42,14 +43,58 @@ import mycrib.composeapp.generated.resources.compose_multiplatform
 @Preview
 fun App() {
     var isLoggedIn by remember { mutableStateOf(TokenStorage.hasToken()) }
+    var isVerified by remember { mutableStateOf(false) }
+    var isCheckingAuth by remember { mutableStateOf(true) }
     val navController = rememberNavController()
 
-    // Check for stored token on app start and initialize lookups if logged in
+    // Check for stored token and verification status on app start
     LaunchedEffect(Unit) {
-        isLoggedIn = TokenStorage.hasToken()
-        if (isLoggedIn) {
-            LookupsRepository.initialize()
+        val hasToken = TokenStorage.hasToken()
+        isLoggedIn = hasToken
+
+        if (hasToken) {
+            // Fetch current user to check verification status
+            val authApi = com.mycrib.shared.network.AuthApi()
+            val token = TokenStorage.getToken()
+
+            if (token != null) {
+                when (val result = authApi.getCurrentUser(token)) {
+                    is com.mycrib.shared.network.ApiResult.Success -> {
+                        isVerified = result.data.verified
+                        LookupsRepository.initialize()
+                    }
+                    else -> {
+                        // If fetching user fails, clear token and logout
+                        TokenStorage.clearToken()
+                        isLoggedIn = false
+                    }
+                }
+            }
         }
+
+        isCheckingAuth = false
+    }
+
+    if (isCheckingAuth) {
+        // Show loading screen while checking auth
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            color = MaterialTheme.colorScheme.background
+        ) {
+            androidx.compose.foundation.layout.Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center
+            ) {
+                androidx.compose.material3.CircularProgressIndicator()
+            }
+        }
+        return
+    }
+
+    val startDestination = when {
+        !isLoggedIn -> LoginRoute
+        !isVerified -> VerifyEmailRoute
+        else -> ResidencesRoute
     }
 
     Surface(
@@ -58,16 +103,25 @@ fun App() {
     ) {
         NavHost(
             navController = navController,
-            startDestination = if (isLoggedIn) ResidencesRoute else LoginRoute
+            startDestination = startDestination
         ) {
             composable<LoginRoute> {
                 LoginScreen(
-                    onLoginSuccess = {
+                    onLoginSuccess = { user ->
                         isLoggedIn = true
+                        isVerified = user.verified
                         // Initialize lookups after successful login
                         LookupsRepository.initialize()
-                        navController.navigate(ResidencesRoute) {
-                            popUpTo<LoginRoute> { inclusive = true }
+
+                        // Check if user is verified
+                        if (user.verified) {
+                            navController.navigate(ResidencesRoute) {
+                                popUpTo<LoginRoute> { inclusive = true }
+                            }
+                        } else {
+                            navController.navigate(VerifyEmailRoute) {
+                                popUpTo<LoginRoute> { inclusive = true }
+                            }
                         }
                     },
                     onNavigateToRegister = {
@@ -80,9 +134,10 @@ fun App() {
                 RegisterScreen(
                     onRegisterSuccess = {
                         isLoggedIn = true
+                        isVerified = false
                         // Initialize lookups after successful registration
                         LookupsRepository.initialize()
-                        navController.navigate(ResidencesRoute) {
+                        navController.navigate(VerifyEmailRoute) {
                             popUpTo<RegisterRoute> { inclusive = true }
                         }
                     },
@@ -92,6 +147,27 @@ fun App() {
                 )
             }
 
+            composable<VerifyEmailRoute> {
+                VerifyEmailScreen(
+                    onVerifySuccess = {
+                        isVerified = true
+                        navController.navigate(ResidencesRoute) {
+                            popUpTo<VerifyEmailRoute> { inclusive = true }
+                        }
+                    },
+                    onLogout = {
+                        // Clear token and lookups on logout
+                        TokenStorage.clearToken()
+                        LookupsRepository.clear()
+                        isLoggedIn = false
+                        isVerified = false
+                        navController.navigate(LoginRoute) {
+                            popUpTo<VerifyEmailRoute> { inclusive = true }
+                        }
+                    }
+                )
+            }
+
             composable<HomeRoute> {
                 HomeScreen(
                     onNavigateToResidences = {
@@ -105,6 +181,7 @@ fun App() {
                         TokenStorage.clearToken()
                         LookupsRepository.clear()
                         isLoggedIn = false
+                        isVerified = false
                         navController.navigate(LoginRoute) {
                             popUpTo<HomeRoute> { inclusive = true }
                         }
@@ -125,6 +202,7 @@ fun App() {
                         TokenStorage.clearToken()
                         LookupsRepository.clear()
                         isLoggedIn = false
+                        isVerified = false
                         navController.navigate(LoginRoute) {
                             popUpTo<HomeRoute> { inclusive = true }
                         }