Add step to install Node.js dependencies in production workflow

Enhances the README with CDK deployment commands.

.env.production

@@ -1,2 +1,2 @@
 ENV_NAME=production
-BASE_URL=https://syncrow-staging.azurewebsites.net
+BASE_URL=https://api.syncrow.me

.github/workflows/production.yml

@@ -0,0 +1,48 @@
+name: 🚀 Flutter Web Production Deployment
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    env:
+      AWS_DEFAULT_REGION: me-central-1
+
+    steps:
+      - name: ⬇️ Checkout Code
+        uses: actions/checkout@v4
+
+      - name: 🐢 Set up Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: 📦 Install Node.js Dependencies (CDK + TypeScript)
+        run: npm install
+
+      - name: 🐳 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 🔐 Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+
+      - name: 🎯 Set up Flutter SDK
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: "3.32.1"
+
+      - name: 📦 Install Flutter Dependencies
+        run: flutter pub get
+
+      - name: 🛠️ Run Flutter Build & CDK Deploy
+        run: |
+          chmod +x ./build.sh
+          ./build.sh

.gitignore

@@ -42,3 +42,7 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+node_modules
+cdk.out
+web-cdk.out

README.md

@@ -24,4 +24,13 @@ samples, guidance on mobile development, and a full API reference.
 
 - run command: `flutter run -d chrome --target=lib/main_dev.dart`
 
+## CDK Deployment
 
+• Bootstrap CDK (first time only): npx cdk bootstrap aws://482311766496/me-central-1
+• List available stacks: npx cdk list
+• Deploy web: npx cdk deploy --require-approval never
+• View changes before deploy: npx cdk diff
+• Generate CloudFormation template: npx cdk synth
+• Destroy infrastructure: npx cdk destroy
+• Web infrastructure is configured in infrastructure/web-stack.ts
+• After code changes: build Flutter web app and deploy to hosting service

bin/web-stack.ts

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+import 'source-map-support/register';
+import * as cdk from 'aws-cdk-lib';
+import { WebStack } from '../infrastructure/web-stack';
+
+const app = new cdk.App();
+
+new WebStack(app, 'SyncrowWebStack', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: 'me-central-1',
+  },
+  certificateArn: app.node.tryGetContext('certificateArn'),
+});

build.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+
+REGION=${AWS_DEFAULT_REGION:-me-central-1}
+ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+STACK_NAME=SyncrowWebStack
+CERTIFICATE_ARN="arn:aws:acm:us-east-1:$ACCOUNT_ID:certificate/b3ea57be-9bf0-4c66-8b01-9672ef1e8530"
+
+echo "🧱 Building Flutter Web for PRODUCTION..."
+flutter build web --target=lib/main.dart --release
+
+echo "🚀 Deploying CDK stack..."
+npx cdk deploy $STACK_NAME \
+  --context certificateArn=$CERTIFICATE_ARN \
+  --require-approval never
+
+echo "✅ Deployment complete. Access the app at: https://app.syncrow.me"

cdk.context.json

@@ -0,0 +1,10 @@
+{
+  "hosted-zone:account=482311766496:domainName=syncrow.me:region=us-east-2": {
+    "Id": "/hostedzone/Z02085662NLJECF4DGJV3",
+    "Name": "syncrow.me."
+  },
+  "hosted-zone:account=482311766496:domainName=syncrow.me:region=me-central-1": {
+    "Id": "/hostedzone/Z02085662NLJECF4DGJV3",
+    "Name": "syncrow.me."
+  }
+}

cdk.json

@@ -0,0 +1,63 @@
+{
+  "app": "npx ts-node --prefer-ts-exts bin/web-stack.ts",
+  "watch": {
+    "include": [
+      "**"
+    ],
+    "exclude": [
+      "README.md",
+      "cdk*.json",
+      "**/*.d.ts",
+      "**/*.js",
+      "tsconfig.json",
+      "package*.json",
+      "yarn.lock",
+      "node_modules",
+      "test"
+    ]
+  },
+  "context": {
+    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+    "@aws-cdk/core:checkSecretUsage": true,
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
+    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+    "@aws-cdk/aws-iam:minimizePolicies": true,
+    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+    "@aws-cdk/core:enablePartitionLiterals": true,
+    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+    "@aws-cdk/aws-iam:standardizedServicePrincipals": true,
+    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+    "@aws-cdk/aws-route53-patters:useCertificate": true,
+    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+    "@aws-cdk/aws-redshift:columnId": true,
+    "@aws-cdk/aws-stepfunctions-tasks:enableLogging": true,
+    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+    "@aws-cdk/aws-kms:aliasNameRef": true,
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+    "@aws-cdk/aws-efs:denyAnonymousAccess": true,
+    "@aws-cdk/aws-opensearchservice:enableLogging": true,
+    "@aws-cdk/aws-nordicapis-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
+    "@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,
+    "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+    "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForSourceAction": true
+  }
+}

infrastructure/web-stack.ts

@@ -0,0 +1,123 @@
+import * as cdk from "aws-cdk-lib";
+import * as acm from "aws-cdk-lib/aws-certificatemanager";
+import * as cloudfront from "aws-cdk-lib/aws-cloudfront";
+import * as origins from "aws-cdk-lib/aws-cloudfront-origins";
+import * as route53 from "aws-cdk-lib/aws-route53";
+import * as targets from "aws-cdk-lib/aws-route53-targets";
+import * as s3 from "aws-cdk-lib/aws-s3";
+import * as s3deploy from "aws-cdk-lib/aws-s3-deployment";
+import { Construct } from "constructs";
+
+export interface WebStackProps extends cdk.StackProps {
+  certificateArn?: string;
+}
+
+export class WebStack extends cdk.Stack {
+  public readonly distributionUrl: string;
+  public readonly bucketName: string;
+
+  constructor(scope: Construct, id: string, props?: WebStackProps) {
+    super(scope, id, props);
+
+    const bucketName = `syncrow-web-${this.account}-${this.region}`;
+
+    const webBucket = new s3.Bucket(this, "SyncrowWebBucket", {
+      bucketName,
+      websiteIndexDocument: "index.html",
+      websiteErrorDocument: "index.html",
+      publicReadAccess: true,
+      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ACLS,
+      removalPolicy: cdk.RemovalPolicy.DESTROY,
+      autoDeleteObjects: true,
+    });
+
+    // Use existing wildcard certificate in us-east-1 (required for CloudFront)
+    const webCertificate = props?.certificateArn
+      ? acm.Certificate.fromCertificateArn(
+          this,
+          "WildcardCertificate",
+          props.certificateArn
+        )
+      : acm.Certificate.fromCertificateArn(
+          this,
+          "WildcardCertificate",
+          "arn:aws:acm:us-east-1:482311766496:certificate/b3ea57be-9bf0-4c66-8b01-9672ef1e8530"
+        );
+
+    // Get the hosted zone
+    const hostedZone = route53.HostedZone.fromLookup(this, "SyncrowZone", {
+      domainName: "syncrow.me",
+    });
+
+    const distribution = new cloudfront.Distribution(
+      this,
+      "SyncrowWebDistribution",
+      {
+        defaultBehavior: {
+          origin: new origins.S3Origin(webBucket),
+          viewerProtocolPolicy:
+            cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+          cachePolicy: cloudfront.CachePolicy.CACHING_OPTIMIZED,
+        },
+        domainNames: ["app.syncrow.me"],
+        certificate: webCertificate,
+        defaultRootObject: "index.html",
+        errorResponses: [
+          {
+            httpStatus: 404,
+            responseHttpStatus: 200,
+            responsePagePath: "/index.html",
+          },
+          {
+            httpStatus: 403,
+            responseHttpStatus: 200,
+            responsePagePath: "/index.html",
+          },
+        ],
+      }
+    );
+
+    // Create Route 53 record for app.syncrow.me
+    new route53.ARecord(this, "WebAliasRecord", {
+      zone: hostedZone,
+      recordName: "app",
+      target: route53.RecordTarget.fromAlias(
+        new targets.CloudFrontTarget(distribution)
+      ),
+    });
+
+    new s3deploy.BucketDeployment(this, "SyncrowWebDeployment", {
+      sources: [s3deploy.Source.asset("./build/web")],
+      destinationBucket: webBucket,
+      distribution,
+      distributionPaths: ["/*"],
+    });
+
+    this.distributionUrl = "https://app.syncrow.me";
+    this.bucketName = bucketName;
+
+    new cdk.CfnOutput(this, "WebsiteUrl", {
+      value: this.distributionUrl,
+      description: "Web Application URL",
+      exportName: `${this.stackName}-WebsiteUrl`,
+    });
+
+    new cdk.CfnOutput(this, "CloudFrontUrl", {
+      value: `https://${distribution.distributionDomainName}`,
+      description: "CloudFront Distribution URL",
+      exportName: `${this.stackName}-CloudFrontUrl`,
+    });
+
+    new cdk.CfnOutput(this, "BucketName", {
+      value: this.bucketName,
+      description: "S3 Bucket Name",
+      exportName: `${this.stackName}-BucketName`,
+    });
+
+    new cdk.CfnOutput(this, "WildcardCertificateArn", {
+      value: webCertificate.certificateArn,
+      description: "Wildcard SSL Certificate ARN (us-east-1)",
+      exportName: `${this.stackName}-WildcardCertificateArn`,
+    });
+  }
+}

lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart

@@ -46,11 +46,11 @@ class AirQualityDistributionBloc
     }
   }
 
-  Future<void> _onClearAirQualityDistribution(
+  void _onClearAirQualityDistribution(
     ClearAirQualityDistribution event,
     Emitter<AirQualityDistributionState> emit,
-  ) async {
-    emit(const AirQualityDistributionState());
+  ) {
+    emit(AirQualityDistributionState(selectedAqiType: state.selectedAqiType));
   }
 
   void _onUpdateAqiTypeEvent(

lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart

@@ -75,6 +75,6 @@ class RangeOfAqiBloc extends Bloc<RangeOfAqiEvent, RangeOfAqiState> {
     ClearRangeOfAqiEvent event,
     Emitter<RangeOfAqiState> emit,
   ) {
-    emit(const RangeOfAqiState());
+    emit(RangeOfAqiState(selectedAqiType: state.selectedAqiType));
   }
 }

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart

@@ -34,6 +34,7 @@ class AqiDistributionChartTitle extends StatelessWidget {
             alignment: AlignmentDirectional.centerEnd,
             fit: BoxFit.scaleDown,
             child: AqiTypeDropdown(
+              selectedAqiType: context.watch<AirQualityDistributionBloc>().state.selectedAqiType,
               onChanged: (value) {
                 if (value != null) {
                   final bloc = context.read<AirQualityDistributionBloc>();

lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart

@@ -18,19 +18,20 @@ enum AqiType {
 }
 
 class AqiTypeDropdown extends StatefulWidget {
-  const AqiTypeDropdown({super.key, required this.onChanged});
+  const AqiTypeDropdown({
+    required this.onChanged,
+    this.selectedAqiType,
+    super.key,
+  });
 
   final ValueChanged<AqiType?> onChanged;
+  final AqiType? selectedAqiType;
 
   @override
   State<AqiTypeDropdown> createState() => _AqiTypeDropdownState();
 }
 
 class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
-  AqiType? _selectedItem = AqiType.aqi;
-
-  void _updateSelectedItem(AqiType? item) => setState(() => _selectedItem = item);
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -41,8 +42,8 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
           width: 1,
         ),
       ),
-      child: DropdownButton<AqiType?>(
-        value: _selectedItem,
+      child: DropdownButton<AqiType>(
+        value: widget.selectedAqiType,
         isDense: true,
         borderRadius: BorderRadius.circular(16),
         dropdownColor: ColorsManager.whiteColors,
@@ -59,10 +60,7 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
         items: AqiType.values
             .map((e) => DropdownMenuItem(value: e, child: Text(e.value)))
             .toList(),
-        onChanged: (value) {
-          _updateSelectedItem(value);
-          widget.onChanged(value);
-        },
+        onChanged: widget.onChanged,
       ),
     );
   }

lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart

@@ -63,15 +63,15 @@ class RangeOfAqiChartTitle extends StatelessWidget {
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerEnd,
             child: AqiTypeDropdown(
+              selectedAqiType: context.watch<RangeOfAqiBloc>().state.selectedAqiType,
               onChanged: (value) {
                 final spaceTreeState = context.read<SpaceTreeBloc>().state;
                 final spaceUuid = spaceTreeState.selectedSpaces.firstOrNull;
-
-                if (spaceUuid == null) return;
-
                 if (value != null) {
                   context.read<RangeOfAqiBloc>().add(UpdateAqiTypeEvent(value));
                 }
+
+                if (spaceUuid == null) return;
               },
             ),
           ),

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -16,11 +16,12 @@ class DeviceManagementBloc
   int _onlineCount = 0;
   int _offlineCount = 0;
   int _lowBatteryCount = 0;
-  List<AllDevicesModel> _selectedDevices = [];
+  final List<AllDevicesModel> _selectedDevices = [];
   List<AllDevicesModel> _filteredDevices = [];
   String currentProductName = '';
   String? currentCommunity;
   String? currentUnitName;
+  String subSpaceName = '';
 
   DeviceManagementBloc() : super(DeviceManagementInitial()) {
     on<FetchDevices>(_onFetchDevices);
@@ -31,27 +32,29 @@ class DeviceManagementBloc
     on<ResetFilters>(_onResetFilters);
     on<ResetSelectedDevices>(_onResetSelectedDevices);
     on<UpdateSelection>(_onUpdateSelection);
+    on<UpdateDeviceName>(_onUpdateDeviceName);
+    on<UpdateSubSpaceName>(_onUpdateSubSpaceName);
   }
 
   Future<void> _onFetchDevices(
       FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
-      List<AllDevicesModel> devices = [];
+      var devices = <AllDevicesModel>[];
       _devices.clear();
-      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      final spaceBloc = event.context.read<SpaceTreeBloc>();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices(
-          projectUuid,
-        );
+        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
       } else {
-        for (var community in spaceBloc.state.selectedCommunities) {
+        for (final community in spaceBloc.state.selectedCommunities) {
           final spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(projectUuid, spacesId: spacesList));
+          for (final space in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(community, space, projectUuid));
+          }
         }
       }
 
@@ -73,7 +76,7 @@ class DeviceManagementBloc
     }
   }
 
-  void _onFilterDevices(
+  Future<void> _onFilterDevices(
       FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
@@ -155,8 +158,7 @@ class DeviceManagementBloc
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(
-      SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -165,9 +167,9 @@ class DeviceManagementBloc
       _selectedDevices.add(event.selectedDevice);
     }
 
-    List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
+    final clonedSelectedDevices = List<AllDevicesModel>.from(_selectedDevices);
 
-    bool isControlButtonEnabled =
+    final isControlButtonEnabled =
         _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
@@ -197,8 +199,8 @@ class DeviceManagementBloc
 
   void _onUpdateSelection(
       UpdateSelection event, Emitter<DeviceManagementState> emit) {
-    List<AllDevicesModel> selectedDevices = [];
-    List<AllDevicesModel> devicesToSelectFrom = [];
+    final selectedDevices = <AllDevicesModel>[];
+    var devicesToSelectFrom = <AllDevicesModel>[];
 
     if (state is DeviceManagementLoaded) {
       devicesToSelectFrom = (state as DeviceManagementLoaded).devices;
@@ -206,7 +208,7 @@ class DeviceManagementBloc
       devicesToSelectFrom = (state as DeviceManagementFiltered).filteredDevices;
     }
 
-    for (int i = 0; i < event.selectedRows.length; i++) {
+    for (var i = 0; i < event.selectedRows.length; i++) {
       if (event.selectedRows[i]) {
         selectedDevices.add(devicesToSelectFrom[i]);
       }
@@ -252,8 +254,7 @@ class DeviceManagementBloc
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
     _lowBatteryCount = _devices
-        .where((device) =>
-            device.batteryLevel != null && device.batteryLevel! < 20)
+        .where((device) => device.batteryLevel != null && device.batteryLevel! < 20)
         .length;
   }
 
@@ -270,8 +271,7 @@ class DeviceManagementBloc
     }
   }
 
-  void _onSearchDevices(
-      SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.deviceNameOrProductName == null ||
@@ -300,7 +300,7 @@ class DeviceManagementBloc
     currentCommunity = event.community;
     currentUnitName = event.unitName;
 
-    List<AllDevicesModel> devicesToSearch = _devices;
+    final devicesToSearch = _devices;
 
     if (devicesToSearch.isNotEmpty) {
       final searchText = event.deviceNameOrProductName?.toLowerCase() ?? '';
@@ -343,5 +343,134 @@ class DeviceManagementBloc
     }
   }
 
+  void _onUpdateDeviceName(
+      UpdateDeviceName event, Emitter<DeviceManagementState> emit) {
+    final devices = _devices.map((device) {
+      if (device.uuid == event.deviceId) {
+        final modifiedDevice = device.copyWith(name: event.newName);
+        _selectedDevices.removeWhere((device) => device.uuid == event.deviceId);
+        _selectedDevices.add(modifiedDevice);
+        return modifiedDevice;
+      }
+      return device;
+    }).toList();
+
+    final filteredDevices = _filteredDevices.map((device) {
+      if (device.uuid == event.deviceId) {
+        final modifiedDevice = device.copyWith(name: event.newName);
+        _selectedDevices.removeWhere((device) => device.uuid == event.deviceId);
+        _selectedDevices.add(modifiedDevice);
+        return modifiedDevice;
+      }
+      return device;
+    }).toList();
+
+    _devices = devices;
+    _filteredDevices = filteredDevices;
+
+    if (state is DeviceManagementLoaded) {
+      final loaded = state as DeviceManagementLoaded;
+      final selectedDevices01 = _selectedDevices.map((device) {
+        if (device.uuid == event.deviceId) {
+          final modifiedDevice = device.copyWith(name: event.newName);
+          return modifiedDevice;
+        }
+        return device;
+      }).toList();
+      emit(DeviceManagementLoaded(
+        devices: devices,
+        selectedIndex: loaded.selectedIndex,
+        onlineCount: loaded.onlineCount,
+        offlineCount: loaded.offlineCount,
+        lowBatteryCount: loaded.lowBatteryCount,
+        selectedDevice: selectedDevices01,
+        isControlButtonEnabled: loaded.isControlButtonEnabled,
+      ));
+    } else if (state is DeviceManagementFiltered) {
+      final filtered = state as DeviceManagementFiltered;
+      final selectedDevices01 = filtered.selectedDevice?.map((device) {
+        if (device.uuid == event.deviceId) {
+          final modifiedDevice = device.copyWith(name: event.newName);
+          return modifiedDevice;
+        }
+        return device;
+      }).toList();
+      emit(DeviceManagementFiltered(
+        filteredDevices: filteredDevices,
+        selectedIndex: filtered.selectedIndex,
+        onlineCount: filtered.onlineCount,
+        offlineCount: filtered.offlineCount,
+        lowBatteryCount: filtered.lowBatteryCount,
+        selectedDevice: selectedDevices01,
+        isControlButtonEnabled: filtered.isControlButtonEnabled,
+      ));
+    }
+  }
+
+  void _onUpdateSubSpaceName(
+      UpdateSubSpaceName event, Emitter<DeviceManagementState> emit) {
+    final devices = _devices.map((device) {
+      if (device.uuid == event.deviceId) {
+        return device.copyWith(
+            subspace:
+                device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
+      }
+      return device;
+    }).toList();
+
+    final filteredDevices = _filteredDevices.map((device) {
+      if (device.uuid == event.deviceId) {
+        return device.copyWith(
+            subspace:
+                device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
+      }
+      return device;
+    }).toList();
+
+    _devices = devices;
+    _filteredDevices = filteredDevices;
+
+    if (state is DeviceManagementLoaded) {
+      final loaded = state as DeviceManagementLoaded;
+      final selectedDevices = loaded.selectedDevice?.map((device) {
+        if (device.uuid == event.deviceId) {
+          return device.copyWith(
+              subspace:
+                  device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
+        }
+        return device;
+      }).toList();
+      emit(DeviceManagementLoaded(
+        devices: _devices,
+        selectedIndex: loaded.selectedIndex,
+        onlineCount: loaded.onlineCount,
+        offlineCount: loaded.offlineCount,
+        lowBatteryCount: loaded.lowBatteryCount,
+        selectedDevice: selectedDevices,
+        isControlButtonEnabled: loaded.isControlButtonEnabled,
+      ));
+    } else if (state is DeviceManagementFiltered) {
+      // final filtered = state as DeviceManagementFiltered;
+      // emit(DeviceManagementFiltered(
+      //   filteredDevices: _filteredDevices,
+      //   selectedIndex: filtered.selectedIndex,
+      //   onlineCount: filtered.onlineCount,
+      //   offlineCount: filtered.offlineCount,
+      //   lowBatteryCount: filtered.lowBatteryCount,
+      //   selectedDevice: filtered.selectedDevice,
+      //   isControlButtonEnabled: filtered.isControlButtonEnabled,
+      // ));
+    }
+  }
+
+  void changeSubspaceName(
+      String deviceId, String newSubSpaceName, String subspaceId) {
+    add(UpdateSubSpaceName(
+      deviceId: deviceId,
+      newSubSpaceName: newSubSpaceName,
+      subspaceId: subspaceId,
+    ));
+  }
+
   List<AllDevicesModel> get selectedDevices => _selectedDevices;
 }

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -70,3 +70,21 @@ class UpdateSelection extends DeviceManagementEvent {
 
   const UpdateSelection(this.selectedRows);
 }
+
+class UpdateDeviceName extends DeviceManagementEvent {
+  final String deviceId;
+  final String newName;
+
+  const UpdateDeviceName({required this.deviceId, required this.newName});
+}
+
+class UpdateSubSpaceName extends DeviceManagementEvent {
+  final String deviceId;
+  final String newSubSpaceName;
+  final String subspaceId;
+
+  const UpdateSubSpaceName(
+      {required this.deviceId,
+      required this.newSubSpaceName,
+      required this.subspaceId});
+}

lib/pages/device_managment/all_devices/models/device_subspace.model.dart

@@ -44,4 +44,20 @@ class DeviceSubspace {
   static List<Map<String, dynamic>> listToJson(List<DeviceSubspace> subspaces) {
     return subspaces.map((subspace) => subspace.toJson()).toList();
   }
+
+  DeviceSubspace copyWith({
+    String? uuid,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? subspaceName,
+    bool? disabled,
+  }) {
+    return DeviceSubspace(
+      uuid: uuid ?? this.uuid,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      subspaceName: subspaceName ?? this.subspaceName,
+      disabled: disabled ?? this.disabled,
+    );
+  }
 }

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -588,4 +588,72 @@ SOS
     "NCPS": DeviceType.NCPS,
     "PC": DeviceType.PC,
   };
+
+  AllDevicesModel copyWith({
+    DevicesModelRoom? room,
+    DeviceSubspace? subspace,
+    DevicesModelUnit? unit,
+    DeviceCommunityModel? community,
+    String? productUuid,
+    String? productType,
+    String? permissionType,
+    int? activeTime,
+    String? category,
+    String? categoryName,
+    int? createTime,
+    String? gatewayId,
+    String? icon,
+    String? ip,
+    String? lat,
+    String? localKey,
+    String? lon,
+    String? model,
+    String? name,
+    String? nodeId,
+    bool? online,
+    String? ownerId,
+    bool? sub,
+    String? timeZone,
+    int? updateTime,
+    String? uuid,
+    int? batteryLevel,
+    String? productName,
+    List<DeviceSpaceModel>? spaces,
+    List<DeviceTagModel>? deviceTags,
+    DeviceSubSpace? deviceSubSpace,
+  }) {
+    return AllDevicesModel(
+      room: room ?? this.room,
+      subspace: subspace ?? this.subspace,
+      unit: unit ?? this.unit,
+      community: community ?? this.community,
+      productUuid: productUuid ?? this.productUuid,
+      productType: productType ?? this.productType,
+      permissionType: permissionType ?? this.permissionType,
+      activeTime: activeTime ?? this.activeTime,
+      category: category ?? this.category,
+      categoryName: categoryName ?? this.categoryName,
+      createTime: createTime ?? this.createTime,
+      gatewayId: gatewayId ?? this.gatewayId,
+      icon: icon ?? this.icon,
+      ip: ip ?? this.ip,
+      lat: lat ?? this.lat,
+      localKey: localKey ?? this.localKey,
+      lon: lon ?? this.lon,
+      model: model ?? this.model,
+      name: name ?? this.name,
+      nodeId: nodeId ?? this.nodeId,
+      online: online ?? this.online,
+      ownerId: ownerId ?? this.ownerId,
+      sub: sub ?? this.sub,
+      timeZone: timeZone ?? this.timeZone,
+      updateTime: updateTime ?? this.updateTime,
+      uuid: uuid ?? this.uuid,
+      batteryLevel: batteryLevel ?? this.batteryLevel,
+      productName: productName ?? this.productName,
+      spaces: spaces ?? this.spaces,
+      deviceTags: deviceTags ?? this.deviceTags,
+      deviceSubSpace: deviceSubSpace ?? this.deviceSubSpace,
+    );
+  }
 }

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -23,6 +23,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
+      buildWhen: (previous, current) => previous != current,
       builder: (context, state) {
         List<AllDevicesModel> devicesToShow = [];
         int selectedIndex = 0;
@@ -31,7 +32,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
         int lowBatteryCount = 0;
         bool isControlButtonEnabled = false;
         List<AllDevicesModel> selectedDevices = [];
-
         if (state is DeviceManagementLoaded) {
           devicesToShow = state.devices;
           selectedIndex = state.selectedIndex;
@@ -111,6 +111,8 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                     onPressed: isControlButtonEnabled
                                         ? () {
                                             if (isAnyDeviceOffline) {
+                                              ScaffoldMessenger.of(context)
+                                                  .clearSnackBars();
                                               ScaffoldMessenger.of(context)
                                                   .showSnackBar(
                                                 const SnackBar(
@@ -190,7 +192,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                 'Product Name',
                                 'Device ID',
                                 'Space Name',
-                                'location',
+                                'Location',
                                 'Battery Level',
                                 'Installation Date and Time',
                                 'Status',
@@ -242,7 +244,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                   .map((device) => device.uuid!)
                                   .toList(),
                               isEmpty: devicesToShow.isEmpty,
-                              onSettingsPressed: (rowIndex) {
+                              onSettingsPressed: (rowIndex) async {
                                 final device = devicesToShow[rowIndex];
                                 showDeviceSettingsSidebar(context, device);
                               },
@@ -264,7 +266,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
       barrierDismissible: true,
       barrierLabel: "Device Settings",
       transitionDuration: const Duration(milliseconds: 300),
-      pageBuilder: (context, anim1, anim2) {
+      pageBuilder: (_, anim1, anim2) {
         return Align(
           alignment: Alignment.centerRight,
           child: Material(
@@ -274,6 +276,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               child: DeviceSettingsPanel(
                 device: device,
                 onClose: () => Navigator.of(context).pop(),
+                deviceManagementBloc: context.read<DeviceManagementBloc>(),
               ),
             ),
           ),

lib/pages/device_managment/curtain_module/widgets/accurate_calibrating_dialog.dart

@@ -23,8 +23,8 @@ class AccurteCalibratingDialog extends StatelessWidget {
         body: const NormalTextBodyForDialog(
           title: '',
           step1:
-              '1. Click Close Button to make the Curtain run to Full Close and Position.',
-          step2: '2. click Next to complete the Calibration.',
+              'Click Close Button to make the Curtain run to Full Close and Position.',
+          step2: 'click Next to complete the Calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

lib/pages/device_managment/curtain_module/widgets/accurate_calibration_dialog.dart

@@ -20,8 +20,8 @@ class AccurateCalibrationDialog extends StatelessWidget {
         title: 'Accurate Calibration',
         body: const NormalTextBodyForDialog(
           title: 'Prepare Calibration:',
-          step1: '1. Run The Curtain to the Fully Open Position,and pause.',
-          step2: '2. click Next to Start accurate calibration.',
+          step1: 'Run The Curtain to the Fully Open Position,and pause.',
+          step2: 'click Next to Start accurate calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

lib/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart

@@ -17,78 +17,87 @@ class AccurateDialogWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 300,
-      width: 400,
+      height: 250,
+      width: 500,
       child: Column(
         children: [
-          Padding(
-            padding: const EdgeInsets.all(10),
-            child: Text(
-              title,
-              style: const TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-                color: ColorsManager.blueColor,
-              ),
+          Expanded(
+            child: Column(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(10),
+                  child: Text(
+                    title,
+                    style: TextStyle(
+                      fontSize: 24,
+                      fontWeight: FontWeight.bold,
+                      color: ColorsManager.dialogBlueTitle,
+                    ),
+                  ),
+                ),
+                const Divider(
+                  indent: 60,
+                  endIndent: 60,
+                ),
+              ],
             ),
           ),
-          const SizedBox(height: 5),
-          const Divider(
-            indent: 10,
-            endIndent: 10,
-          ),
-          Padding(
-            padding: const EdgeInsets.all(10),
+          Expanded(
             child: body,
           ),
-          const SizedBox(height: 20),
-          const Spacer(),
-          const Divider(),
-          Row(
-            children: [
-              Expanded(
-                child: InkWell(
-                  onTap: leftOnTap,
-                  child: Container(
-                    height: 60,
-                    alignment: Alignment.center,
-                    decoration: const BoxDecoration(
-                      border: Border(
-                        right: BorderSide(
-                          color: ColorsManager.grayBorder,
+          Expanded(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                const Divider(),
+                Row(
+                  children: [
+                    Expanded(
+                      child: InkWell(
+                        onTap: leftOnTap,
+                        child: Container(
+                          height: 40,
+                          alignment: Alignment.center,
+                          decoration: const BoxDecoration(
+                            border: Border(
+                              right: BorderSide(
+                                color: ColorsManager.grayBorder,
+                              ),
+                            ),
+                          ),
+                          child: const Text(
+                            'Cancel',
+                            style: TextStyle(color: ColorsManager.grayBorder),
+                          ),
                         ),
                       ),
                     ),
-                    child: const Text(
-                      'Cancel',
-                      style: TextStyle(color: ColorsManager.grayBorder),
-                    ),
-                  ),
-                ),
-              ),
-              Expanded(
-                child: InkWell(
-                  onTap: rightOnTap,
-                  child: Container(
-                    height: 60,
-                    alignment: Alignment.center,
-                    decoration: const BoxDecoration(
-                      border: Border(
-                        right: BorderSide(
-                          color: ColorsManager.grayBorder,
+                    Expanded(
+                      child: InkWell(
+                        onTap: rightOnTap,
+                        child: Container(
+                          height: 40,
+                          alignment: Alignment.center,
+                          decoration: const BoxDecoration(
+                            border: Border(
+                              right: BorderSide(
+                                color: ColorsManager.grayBorder,
+                              ),
+                            ),
+                          ),
+                          child: const Text(
+                            'Next',
+                            style: TextStyle(
+                              color: ColorsManager.blueColor,
+                            ),
+                          ),
                         ),
                       ),
-                    ),
-                    child: const Text(
-                      'Next',
-                      style: TextStyle(
-                        color: ColorsManager.blueColor,
-                      ),
-                    ),
-                  ),
-                ),
-              )
-            ],
+                    )
+                  ],
+                )
+              ],
+            ),
           )
         ],
       ),

lib/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/bloc/curtain_module_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 
 class CalibrateCompletedDialog extends StatelessWidget {
   final BuildContext parentContext;
@@ -21,52 +23,62 @@ class CalibrateCompletedDialog extends StatelessWidget {
         width: 400,
         child: Column(
           children: [
-            const Padding(
-              padding: EdgeInsets.all(10),
-              child: Text(
-                'Calibration Completed',
-                style: TextStyle(
-                  fontSize: 24,
-                  fontWeight: FontWeight.bold,
-                  color: ColorsManager.blueColor,
-                ),
+            Expanded(
+              child: Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.all(10),
+                    child: Text(
+                      'Calibration Completed',
+                      style: TextStyle(
+                        fontSize: 24,
+                        fontWeight: FontWeight.bold,
+                        color: ColorsManager.dialogBlueTitle,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 5),
+                  const Divider(
+                    indent: 10,
+                    endIndent: 10,
+                  ),
+                ],
               ),
             ),
-            const SizedBox(height: 5),
-            const Divider(
-              indent: 10,
-              endIndent: 10,
+            Expanded(
+              child: SvgPicture.asset(Assets.completedDoneIcon),
             ),
-            const Icon(
-              Icons.check_circle,
-              size: 100,
-              color: ColorsManager.blueColor,
-            ),
-            const Spacer(),
-            const Divider(
-              indent: 10,
-              endIndent: 10,
-            ),
-            InkWell(
-              onTap: () {
-                parentContext.read<CurtainModuleBloc>().add(
-                      FetchCurtainModuleStatusEvent(
-                        deviceId: deviceId,
-                      ),
-                    );
-                Navigator.of(parentContext).pop();
-                Navigator.of(parentContext).pop();
-              },
-              child: Container(
-                height: 40,
-                width: double.infinity,
-                alignment: Alignment.center,
-                child: const Text(
-                  'Close',
-                  style: TextStyle(
-                    color: ColorsManager.grayBorder,
+            Expanded(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  const Divider(
+                    indent: 10,
+                    endIndent: 10,
                   ),
-                ),
+                  InkWell(
+                    onTap: () {
+                      parentContext.read<CurtainModuleBloc>().add(
+                            FetchCurtainModuleStatusEvent(
+                              deviceId: deviceId,
+                            ),
+                          );
+                      Navigator.of(parentContext).pop();
+                      Navigator.of(parentContext).pop();
+                    },
+                    child: Container(
+                      height: 40,
+                      width: double.infinity,
+                      alignment: Alignment.center,
+                      child: const Text(
+                        'Close',
+                        style: TextStyle(
+                          color: ColorsManager.grayBorder,
+                        ),
+                      ),
+                    ),
+                  )
+                ],
               ),
             )
           ],

lib/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart

@@ -15,28 +15,72 @@ class NormalTextBodyForDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          title,
-          style: const TextStyle(
-            color: ColorsManager.grayColor,
+    return Padding(
+      padding: EdgeInsetsGeometry.only(left: 15),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (title.isEmpty)
+            const SizedBox()
+          else
+            Expanded(
+              child: Text(
+                title,
+                style: const TextStyle(
+                  color: ColorsManager.grayColor,
+                  fontSize: 17,
+                ),
+              ),
+            ),
+          Expanded(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  width: 10,
+                ),
+                const Text('1. ',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 17,
+                    )),
+                SizedBox(
+                  width: 450,
+                  child: Text(
+                    step1,
+                    style: const TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 17,
+                    ),
+                  ),
+                ),
+              ],
+            ),
           ),
-        ),
-        Text(
-          step1,
-          style: const TextStyle(
-            color: ColorsManager.grayColor,
-          ),
-        ),
-        Text(
-          step2,
-          style: const TextStyle(
-            color: ColorsManager.grayColor,
-          ),
-        )
-      ],
+          Expanded(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  width: 10,
+                ),
+                const Text('2. ',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 17,
+                    )),
+                Text(
+                  step2,
+                  style: const TextStyle(
+                    color: ColorsManager.grayColor,
+                    fontSize: 17,
+                  ),
+                ),
+              ],
+            ),
+          )
+        ],
+      ),
     );
   }
 }

lib/pages/device_managment/curtain_module/widgets/number_input_textfield.dart

@@ -19,7 +19,7 @@ class NumberInputField extends StatelessWidget {
         contentPadding: EdgeInsets.zero,
       ),
       style: const TextStyle(
-        fontSize: 20,
+        fontSize: 15,
         color: ColorsManager.blackColor,
       ),
     );

lib/pages/device_managment/curtain_module/widgets/pref_revers_card_widget.dart

@@ -18,7 +18,7 @@ class PrefReversCardWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultContainer(
-      padding: const EdgeInsets.all(12),
+      padding: const EdgeInsets.all(18),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,

lib/pages/device_managment/curtain_module/widgets/prefrences_dialog.dart

@@ -23,12 +23,12 @@ class CurtainModulePrefrencesDialog extends StatelessWidget {
   Widget build(_) {
     return AlertDialog(
       backgroundColor: ColorsManager.CircleImageBackground,
-      contentPadding: const EdgeInsets.all(30),
-      title: const Center(
+      contentPadding: const EdgeInsets.all(20),
+      title: Center(
           child: Text(
         'Preferences',
         style: TextStyle(
-          color: ColorsManager.blueColor,
+          color: ColorsManager.dialogBlueTitle,
           fontSize: 24,
           fontWeight: FontWeight.bold,
         ),

lib/pages/device_managment/curtain_module/widgets/quick_calibrating_dialog.dart

@@ -69,49 +69,71 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
         body: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const Text(
-              '1. please Enter the Travel Time:',
-              style: TextStyle(color: ColorsManager.grayBorder),
-            ),
-            const SizedBox(height: 10),
-            Container(
-              width: 150,
-              height: 40,
-              padding: const EdgeInsets.all(5),
-              decoration: BoxDecoration(
-                color: ColorsManager.whiteColors,
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Expanded(
-                    child: NumberInputField(controller: _controller),
-                  ),
-                  const Expanded(
-                    child: Text(
-                      'seconds',
-                      style: TextStyle(
-                        fontSize: 15,
-                        color: ColorsManager.blueColor,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            if (_errorText != null)
-              Padding(
-                padding: const EdgeInsets.only(top: 8.0),
-                child: Text(
-                  _errorText!,
-                  style: const TextStyle(
-                    color: ColorsManager.red,
-                    fontSize: 14,
+            const Expanded(
+              child: Align(
+                alignment: Alignment.center,
+                child: Padding(
+                  padding: EdgeInsets.only(right: 75),
+                  child: Text(
+                    '1.please Enter the Travel Time:',
+                    style: TextStyle(color: ColorsManager.lightGrayColor),
                   ),
                 ),
               ),
+            ),
+            Expanded(
+              child: Align(
+                alignment: Alignment.center,
+                child: Container(
+                  width: 110,
+                  padding: const EdgeInsets.all(5),
+                  decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Expanded(
+                        child: NumberInputField(controller: _controller),
+                      ),
+                      Expanded(
+                        child: Text(
+                          'seconds',
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: ColorsManager.dialogBlueTitle,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            if (_errorText != null)
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.only(top: 8.0),
+                  child: Text(
+                    _errorText!,
+                    style: const TextStyle(
+                      color: ColorsManager.red,
+                      fontSize: 14,
+                    ),
+                  ),
+                ),
+              ),
+            const Expanded(
+              child: Align(
+                alignment: Alignment.center,
+                child: Text(
+                  '2.click Next to Complete the calibration',
+                  style: TextStyle(color: ColorsManager.lightGrayColor),
+                ),
+              ),
+            )
           ],
         ),
         leftOnTap: () => Navigator.of(widget.parentContext).pop(),

lib/pages/device_managment/curtain_module/widgets/quick_calibration_dialog.dart

@@ -23,8 +23,8 @@ class QuickCalibrationDialog extends StatelessWidget {
         body: const NormalTextBodyForDialog(
           title: 'Prepare Calibration:',
           step1:
-              '1. Confirm that the curtain is in the fully closed and suspended state.',
-          step2: '2. click Next to Start calibration.',
+              'Confirm that the curtain is in the fully closed and suspended state.',
+          step2: 'click Next to Start calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

lib/pages/device_managment/device_setting/device_management_content.dart

@@ -19,11 +19,14 @@ class DeviceManagementContent extends StatelessWidget {
     required this.device,
     required this.subSpaces,
     required this.deviceInfo,
+    required this.deviceManagementBloc,
   });
 
   final AllDevicesModel device;
   final List<SubSpaceModel> subSpaces;
   final DeviceInfoModel deviceInfo;
+  final DeviceManagementBloc deviceManagementBloc;
+
 
   @override
   Widget build(BuildContext context) {
@@ -87,6 +90,11 @@ class DeviceManagementContent extends StatelessWidget {
                           ),
                         );
                   });
+
+                  deviceManagementBloc.add(UpdateSubSpaceName(
+                      subspaceId: selectedSubSpace.id!,
+                      deviceId: device.uuid!,
+                      newSubSpaceName: selectedSubSpace.name ?? ''));
                 }
               },
               child: infoRow(

lib/pages/device_managment/device_setting/device_settings_panel.dart

@@ -1,13 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/device_icon_type_helper.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/device_management_content.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/remove_device_widget.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/device_info_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -17,7 +19,13 @@ import 'package:syncrow_web/web_layout/default_container.dart';
 class DeviceSettingsPanel extends StatelessWidget {
   final VoidCallback? onClose;
   final AllDevicesModel device;
-  const DeviceSettingsPanel({super.key, this.onClose, required this.device});
+  final DeviceManagementBloc deviceManagementBloc;
+  const DeviceSettingsPanel({
+    super.key,
+    this.onClose,
+    required this.device,
+    required this.deviceManagementBloc,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -71,10 +79,10 @@ class DeviceSettingsPanel extends StatelessWidget {
                               'Device Settings',
                               style: context.theme.textTheme.titleLarge!
                                   .copyWith(
-                                      fontWeight: FontWeight.w700,
+                                  fontWeight: FontWeight.w700,
                                       color: ColorsManager.vividBlue
                                           .withOpacity(0.7),
-                                      fontSize: 24),
+                                  fontSize: 24),
                             ),
                           ],
                         ),
@@ -134,8 +142,14 @@ class DeviceSettingsPanel extends StatelessWidget {
                                               onFieldSubmitted: (value) {
                                                 _bloc.add(const ChangeNameEvent(
                                                     value: false));
+                                                deviceManagementBloc
+                                                    ..add(UpdateDeviceName(
+                                                        deviceId: device.uuid!,
+                                                        newName: _bloc
+                                                            .nameController
+                                                            .text))..add(ResetSelectedDevices());
                                               },
-                                              decoration: InputDecoration(
+                                              decoration:const InputDecoration(
                                                 isDense: true,
                                                 contentPadding: EdgeInsets.zero,
                                                 border: InputBorder.none,
@@ -157,7 +171,7 @@ class DeviceSettingsPanel extends StatelessWidget {
                                                     onTap: () {
                                                       _bloc.add(
                                                           const ChangeNameEvent(
-                                                              value: true));
+                                                          value: true));
                                                     },
                                                     child: SvgPicture.asset(
                                                       Assets
@@ -190,6 +204,7 @@ class DeviceSettingsPanel extends StatelessWidget {
                           device: device,
                           subSpaces: subSpaces.cast<SubSpaceModel>(),
                           deviceInfo: deviceInfo,
+                          deviceManagementBloc: deviceManagementBloc,
                         ),
                         const SizedBox(height: 32),
                         RemoveDeviceWidget(bloc: _bloc),

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart

@@ -195,10 +195,10 @@ class _ScheduleTableView extends StatelessWidget {
             child: Text(_getSelectedDays(
                 ScheduleModel.parseSelectedDays(schedule.days)))),
         Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        schedule.category == 'CUR_2'
-            ? Center(
-                child: Text(schedule.function.value == true ? 'open' : 'close'))
-            : Center(child: Text(schedule.function.value ? 'On' : 'Off')),
+        if (schedule.category == 'CUR_2')
+          Center(child: Text(schedule.function.value))
+        else
+          Center(child: Text(schedule.function.value ? 'On' : 'Off')),
         Center(
           child: Wrap(
             runAlignment: WrapAlignment.center,

lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart

@@ -19,13 +19,19 @@ class ScheduleDialogHelper {
     bool isEdit = false,
     String? code,
   }) {
+    bool temp;
+    if (schedule?.category == 'CUR_2') {
+      temp = schedule!.function.value == 'open' ? true : false;
+    } else {
+      temp = schedule!.function.value;
+    }
     final initialTime = schedule != null
         ? _convertStringToTimeOfDay(schedule.time)
         : TimeOfDay.now();
     final initialDays = schedule != null
         ? _convertDaysStringToBooleans(schedule.days)
         : List.filled(7, false);
-    bool? functionOn = schedule?.function.value ?? true;
+    bool? functionOn = temp;
     TimeOfDay selectedTime = initialTime;
     List<bool> selectedDays = List.of(initialDays);
 

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -170,45 +170,45 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
-    emit(state.copyWith(isLoading: true, errorMessage: null));
-    List<ScenesModel> scenes = [];
-    try {
-      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var createRoutineBloc = context.read<CreateRoutineBloc>();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
-        var spaceBloc = context.read<SpaceTreeBloc>();
-        for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-          for (var spaceId in spacesList) {
-            scenes.addAll(
-                await SceneApi.getScenes(spaceId, communityId, projectUuid));
-          }
+Future<void> _onLoadScenes(
+    LoadScenes event, Emitter<RoutineState> emit) async {
+  emit(state.copyWith(isLoading: true, errorMessage: null));
+  List<ScenesModel> scenes = [];
+  try {
+    BuildContext context = NavigationService.navigatorKey.currentContext!;
+    var createRoutineBloc = context.read<CreateRoutineBloc>();
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+    if (createRoutineBloc.selectedSpaceId == '' &&
+        createRoutineBloc.selectedCommunityId == '') {
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
-      } else {
-        scenes.addAll(await SceneApi.getScenes(
-            createRoutineBloc.selectedSpaceId,
-            createRoutineBloc.selectedCommunityId,
-            projectUuid));
       }
-
-      emit(state.copyWith(
-        scenes: scenes,
-        isLoading: false,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-          isLoading: false,
-          loadScenesErrorMessage: 'Failed to load scenes',
-          errorMessage: '',
-          loadAutomationErrorMessage: '',
-          scenes: scenes));
+    } else {
+      scenes.addAll(await SceneApi.getScenes(
+          createRoutineBloc.selectedSpaceId,
+          createRoutineBloc.selectedCommunityId,
+          projectUuid));
     }
+
+    emit(state.copyWith(
+      scenes: scenes,
+      isLoading: false,
+    ));
+  } catch (e) {
+    emit(state.copyWith(
+        isLoading: false,
+        loadScenesErrorMessage: 'Failed to load scenes',
+        errorMessage: '',
+        loadAutomationErrorMessage: '',
+        scenes: scenes));
   }
+} 
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -936,15 +936,16 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         for (var communityId in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(projectUuid, spacesId: spacesList));
+          for (var spaceId in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(communityId, spaceId, projectUuid));
+          }
         }
       } else {
         devices.addAll(await DevicesManagementApi().fetchDevices(
-          projectUuid,
-          spacesId: [createRoutineBloc.selectedSpaceId],
-        ));
+            createRoutineBloc.selectedCommunityId,
+            createRoutineBloc.selectedSpaceId,
+            projectUuid));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));

lib/pages/routines/widgets/routine_dialogs/curtain_dialog.dart

@@ -58,7 +58,9 @@ class CurtainHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    const DialogHeader('AC Functions'),
+                    DialogHeader(dialogType == 'THEN'
+                        ? 'Curtain Functions'
+                        : 'Curtain Conditions'),
                     Expanded(
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.stretch,

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -2,10 +2,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/date_time_widget.dart';
-import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_state.dart';
@@ -23,8 +21,8 @@ class VisitorPasswordDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Size size = MediaQuery.of(context).size;
-    var text = Theme.of(context)
+    final size = MediaQuery.of(context).size;
+    final text = Theme.of(context)
         .textTheme
         .bodySmall!
         .copyWith(color: Colors.black, fontSize: 13);
@@ -41,8 +39,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                     title: 'Sent Successfully',
                     widgeta: Column(
                       children: [
-                        if (visitorBloc
-                            .passwordStatus!.failedOperations.isNotEmpty)
+                        if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Failed Devices'),
@@ -56,22 +53,19 @@ class VisitorPasswordDialog extends StatelessWidget {
                                       .passwordStatus!.failedOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
-                                      margin: EdgeInsets.all(5),
+                                      margin: const EdgeInsets.all(5),
                                       decoration: containerDecoration,
                                       height: 45,
                                       child: Center(
-                                          child: Text(visitorBloc
-                                              .passwordStatus!
-                                              .failedOperations[index]
-                                              .deviceName)),
+                                          child: Text(visitorBloc.passwordStatus!
+                                              .failedOperations[index].deviceName)),
                                     );
                                   },
                                 ),
                               ),
                             ],
                           ),
-                        if (visitorBloc
-                            .passwordStatus!.successOperations.isNotEmpty)
+                        if (visitorBloc.passwordStatus!.successOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Success Devices'),
@@ -85,14 +79,12 @@ class VisitorPasswordDialog extends StatelessWidget {
                                       .passwordStatus!.successOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
-                                      margin: EdgeInsets.all(5),
+                                      margin: const EdgeInsets.all(5),
                                       decoration: containerDecoration,
                                       height: 45,
                                       child: Center(
-                                          child: Text(visitorBloc
-                                              .passwordStatus!
-                                              .successOperations[index]
-                                              .deviceName)),
+                                          child: Text(visitorBloc.passwordStatus!
+                                              .successOperations[index].deviceName)),
                                     );
                                   },
                                 ),
@@ -115,16 +107,14 @@ class VisitorPasswordDialog extends StatelessWidget {
         child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
           builder: (BuildContext context, VisitorPasswordState state) {
             final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
-            bool isRepeat =
+            final isRepeat =
                 state is IsRepeatState ? state.repeat : visitorBloc.repeat;
             return AlertDialog(
               backgroundColor: Colors.white,
               title: Text(
                 'Create visitor password',
                 style: Theme.of(context).textTheme.headlineLarge!.copyWith(
-                    fontWeight: FontWeight.w400,
-                    fontSize: 24,
-                    color: Colors.black),
+                    fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
               ),
               content: state is LoadingInitialState
                   ? const Center(child: CircularProgressIndicator())
@@ -310,14 +300,12 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           visitorBloc.accessTypeSelected ==
                                               'Offline Password') {
                                         visitorBloc.add(SelectTimeEvent(
-                                            context: context,
-                                            isEffective: false));
+                                            context: context, isEffective: false));
                                       } else {
-                                        visitorBloc.add(
-                                            SelectTimeVisitorPassword(
-                                                context: context,
-                                                isStart: false,
-                                                isRepeat: false));
+                                        visitorBloc.add(SelectTimeVisitorPassword(
+                                            context: context,
+                                            isStart: false,
+                                            isRepeat: false));
                                       }
                                     },
                                     startTime: () {
@@ -326,31 +314,28 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           visitorBloc.accessTypeSelected ==
                                               'Offline Password') {
                                         visitorBloc.add(SelectTimeEvent(
-                                            context: context,
-                                            isEffective: true));
+                                            context: context, isEffective: true));
                                       } else {
-                                        visitorBloc.add(
-                                            SelectTimeVisitorPassword(
-                                                context: context,
-                                                isStart: true,
-                                                isRepeat: false));
+                                        visitorBloc.add(SelectTimeVisitorPassword(
+                                            context: context,
+                                            isStart: true,
+                                            isRepeat: false));
                                       }
                                     },
-                                    firstString: (visitorBloc
-                                                    .usageFrequencySelected ==
-                                                'Periodic' &&
-                                            visitorBloc.accessTypeSelected ==
-                                                'Offline Password')
-                                        ? visitorBloc.effectiveTime
-                                        : visitorBloc.startTimeAccess
-                                            .toString(),
+                                    firstString:
+                                        (visitorBloc.usageFrequencySelected ==
+                                                    'Periodic' &&
+                                                visitorBloc.accessTypeSelected ==
+                                                    'Offline Password')
+                                            ? visitorBloc.effectiveTime
+                                            : visitorBloc.startTimeAccess,
                                     secondString: (visitorBloc
                                                     .usageFrequencySelected ==
                                                 'Periodic' &&
                                             visitorBloc.accessTypeSelected ==
                                                 'Offline Password')
                                         ? visitorBloc.expirationTime
-                                        : visitorBloc.endTimeAccess.toString(),
+                                        : visitorBloc.endTimeAccess,
                                     icon: Assets.calendarIcon),
                               const SizedBox(
                                 height: 10,
@@ -410,8 +395,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                             child: CupertinoSwitch(
                                               value: visitorBloc.repeat,
                                               onChanged: (value) {
-                                                visitorBloc
-                                                    .add(ToggleRepeatEvent());
+                                                visitorBloc.add(ToggleRepeatEvent());
                                               },
                                               applyTheme: true,
                                             ),
@@ -442,8 +426,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           },
                                         ).then((listDevice) {
                                           if (listDevice != null) {
-                                            visitorBloc.selectedDevices =
-                                                listDevice;
+                                            visitorBloc.selectedDevices = listDevice;
                                           }
                                         });
                                       },
@@ -455,8 +438,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                                             .bodySmall!
                                             .copyWith(
                                                 fontWeight: FontWeight.w400,
-                                                color:
-                                                    ColorsManager.whiteColors,
+                                                color: ColorsManager.whiteColors,
                                                 fontSize: 12),
                                       ),
                                     ),
@@ -495,37 +477,30 @@ class VisitorPasswordDialog extends StatelessWidget {
                     onPressed: () {
                       if (visitorBloc.forgetFormKey.currentState!.validate()) {
                         if (visitorBloc.selectedDevices.isNotEmpty) {
-                          if (visitorBloc.usageFrequencySelected ==
-                                  'One-Time' &&
-                              visitorBloc.accessTypeSelected ==
-                                  'Offline Password') {
+                          if (visitorBloc.usageFrequencySelected == 'One-Time' &&
+                              visitorBloc.accessTypeSelected == 'Offline Password') {
                             setPasswordFunction(context, size, visitorBloc);
                           } else if (visitorBloc.usageFrequencySelected ==
                                   'Periodic' &&
-                              visitorBloc.accessTypeSelected ==
-                                  'Offline Password') {
+                              visitorBloc.accessTypeSelected == 'Offline Password') {
                             if (visitorBloc.expirationTime != 'End Time' &&
                                 visitorBloc.effectiveTime != 'Start Time') {
                               setPasswordFunction(context, size, visitorBloc);
                             } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message:
-                                      'Please select Access Period to continue',
+                                  message: 'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
-                          } else if (visitorBloc.endTimeAccess.toString() !=
-                                  'End Time' &&
-                              visitorBloc.startTimeAccess.toString() !=
-                                  'Start Time') {
+                          } else if (visitorBloc.endTimeAccess != 'End Time' &&
+                              visitorBloc.startTimeAccess != 'Start Time') {
                             if (visitorBloc.effectiveTimeTimeStamp != null &&
                                 visitorBloc.expirationTimeTimeStamp != null) {
                               if (isRepeat == true) {
                                 if (visitorBloc.expirationTime != 'End Time' &&
                                     visitorBloc.effectiveTime != 'Start Time' &&
                                     visitorBloc.selectedDays.isNotEmpty) {
-                                  setPasswordFunction(
-                                      context, size, visitorBloc);
+                                  setPasswordFunction(context, size, visitorBloc);
                                 } else {
                                   visitorBloc.stateDialog(
                                       context: context,
@@ -539,15 +514,13 @@ class VisitorPasswordDialog extends StatelessWidget {
                             } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message:
-                                      'Please select Access Period to continue',
+                                  message: 'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
                           } else {
                             visitorBloc.stateDialog(
                                 context: context,
-                                message:
-                                    'Please select Access Period to continue',
+                                message: 'Please select Access Period to continue',
                                 title: 'Access Period');
                           }
                         } else {
@@ -593,17 +566,17 @@ class VisitorPasswordDialog extends StatelessWidget {
                 alignment: Alignment.center,
                 content: SizedBox(
                   height: size.height * 0.25,
-                  child: Center(
-                    child:
-                        CircularProgressIndicator(), // Display a loading spinner
+                  child: const Center(
+                    child: CircularProgressIndicator(), // Display a loading spinner
                   ),
                 ),
               );
             } else {
               return AlertDialog(
                 alignment: Alignment.center,
+                backgroundColor: Colors.white,
                 content: SizedBox(
-                  height: size.height * 0.25,
+                  height: size.height * 0.13,
                   child: Column(
                     children: [
                       Column(
@@ -617,13 +590,16 @@ class VisitorPasswordDialog extends StatelessWidget {
                               width: 35,
                             ),
                           ),
+                          const SizedBox(
+                            height: 20,
+                          ),
                           Text(
                             'Set Password',
                             style: Theme.of(context)
                                 .textTheme
                                 .headlineLarge!
                                 .copyWith(
-                                  fontSize: 30,
+                                  fontSize: 24,
                                   fontWeight: FontWeight.w400,
                                   color: Colors.black,
                                 ),
@@ -631,15 +607,6 @@ class VisitorPasswordDialog extends StatelessWidget {
                         ],
                       ),
                       const SizedBox(width: 15),
-                      Text(
-                        'This action will update all of the selected\n door locks passwords in the property.\n\nAre you sure you want to continue?',
-                        textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.w400,
-                              fontSize: 18,
-                            ),
-                      ),
                     ],
                   ),
                 ),
@@ -668,12 +635,12 @@ class VisitorPasswordDialog extends StatelessWidget {
                     decoration: containerDecoration,
                     width: size.width * 0.1,
                     child: DefaultButton(
+                      backgroundColor: Color(0xff023DFE),
                       borderRadius: 8,
                       onPressed: () {
                         Navigator.pop(context);
                         if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                            visitorBloc.accessTypeSelected ==
-                                'Online Password') {
+                            visitorBloc.accessTypeSelected == 'Online Password') {
                           visitorBloc.add(OnlineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
@@ -681,8 +648,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'Periodic' &&
-                            visitorBloc.accessTypeSelected ==
-                                'Online Password') {
+                            visitorBloc.accessTypeSelected == 'Online Password') {
                           visitorBloc.add(OnlineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
@@ -693,8 +659,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'One-Time' &&
-                            visitorBloc.accessTypeSelected ==
-                                'Offline Password') {
+                            visitorBloc.accessTypeSelected == 'Offline Password') {
                           visitorBloc.add(OfflineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
@@ -702,8 +667,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'Periodic' &&
-                            visitorBloc.accessTypeSelected ==
-                                'Offline Password') {
+                            visitorBloc.accessTypeSelected == 'Offline Password') {
                           visitorBloc.add(OfflineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
@@ -715,7 +679,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         }
                       },
                       child: Text(
-                        'Ok',
+                        'Confirm',
                         style: Theme.of(context).textTheme.bodySmall!.copyWith(
                               fontWeight: FontWeight.w400,
                               color: ColorsManager.whiteColors,

lib/services/devices_mang_api.dart

@@ -12,16 +12,20 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class DevicesManagementApi {
-  Future<List<AllDevicesModel>> fetchDevices(String projectId,
-      {List<String>? spacesId}) async {
+  Future<List<AllDevicesModel>> fetchDevices(
+      String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.getSpaceDevices.replaceAll('{projectId}', projectId),
-        queryParameters: {if (spacesId != null) 'spaces': spacesId},
+        path: communityId.isNotEmpty && spaceId.isNotEmpty
+            ? ApiEndpoints.getSpaceDevices
+                .replaceAll('{spaceUuid}', spaceId)
+                .replaceAll('{communityUuid}', communityId)
+                .replaceAll('{projectId}', projectId)
+            : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          final List<dynamic> jsonData = json['data'] as List<dynamic>;
-          final List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
+          List<dynamic> jsonData = json['data'];
+          List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
           return devicesList;
@@ -412,4 +416,5 @@ class DevicesManagementApi {
     );
     return response;
   }
+
 }

lib/utils/color_manager.dart

@@ -83,7 +83,5 @@ abstract class ColorsManager {
   static const Color maxPurpleDot = Color(0xFF5F00BD);
   static const Color minBlue = Color(0xFF93AAFD);
   static const Color minBlueDot = Color(0xFF023DFE);
-    static const Color grey25 = Color(0xFFF9F9F9);
-    
-
+  static const Color grey25 = Color(0xFFF9F9F9);
 }

lib/utils/constants/api_const.dart

@@ -17,7 +17,8 @@ abstract class ApiEndpoints {
   ////// Devices Management ////////////////
 
   static const String getAllDevices = '/projects/{projectId}/devices';
-  static const String getSpaceDevices = '/projects/{projectId}/devices';
+  static const String getSpaceDevices =
+      '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
   static const String getDeviceStatus = '/devices/{uuid}/functions/status';
   static const String getBatchStatus = '/devices/batch';
 
@@ -45,8 +46,7 @@ abstract class ApiEndpoints {
 // Community Module
   static const String createCommunity = '/projects/{projectId}/communities';
   static const String getCommunityList = '/projects/{projectId}/communities';
-  static const String getCommunityListv2 =
-      '/projects/{projectId}/communities/v2';
+  static const String getCommunityListv2 = '/projects/{projectId}/communities/v2';
   static const String getCommunityById =
       '/projects/{projectId}/communities/{communityId}';
   static const String updateCommunity =

lib/utils/constants/assets.dart

@@ -394,6 +394,7 @@ class Assets {
   static const String emptyBox = 'assets/icons/empty_box.png';
   static const String completeProcessIcon =
       'assets/icons/compleate_process_icon.svg';
+  static const String completedDoneIcon = 'assets/images/completed_done.svg';
   static const String currentProcessIcon =
       'assets/icons/current_process_icon.svg';
   static const String uncomplete_ProcessIcon =
@@ -505,5 +506,6 @@ class Assets {
   static const String aqiAirQuality = 'assets/icons/aqi_air_quality.svg';
   static const String temperatureAqiSidebar = 'assets/icons/thermometer.svg';
   static const String humidityAqiSidebar = 'assets/icons/humidity.svg';
-  static const String autocadOccupancyImage = 'assets/images/autocad_occupancy_image.png';
+  static const String autocadOccupancyImage =
+      'assets/images/autocad_occupancy_image.png';
 }

package-lock.json

@@ -0,0 +1,711 @@
+{
+  "name": "syncrow-web-infrastructure",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "syncrow-web-infrastructure",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "source-map-support": "^0.5.21"
+      },
+      "devDependencies": {
+        "@types/node": "^24.0.12",
+        "aws-cdk-lib": "^2.204.0",
+        "constructs": "^10.4.2",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.8.3"
+      }
+    },
+    "node_modules/@aws-cdk/asset-awscli-v1": {
+      "version": "2.2.242",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.242.tgz",
+      "integrity": "sha512-4c1bAy2ISzcdKXYS1k4HYZsNrgiwbiDzj36ybwFVxEWZXVAP0dimQTCaB9fxu7sWzEjw3d+eaw6Fon+QTfTIpQ==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@aws-cdk/asset-node-proxy-agent-v6": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz",
+      "integrity": "sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/@aws-cdk/cloud-assembly-schema": {
+      "version": "45.2.0",
+      "resolved": "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-45.2.0.tgz",
+      "integrity": "sha512-5TTUkGHQ+nfuUGwKA8/Yraxb+JdNUh4np24qk/VHXmrCMq+M6HfmGWfhcg/QlHA2S5P3YIamfYHdQAB4uSNLAg==",
+      "bundleDependencies": [
+        "jsonschema",
+        "semver"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jsonschema": "~1.4.1",
+        "semver": "^7.7.2"
+      },
+      "engines": {
+        "node": ">= 18.0.0"
+      }
+    },
+    "node_modules/@aws-cdk/cloud-assembly-schema/node_modules/jsonschema": {
+      "version": "1.4.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/@aws-cdk/cloud-assembly-schema/node_modules/semver": {
+      "version": "7.7.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "24.0.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.12.tgz",
+      "integrity": "sha512-LtOrbvDf5ndC9Xi+4QZjVL0woFymF/xSTKZKPgrrl7H7XoeDvnD+E2IclKVDyaK9UM756W/3BXqSU+JEHopA9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~7.8.0"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.11.0"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib": {
+      "version": "2.204.0",
+      "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.204.0.tgz",
+      "integrity": "sha512-mY3nYu+QvPhO+fz+LCFKbc0PFhTHbHzDLnbcA2fPcQBKciYnTixpBd2ccRlKYWbG4y6NTc6ju6DudZ3HIS4OlA==",
+      "bundleDependencies": [
+        "@balena/dockerignore",
+        "case",
+        "fs-extra",
+        "ignore",
+        "jsonschema",
+        "minimatch",
+        "punycode",
+        "semver",
+        "table",
+        "yaml",
+        "mime-types"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-cdk/asset-awscli-v1": "2.2.242",
+        "@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",
+        "@aws-cdk/cloud-assembly-schema": "^45.0.0",
+        "@balena/dockerignore": "^1.0.2",
+        "case": "1.6.3",
+        "fs-extra": "^11.3.0",
+        "ignore": "^5.3.2",
+        "jsonschema": "^1.5.0",
+        "mime-types": "^2.1.35",
+        "minimatch": "^3.1.2",
+        "punycode": "^2.3.1",
+        "semver": "^7.7.2",
+        "table": "^6.9.0",
+        "yaml": "1.10.2"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
+      "peerDependencies": {
+        "constructs": "^10.0.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/@balena/dockerignore": {
+      "version": "1.0.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/aws-cdk-lib/node_modules/ajv": {
+      "version": "8.17.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/astral-regex": {
+      "version": "2.0.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/case": {
+      "version": "1.6.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "(MIT OR GPL-3.0-or-later)",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/concat-map": {
+      "version": "0.0.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/fast-uri": {
+      "version": "3.0.6",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "inBundle": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/aws-cdk-lib/node_modules/fs-extra": {
+      "version": "11.3.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/aws-cdk-lib/node_modules/ignore": {
+      "version": "5.3.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/jsonschema": {
+      "version": "1.5.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/aws-cdk-lib/node_modules/mime-db": {
+      "version": "1.52.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/mime-types": {
+      "version": "2.1.35",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/minimatch": {
+      "version": "3.1.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/punycode": {
+      "version": "2.3.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/require-from-string": {
+      "version": "2.0.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/semver": {
+      "version": "7.7.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/string-width": {
+      "version": "4.2.3",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/table": {
+      "version": "6.9.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/universalify": {
+      "version": "2.0.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/aws-cdk-lib/node_modules/yaml": {
+      "version": "1.10.2",
+      "dev": true,
+      "inBundle": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "license": "MIT"
+    },
+    "node_modules/constructs": {
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/constructs/-/constructs-10.4.2.tgz",
+      "integrity": "sha512-wsNxBlAott2qg8Zv87q3eYZYgheb9lchtBfjHzzLHtXbttwSrHPs1NNQbBrmbb1YZvYg2+Vh0Dor76w4mFxJkA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "7.8.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
+      "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}

package.json

@@ -0,0 +1,29 @@
+{
+  "name": "syncrow-web-infrastructure",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc -w",
+    "test": "jest",
+    "build:flutter": "flutter pub get && flutter build web --release",
+    "cdk": "cdk",
+    "infra:deploy": "npm run build:flutter && cdk deploy SyncrowWebStack",
+    "infra:destroy": "cdk destroy SyncrowWebStack",
+    "infra:build": "bash build.sh"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "CDK infrastructure for Syncrow Web Application",
+  "dependencies": {
+    "source-map-support": "^0.5.21"
+  },
+  "devDependencies": {
+    "@types/node": "^24.0.12",
+    "aws-cdk-lib": "^2.204.0",
+    "constructs": "^10.4.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3"
+  }
+}

tsconfig.json

@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": [
+      "es2020"
+    ],
+    "declaration": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": false,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "strictPropertyInitialization": false,
+    "typeRoots": [
+      "./node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "node_modules",
+    "cdk.out",
+    "build",
+    "lib",
+    "test",
+    "assets",
+    "web"
+  ]
+}