news/radar

lib/main.dart

@@ -10,6 +10,7 @@ import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/firebase_options.dart';
 import 'package:didvan/models/notification_message.dart';
 import 'package:didvan/models/requests/news.dart';
+import 'package:didvan/models/requests/radar.dart';
 import 'package:didvan/providers/media.dart';
 import 'package:didvan/providers/theme.dart';
 import 'package:didvan/providers/user.dart';
@@ -137,6 +138,20 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
         navigatorKey.currentState?.pushNamed(path);
       }
     }
+    if (mounted) {
+      String path = uri.path;
+      if (path.startsWith('/radar/')) {
+        final id = path.split('/radar/').last;
+        if (id.isNotEmpty) {
+          navigatorKey.currentState?.pushNamed(
+            Routes.radarDetails,
+            arguments: {'id': int.parse(id), 'args': const RadarRequestArgs(page: 0)},
+          );
+        }
+      } else {
+        navigatorKey.currentState?.pushNamed(path);
+      }
+    }
   }
 
   @override

lib/views/splash/splash.dart

@@ -135,20 +135,24 @@ class _SplashState extends State<Splash> {
         await ServerDataProvider.getData();
       }
 
-      final String destinationRoute =
+      print("token route is $token");
-      token == null ? Routes.authenticaion : Routes.home;
+      String extractedPath = initialURI?.path.toString() == '/' ? Routes.home : initialURI?.path.toString() ?? Routes.home;
-      dynamic routeArguments =
+      final String destinationRoute = token == null ? Routes.authenticaion : extractedPath;
-      token == null ? {'isResetPassword': false} : {'showDialogs': true};
+      dynamic routeArguments = token == null ? {'isResetPassword': false} : {'showDialogs': true};
 
-      if (destinationRoute == Routes.home && initialURI != null) {
+
+      if (destinationRoute == Routes.home) {
+        print("destination route was home and init uri is $initialURI");
         (routeArguments as Map)['deepLinkUri'] = initialURI;
         initialURI = null;
       }
 
       if(destinationRoute == Routes.authenticaion){
+        print("destination route is auth route");
         routeArguments = false;
       }
 
+      print("destination route: $destinationRoute, route args: $routeArguments");
       await navigatorKey.currentState!.pushReplacementNamed(
         destinationRoute,
         arguments: routeArguments,

makefile

@@ -1,2 +1,9 @@
 update_js:
 	cp ./lib/assets/js/main.js ./build/flutter_assets/lib/assets/js/main.js
+
+zip_web:
+	powershell Compress-Archive -Path build\web\* -DestinationPath build.zip -Force
+
+build_web:
+	flutter build web
+