feat: url with workspace id

TeeWrath · TeeWrath · commit 874adb5c7fa3 · 2025-07-21T17:16:48.000+05:30
diff --git a/lib/core/router/app_route_config.dart b/lib/core/router/app_route_config.dart
@@ -2,17 +2,13 @@ import 'package:cookethflow/core/router/app_route_const.dart';
 import 'package:cookethflow/features/auth/pages/login.dart';
 import 'package:cookethflow/features/auth/pages/signup.dart';
 import 'package:cookethflow/features/dashboard/pages/dashboard.dart';
-import 'package:cookethflow/features/workspace/pages/canvas_page.dart';
 import 'package:cookethflow/features/workspace/pages/workspace.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 class AppRouteConfig {
   static GoRouter returnRouter() {
     return GoRouter(
-      // observers: [
-      //   (route)=> debugPrint('Route Changed: $(route)'),
-      // ],
       initialLocation: RoutesPath.loginScreen,
       routes: [
         GoRoute(
@@ -27,22 +23,19 @@ class AppRouteConfig {
               (context, state) => NoTransitionPage(child: SignupPage()),
         ),
         GoRoute(
-          path: RoutesPath.dashboard,
+          path: '${RoutesPath.dashboard}/u/:username',
           name: RouteName.dashboard,
-          pageBuilder:
-              (context, state) => NoTransitionPage(child: DashboardPage()),
+          pageBuilder: (context, state) {
+            final username = state.pathParameters["username"];
+            return NoTransitionPage(child: DashboardPage());
+          },
         ),
         GoRoute(
-          path: RoutesPath.workspace,
+          path: '${RoutesPath.workspace}/:workspace_id',
           name: RouteName.workspace,
-          pageBuilder:
-              (context, state) => NoTransitionPage(child: WorkspacePage()),
-        ),
-        GoRoute(
-          path: RoutesPath.canvasPage,
-          name: RouteName.canvasPage,
           pageBuilder: (context, state) {
-            return NoTransitionPage(child: CanvasPage());
+            final workspace_id = state.pathParameters['workspace_id'];
+            return NoTransitionPage(child: WorkspacePage());
           },
         ),
       ],
diff --git a/lib/features/auth/widgets/login_form.dart b/lib/features/auth/widgets/login_form.dart
diff --git a/lib/features/auth/widgets/signup_form.dart b/lib/features/auth/widgets/signup_form.dart
@@ -26,7 +26,8 @@ class SignUpForm extends StatelessWidget {
         // Listener for social logins to automatically navigate after successful authentication
         if (supabaseService.currentUser != null && GoRouter.of(context).routerDelegate.currentConfiguration?.fullPath != RoutesPath.dashboard) {
           WidgetsBinding.instance.addPostFrameCallback((_) {
-            context.go(RoutesPath.dashboard);
+            // context.go(RoutesPath.dashboard);
+            context.goNamed(RouteName.dashboard,pathParameters: {'username': supabaseService.currentUser!.name!});
             authProvider.setLoading(false); // Ensure loading is off after navigation
           });
         }
diff --git a/lib/features/dashboard/pages/desktop/dashboard_desktop.dart b/lib/features/dashboard/pages/desktop/dashboard_desktop.dart
@@ -59,7 +59,9 @@ class DashboardDesktop extends StatelessWidget {
                                     childAspectRatio: 4.5 / 3,
                                   ),
                               itemBuilder: (context, index) {
-                                return ProjectCard(idx: index);
+                                final workspaceId = provider.workspaceList.keys
+                                    .elementAt(index);
+                                return ProjectCard(workspaceId: workspaceId);
                               },
                             ),
                           ),
diff --git a/lib/features/dashboard/providers/dashboard_provider.dart b/lib/features/dashboard/providers/dashboard_provider.dart
@@ -9,7 +9,6 @@ import 'package:uuid/uuid.dart';
 class DashboardProvider extends StateHandler {
   late SupabaseClient? supabase;
   late SupabaseService supabaseService;
-  late String currentWorkspaceId;
   DashboardProvider(this.supabase, this.supabaseService) : super() {
     initialize();
   }
@@ -19,14 +18,16 @@ class DashboardProvider extends StateHandler {
   int _tabIndex = 0;
   bool _isLoading = false;
   bool _isInitialized = false;
-  List<WorkspaceModel> _workspaceList = [];
+  // List<WorkspaceModel> _workspaceList = [];
+  Map<String, WorkspaceModel> _workspaceList = {};
 
   // getters
   bool get isDrawerOpen => _isDrawerOpen;
   int get tabIndex => _tabIndex;
   bool get isLoading => _isLoading;
   bool get isInitialized => _isInitialized;
-  List<WorkspaceModel> get workspaceList => _workspaceList;
+  // List<WorkspaceModel> get workspaceList => _workspaceList;
+  Map<String, WorkspaceModel> get workspaceList => _workspaceList;
 
   List<Map<String, dynamic>> tabItems = [
     {"label": "All", "icon": Icon(PhosphorIcons.cardsThree())},
@@ -92,7 +93,7 @@ class DashboardProvider extends StateHandler {
                     : DateTime.now(),
           );
           // print(workspace);
-          _workspaceList.add(newWorkspace);
+          _workspaceList[newWorkspace.id] = newWorkspace;
         }
       } catch (e) {
         print("Error parsing workspaces: $e");
@@ -125,7 +126,7 @@ class DashboardProvider extends StateHandler {
       await supabase!.from('workspace').insert(newWorkspace);
 
       refreshDashboard();
-      currentWorkspaceId = newWorkspace["id"];
+      // currentWorkspaceId = newWorkspace["id"];
     } catch (e) {
       print("Error creating new project: $e");
     } finally {
diff --git a/lib/features/dashboard/widgets/project_card.dart b/lib/features/dashboard/widgets/project_card.dart
@@ -1,119 +1,131 @@
 import 'package:cookethflow/core/helpers/date_time_helper.dart';
+import 'package:cookethflow/core/router/app_route_const.dart';
 import 'package:cookethflow/features/dashboard/providers/dashboard_provider.dart';
+import 'package:cookethflow/features/workspace/pages/workspace.dart';
+import 'package:cookethflow/features/workspace/providers/workspace_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:go_router/go_router.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:provider/provider.dart';
 
 class ProjectCard extends StatelessWidget {
-  const ProjectCard({super.key, required this.idx});
-  final int idx;
+  const ProjectCard({super.key, required this.workspaceId});
+  final String workspaceId;
 
   @override
   Widget build(BuildContext context) {
     DateTimeHelper dth = DateTimeHelper();
-    return Consumer<DashboardProvider>(
-      builder: (context, provider, child) {
-        return Container(
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(12.r),
-            border: Border.all(color: const Color(0xFFD9D9D9), width: 1.2),
-          ),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Expanded(
-                flex: 2,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: const Color(0xFFD3D3D3),
-                    borderRadius: BorderRadius.only(
-                      topLeft: Radius.circular(12.r),
-                      topRight: Radius.circular(12.r),
+    return Consumer2<DashboardProvider, WorkspaceProvider>(
+      builder: (context, provider, workspaceProvider, child) {
+        return GestureDetector(
+          onTap: () {
+            workspaceProvider.setWorkspace(workspaceId);
+            context.goNamed(RouteName.workspace,pathParameters: {'workspace_id':workspaceId});
+          },
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(12.r),
+              border: Border.all(color: const Color(0xFFD9D9D9), width: 1.2),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                Expanded(
+                  flex: 2,
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: const Color(0xFFD3D3D3),
+                      borderRadius: BorderRadius.only(
+                        topLeft: Radius.circular(12.r),
+                        topRight: Radius.circular(12.r),
+                      ),
                     ),
-                  ),
-                  child: Stack(
-                    children: [
-                      // Center(
-                      //   child: Image.asset(
-                      //     'assets/images/Frame 400.png',
-                      //     fit: BoxFit.cover,
-                      //   ),
-                      // ),
-                      Positioned(
-                        top: 12.h,
-                        right: 12.w,
-                        child: Container(
-                          padding: EdgeInsets.all(8.w),
-                          decoration: BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.circular(12.r),
-                          ),
-                          child: IconButton(
-                            onPressed: () {},
-                            icon: Icon(
-                              PhosphorIconsRegular.dotsThree,
-                              size: 32.sp,
-                              color: Colors.black,
+                    child: Stack(
+                      children: [
+                        // Center(
+                        //   child: Image.asset(
+                        //     'assets/images/Frame 400.png',
+                        //     fit: BoxFit.cover,
+                        //   ),
+                        // ),
+                        Positioned(
+                          top: 12.h,
+                          right: 12.w,
+                          child: Container(
+                            padding: EdgeInsets.all(8.w),
+                            decoration: BoxDecoration(
+                              color: Colors.white,
+                              borderRadius: BorderRadius.circular(12.r),
+                            ),
+                            child: IconButton(
+                              onPressed: () {},
+                              icon: Icon(
+                                PhosphorIconsRegular.dotsThree,
+                                size: 32.sp,
+                                color: Colors.black,
+                              ),
                             ),
                           ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
                 ),
-              ),
-              Expanded(
-                flex: 1,
-                child: Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 24, vertical: 16),
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            Text(
-                              provider.workspaceList[idx].name ??
-                                  "Name not fetched",
-                              style: TextStyle(
-                                fontFamily: 'Fredrik',
-                                fontSize: 20.sp,
-                                color: Colors.black,
-                                fontWeight: FontWeight.w600,
-                              ),
-                            ),
-                            SizedBox(height: 4.h),
-                            Text(
-                              dth.formatLastEdited(
-                                provider.workspaceList[idx].lastEdited,
+                Expanded(
+                  flex: 1,
+                  child: Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 24, vertical: 16),
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Text(
+                                provider.workspaceList[workspaceId]?.name ??
+                                    "Name not fetched",
+                                style: TextStyle(
+                                  fontFamily: 'Fredrik',
+                                  fontSize: 20.sp,
+                                  color: Colors.black,
+                                  fontWeight: FontWeight.w600,
+                                ),
                               ),
-                              style: TextStyle(
-                                fontFamily: 'Fredrik',
-                                color: Colors.grey[600],
-                                fontSize: 14.sp,
-                                fontWeight: FontWeight.w500,
+                              SizedBox(height: 4.h),
+                              Text(
+                                dth.formatLastEdited(
+                                  provider
+                                      .workspaceList[workspaceId]
+                                      ?.lastEdited,
+                                ),
+                                style: TextStyle(
+                                  fontFamily: 'Fredrik',
+                                  color: Colors.grey[600],
+                                  fontSize: 14.sp,
+                                  fontWeight: FontWeight.w500,
+                                ),
                               ),
-                            ),
-                          ],
+                            ],
+                          ),
                         ),
-                      ),
-                      IconButton(
-                        onPressed: () {},
-                        icon: Icon(
-                          PhosphorIconsRegular.star,
-                          size: 32.sp,
-                          color: Colors.black54,
+                        IconButton(
+                          onPressed: () {},
+                          icon: Icon(
+                            PhosphorIconsRegular.star,
+                            size: 32.sp,
+                            color: Colors.black54,
+                          ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         );
       },
diff --git a/lib/features/workspace/providers/workspace_provider.dart b/lib/features/workspace/providers/workspace_provider.dart
@@ -17,6 +17,7 @@ import 'package:cookethflow/features/models/canvas_models/objects/rounded_square
 import 'package:cookethflow/features/models/canvas_models/objects/square_object.dart';
 import 'package:cookethflow/features/models/canvas_models/objects/triangle_object.dart';
 import 'package:cookethflow/features/models/canvas_models/user_cursor.dart';
+import 'package:cookethflow/features/models/workspace_model.dart';
 import 'package:flutter/material.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:uuid/uuid.dart';
@@ -43,8 +44,10 @@ class WorkspaceProvider extends StateHandler {
   static const double _defaultShapeSize = 100.0;
   static const double _handleRadius = 8.0;
   Color _currentWorkspaceColor = scaffoldColor;
-  String _currentworkspaceId = "";
-  TextEditingController _workspaceNameController = TextEditingController(text: 'Workspace Name');
+  late WorkspaceModel _currentWorkspace;
+  TextEditingController _workspaceNameController = TextEditingController(
+    text: 'Workspace Name',
+  );
 
   bool get isLoading => _isLoading;
   bool get isDrawerOpen => _isDrawerOpen;
@@ -62,8 +65,9 @@ class WorkspaceProvider extends StateHandler {
   double get defaultShapeSize => _defaultShapeSize;
   double get handleRadius => _handleRadius;
   Color get currentWorkspaceColor => _currentWorkspaceColor;
-  String get currentworkspaceId => _currentworkspaceId;
+  WorkspaceModel get currentWorkspace => _currentWorkspace;
   TextEditingController get workspaceNameController => _workspaceNameController;
+  SupabaseService get supabaseService => _supabaseService;
 
   // New getter to easily check if any tile is selected for the drawer's border
   bool get hasSelectedTile => _selectedTileIndex != null;
@@ -99,8 +103,9 @@ class WorkspaceProvider extends StateHandler {
     notifyListeners();
   }
 
-  void setWorkspaceId() {
-    _currentworkspaceId = _dashboardProvider.currentWorkspaceId;
+  void setWorkspace(String id) {
+    _currentWorkspace = _dashboardProvider.workspaceList[id]!;
+    _workspaceNameController.text = _currentWorkspace.name;
     notifyListeners();
   }
 
diff --git a/lib/features/workspace/widgets/workspace_drawer.dart b/lib/features/workspace/widgets/workspace_drawer.dart
