From d0530f7fc362e4d2cab6bba6793859a9eac7c01f Mon Sep 17 00:00:00 2001 From: Abdullah Alassaf Date: Wed, 4 Dec 2024 09:57:29 +0300 Subject: [PATCH 01/13] Added staging space and community IDs --- lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart index c1f3b39d..1c6666db 100644 --- a/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart +++ b/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart @@ -19,8 +19,8 @@ import 'package:uuid/uuid.dart'; part 'routine_event.dart'; part 'routine_state.dart'; -const spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6'; -const communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9'; +const spaceId = '9cb9da1f-adbe-4688-bf55-29e7584007a7'; +const communityId = '68dd94cf-0240-4ccf-8c26-df506246a0dd'; class RoutineBloc extends Bloc { RoutineBloc() : super(const RoutineState()) { From b0abd42b0c0c822697bea53d723c23110b740dc8 Mon Sep 17 00:00:00 2001 From: mohammad Date: Thu, 6 Feb 2025 11:28:40 +0300 Subject: [PATCH 02/13] projectId --- .../users_page/users_table/view/users_page.dart | 1 - lib/services/user_permission.dart | 6 +++--- lib/utils/constants/api_const.dart | 2 +- lib/utils/constants/temp_const.dart | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart b/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart index a94756f1..9794a068 100644 --- a/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart +++ b/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart @@ -17,7 +17,6 @@ import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/constants/assets.dart'; import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/style.dart'; - class UsersPage extends StatelessWidget { UsersPage({super.key}); diff --git a/lib/services/user_permission.dart b/lib/services/user_permission.dart index e4f097f4..13a0925e 100644 --- a/lib/services/user_permission.dart +++ b/lib/services/user_permission.dart @@ -70,7 +70,7 @@ class UserPermissionApi { "jobTitle": jobTitle != '' ? jobTitle : null, "phoneNumber": phoneNumber != '' ? phoneNumber : null, "roleUuid": roleUuid, - "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c", + "projectUuid": "bcda711e-9fc2-4168-a05e-171b4026d1ff", "spaceUuids": spaceUuids, }; final response = await _httpService.post( @@ -149,7 +149,7 @@ class UserPermissionApi { "jobTitle": jobTitle != '' ? jobTitle : " ", "phoneNumber": phoneNumber != '' ? phoneNumber : " ", "roleUuid": roleUuid, - "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c", + "projectUuid": "bcda711e-9fc2-4168-a05e-171b4026d1ff", "spaceUuids": spaceUuids, }; final response = await _httpService.put( @@ -190,7 +190,7 @@ class UserPermissionApi { try { Map bodya = { "disable": status, - "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c" + "projectUuid": "bcda711e-9fc2-4168-a05e-171b4026d1ff" }; final response = await _httpService.put( diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart index 80c3c830..10d829e2 100644 --- a/lib/utils/constants/api_const.dart +++ b/lib/utils/constants/api_const.dart @@ -1,7 +1,7 @@ import 'package:flutter_dotenv/flutter_dotenv.dart'; abstract class ApiEndpoints { - static const String projectUuid = "0e62577c-06fa-41b9-8a92-99a21fbaf51c"; + static const String projectUuid = "bcda711e-9fc2-4168-a05e-171b4026d1ff"; static String baseUrl = dotenv.env['BASE_URL'] ?? ''; static const String signUp = '/authentication/user/signup'; static const String login = '/authentication/user/login'; diff --git a/lib/utils/constants/temp_const.dart b/lib/utils/constants/temp_const.dart index e5847b98..f7bb3b85 100644 --- a/lib/utils/constants/temp_const.dart +++ b/lib/utils/constants/temp_const.dart @@ -1,3 +1,3 @@ class TempConst { - static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c'; + static const projectId = 'bcda711e-9fc2-4168-a05e-171b4026d1ff'; } From 36ee22603a79e3ce76f1801f2354e41fb0742950 Mon Sep 17 00:00:00 2001 From: mohammad Date: Mon, 10 Feb 2025 12:44:35 +0300 Subject: [PATCH 03/13] fixes CommunityId and spaceUuid --- lib/pages/space_tree/bloc/space_tree_bloc.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/space_tree/bloc/space_tree_bloc.dart b/lib/pages/space_tree/bloc/space_tree_bloc.dart index b2354574..aeebc35d 100644 --- a/lib/pages/space_tree/bloc/space_tree_bloc.dart +++ b/lib/pages/space_tree/bloc/space_tree_bloc.dart @@ -6,8 +6,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model import 'package:syncrow_web/services/space_mana_api.dart'; class SpaceTreeBloc extends Bloc { - String selectedCommunityId = '9cb9da1f-adbe-4688-bf55-29e7584007a7'; - String selectedSpaceId = '68dd94cf-0240-4ccf-8c26-df506246a0dd'; + String selectedCommunityId = '68dd94cf-0240-4ccf-8c26-df506246a0dd' ; + String selectedSpaceId ='9cb9da1f-adbe-4688-bf55-29e7584007a7'; SpaceTreeBloc() : super(const SpaceTreeState()) { on(_fetchSpaces); From 21cc25cfc48be982a35b0dee86e14595ab196ab2 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Wed, 19 Feb 2025 17:58:53 +0400 Subject: [PATCH 04/13] fix endpoints --- lib/services/user_permission.dart | 2 +- lib/utils/constants/api_const.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/services/user_permission.dart b/lib/services/user_permission.dart index c266901f..90a82921 100644 --- a/lib/services/user_permission.dart +++ b/lib/services/user_permission.dart @@ -14,7 +14,7 @@ class UserPermissionApi { Future> fetchUsers(String projectId) async { try { final response = await _httpService.get( - path: ApiEndpoints.getUsers.replaceAll('{projectUuid}', projectId), + path: ApiEndpoints.getUsers.replaceAll('{projectId}', projectId), showServerMessage: true, expectedResponseModel: (json) { debugPrint('fetchUsers Response: $json'); diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart index 1dfa7f17..830a5168 100644 --- a/lib/utils/constants/api_const.dart +++ b/lib/utils/constants/api_const.dart @@ -95,8 +95,8 @@ abstract class ApiEndpoints { static const String inviteUser = '/invite-user'; static const String checkEmail = '/invite-user/check-email'; - static const String getUsers = '/projects/{projectUuid}/user'; - static const String getUserById = '/projects/{projectUuid}/user/{userUuid}'; + static const String getUsers = '/projects/{projectId}/user'; + static const String getUserById = '/projects/{projectId}/user/{userUuid}'; static const String editUser = '/invite-user/{inviteUserUuid}'; static const String deleteUser = '/invite-user/{inviteUserUuid}'; static const String changeUserStatus = '/invite-user/{invitedUserUuid}/disable'; From 7efd1c3c87ec5a45c9139ad0c43593d8cc72bc69 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Thu, 20 Feb 2025 11:34:24 +0400 Subject: [PATCH 05/13] Fixed cursor issue --- lib/common/dialog_textfield_dropdown.dart | 109 +++++++++++----------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/lib/common/dialog_textfield_dropdown.dart b/lib/common/dialog_textfield_dropdown.dart index 807f3417..a63f095a 100644 --- a/lib/common/dialog_textfield_dropdown.dart +++ b/lib/common/dialog_textfield_dropdown.dart @@ -20,15 +20,22 @@ class DialogTextfieldDropdown extends StatefulWidget { class _DialogTextfieldDropdownState extends State { bool _isOpen = false; - late OverlayEntry _overlayEntry; + OverlayEntry? _overlayEntry; final TextEditingController _controller = TextEditingController(); - late List _filteredItems; // Filtered items list + final FocusNode _focusNode = FocusNode(); + List _filteredItems = []; @override void initState() { super.initState(); - _controller.text = widget.initialValue ?? 'Select Tag'; - _filteredItems = List.from(widget.items); // Initialize filtered items + _controller.text = widget.initialValue ?? ''; + _filteredItems = List.from(widget.items); + + _focusNode.addListener(() { + if (!_focusNode.hasFocus) { + _closeDropdown(); + } + }); } void _toggleDropdown() { @@ -41,13 +48,16 @@ class _DialogTextfieldDropdownState extends State { void _openDropdown() { _overlayEntry = _createOverlayEntry(); - Overlay.of(context).insert(_overlayEntry); + Overlay.of(context).insert(_overlayEntry!); _isOpen = true; } void _closeDropdown() { - _overlayEntry.remove(); - _isOpen = false; + if (_isOpen && _overlayEntry != null) { + _overlayEntry!.remove(); + _overlayEntry = null; + _isOpen = false; + } } OverlayEntry _createOverlayEntry() { @@ -58,9 +68,7 @@ class _DialogTextfieldDropdownState extends State { return OverlayEntry( builder: (context) { return GestureDetector( - onTap: () { - _closeDropdown(); - }, + onTap: _closeDropdown, behavior: HitTestBehavior.translucent, child: Stack( children: [ @@ -72,40 +80,29 @@ class _DialogTextfieldDropdownState extends State { elevation: 4.0, child: Container( color: ColorsManager.whiteColors, - constraints: const BoxConstraints( - maxHeight: 200.0, - ), - child: ListView.builder( - shrinkWrap: true, - itemCount: _filteredItems.length, - itemBuilder: (context, index) { - final item = _filteredItems[index]; - return Container( - decoration: const BoxDecoration( - border: Border( - bottom: BorderSide( - color: ColorsManager.lightGrayBorderColor, - width: 1.0, - ), - ), - ), - child: ListTile( - title: Text(item, - style: Theme.of(context) - .textTheme - .bodyMedium - ?.copyWith( - color: ColorsManager.textPrimaryColor)), - onTap: () { - _controller.text = item; - widget.onSelected(item); - setState(() { - _filteredItems - .remove(item); // Remove selected item - }); - _closeDropdown(); - }, - ), + constraints: const BoxConstraints(maxHeight: 200.0), + child: StatefulBuilder( + builder: (context, setStateDropdown) { + return ListView.builder( + shrinkWrap: true, + itemCount: _filteredItems.length, + itemBuilder: (context, index) { + final item = _filteredItems[index]; + return ListTile( + title: Text(item, + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith( + color: + ColorsManager.textPrimaryColor)), + onTap: () { + _controller.text = item; + widget.onSelected(item); + _closeDropdown(); + }, + ); + }, ); }, ), @@ -122,7 +119,8 @@ class _DialogTextfieldDropdownState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: _toggleDropdown, + onTap: () => FocusScope.of(context).unfocus(), + behavior: HitTestBehavior.opaque, child: Container( padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0), decoration: BoxDecoration( @@ -135,23 +133,26 @@ class _DialogTextfieldDropdownState extends State { Expanded( child: TextFormField( controller: _controller, - onChanged: (value) { - setState(() { - _filteredItems = widget.items - .where((item) => - item.toLowerCase().contains(value.toLowerCase())) - .toList(); // Filter items dynamically - }); + focusNode: _focusNode, + onFieldSubmitted: (value) { widget.onSelected(value); + _closeDropdown(); + }, + onTapOutside: (event) { + widget.onSelected(_controller.text); + _closeDropdown(); }, style: Theme.of(context).textTheme.bodyMedium, decoration: const InputDecoration( - hintText: 'Enter or Select tag', + hintText: 'Enter or Select a tag', border: InputBorder.none, ), ), ), - const Icon(Icons.arrow_drop_down), + GestureDetector( + onTap: _toggleDropdown, + child: const Icon(Icons.arrow_drop_down), + ), ], ), ), From 4a8b8a32ba704b177a8c8cdd68b1e48e86d828b8 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Thu, 20 Feb 2025 11:49:35 +0400 Subject: [PATCH 06/13] added back border of tag list --- lib/common/dialog_textfield_dropdown.dart | 41 ++++++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/lib/common/dialog_textfield_dropdown.dart b/lib/common/dialog_textfield_dropdown.dart index a63f095a..ac88e5dc 100644 --- a/lib/common/dialog_textfield_dropdown.dart +++ b/lib/common/dialog_textfield_dropdown.dart @@ -88,19 +88,34 @@ class _DialogTextfieldDropdownState extends State { itemCount: _filteredItems.length, itemBuilder: (context, index) { final item = _filteredItems[index]; - return ListTile( - title: Text(item, - style: Theme.of(context) - .textTheme - .bodyMedium - ?.copyWith( - color: - ColorsManager.textPrimaryColor)), - onTap: () { - _controller.text = item; - widget.onSelected(item); - _closeDropdown(); - }, + + return Container( + decoration: const BoxDecoration( + border: Border( + bottom: BorderSide( + color: ColorsManager.lightGrayBorderColor, + width: 1.0, + ), + ), + ), + child: ListTile( + title: Text(item, + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith( + color: ColorsManager + .textPrimaryColor)), + onTap: () { + _controller.text = item; + widget.onSelected(item); + setState(() { + _filteredItems + .remove(item); // Remove selected item + }); + _closeDropdown(); + }, + ), ); }, ); From fe4e7759022f7ee8d2d4f5469614f82fa908d0ae Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Thu, 20 Feb 2025 13:35:59 +0400 Subject: [PATCH 07/13] fixed endpoint --- lib/utils/constants/api_const.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart index 830a5168..32dfcc4c 100644 --- a/lib/utils/constants/api_const.dart +++ b/lib/utils/constants/api_const.dart @@ -25,7 +25,7 @@ abstract class ApiEndpoints { ////// Devices Management //////////////// - static const String getAllDevices = '/projects/{projectId}/device'; + static const String getAllDevices = '/projects/{projectId}/devices'; static const String getSpaceDevices = '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices'; static const String getDeviceStatus = '/device/{uuid}/functions/status'; From 56c613fb0c1e898d54a5e4c0613dc2cf9aecaf8f Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Thu, 8 May 2025 14:32:08 +0300 Subject: [PATCH 08/13] Disabled Syncrow Analytics feature for release purposes. --- .../analytics/widgets/charts_loading_widget.dart | 3 ++- lib/pages/home/bloc/home_bloc.dart | 13 ------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/pages/analytics/widgets/charts_loading_widget.dart b/lib/pages/analytics/widgets/charts_loading_widget.dart index 00a703aa..cf81fee7 100644 --- a/lib/pages/analytics/widgets/charts_loading_widget.dart +++ b/lib/pages/analytics/widgets/charts_loading_widget.dart @@ -14,8 +14,9 @@ class ChartsLoadingWidget extends StatelessWidget { child: const SizedBox.square( dimension: 16, child: FittedBox( - child: CircularProgressIndicator( + child: Padding( padding: EdgeInsetsDirectional.only(end: 8), + child: CircularProgressIndicator(), ), ), ), diff --git a/lib/pages/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart index 33d55628..df9304bc 100644 --- a/lib/pages/home/bloc/home_bloc.dart +++ b/lib/pages/home/bloc/home_bloc.dart @@ -143,19 +143,6 @@ class HomeBloc extends Bloc { color: ColorsManager.primaryColor, ), - HomeItemModel( - title: 'Syncrow Analytics', - icon: Assets.devicesIcon, - active: true, - onPress: (context) { - context.read().add(ClearCachedData()); - BlocProvider.of(context) - .add(const TriggerSwitchTabsEvent(isRoutineTab: false)); - context.go(RoutesConst.analytics); - }, - color: ColorsManager.primaryColor, - ), - // HomeItemModel( // title: 'Move in', // icon: Assets.moveinIcon, From 8a25fa798c4d73db39c684bf5d8636500cf1c0ee Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 28 May 2025 14:26:33 +0300 Subject: [PATCH 09/13] Created `pull_request_template.md`. --- .github/pull_request_template.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..d18a89f3 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,30 @@ + + +## Jira Ticket + + +## Status + +**READY/IN DEVELOPMENT/HOLD** + +## Description + + + +## Type of Change + + + +- [ ] โœจ New feature (non-breaking change which adds functionality) +- [ ] ๐Ÿ› ๏ธ Bug fix (non-breaking change which fixes an issue) +- [ ] โŒ Breaking change (fix or feature that would cause existing functionality to change) +- [ ] ๐Ÿงน Code refactor +- [ ] โœ… Build configuration change +- [ ] ๐Ÿ“ Documentation +- [ ] ๐Ÿ—‘๏ธ Chore \ No newline at end of file From 6b3eca23af59d35af382e1814f5377c2d8f7694d Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 28 May 2025 16:46:24 +0300 Subject: [PATCH 10/13] Update pull_request_template.md --- .github/pull_request_template.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d18a89f3..70d6e519 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,11 +7,7 @@ --> ## Jira Ticket - - -## Status - -**READY/IN DEVELOPMENT/HOLD** +[SP-0000](https://syncrow.atlassian.net/browse/SP-0000) ## Description @@ -27,4 +23,4 @@ - [ ] ๐Ÿงน Code refactor - [ ] โœ… Build configuration change - [ ] ๐Ÿ“ Documentation -- [ ] ๐Ÿ—‘๏ธ Chore \ No newline at end of file +- [ ] ๐Ÿ—‘๏ธ Chore From f19120c75495da9f20357bbc37a9de0133bea562 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 4 Jun 2025 10:12:19 +0300 Subject: [PATCH 11/13] enhanced ci/cd by not running the deply jobs on the PR itself, and now we only deploy when we merged a PR to `dev` or `main`, and created a separate GitHub action that only builds and install dependencies, which only runs on the PR itself. --- ...e-static-web-apps-mango-bush-01e607f10.yml | 4 --- ...static-web-apps-polite-smoke-017c65c10.yml | 6 ---- .github/workflows/pr-check.yml | 29 +++++++++++++++++++ 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/pr-check.yml diff --git a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml index db94e74f..892381f3 100644 --- a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml +++ b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml @@ -4,10 +4,6 @@ on: push: branches: - main - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - main jobs: build_and_deploy_job: diff --git a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml index 738bd279..6a91fe27 100644 --- a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml +++ b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml @@ -4,18 +4,12 @@ on: push: branches: - dev - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - dev jobs: build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') runs-on: ubuntu-latest name: Build and Deploy Job steps: - - name: Checkout Code uses: actions/checkout@v3 with: diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml new file mode 100644 index 00000000..621a54d3 --- /dev/null +++ b/.github/workflows/pr-check.yml @@ -0,0 +1,29 @@ +name: Pull Request Check + +on: + pull_request: + branches: + - dev + - main + +jobs: + setup_flutter: + runs-on: ubuntu-latest + name: Setup Flutter and Dependencies + steps: + - name: Checkout Code + uses: actions/checkout@v3 + with: + submodules: true + lfs: false + + - name: Set up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: '3.27.3' + + - name: Install dependencies + run: flutter pub get + + - name: Run Flutter Build + run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart From 4f988919020912c6753746337431b2fd8c3c8d45 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 4 Jun 2025 13:13:07 +0300 Subject: [PATCH 12/13] Created `dependabot.yaml` --- .github/.github/dependabot.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/.github/dependabot.yaml diff --git a/.github/.github/dependabot.yaml b/.github/.github/dependabot.yaml new file mode 100644 index 00000000..8ce92757 --- /dev/null +++ b/.github/.github/dependabot.yaml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "pub" + directory: "/" + schedule: + interval: "daily" From cdbd90b54c64bd6cbdb2ce9ff53de63bfc64de19 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 11 Jun 2025 09:52:08 +0300 Subject: [PATCH 13/13] Revert "enhanced ci/cd by not running the deply jobs on the PR itself, and now we only deploy when we merged a PR to `dev` or `main`, and created a separate GitHub action that only builds and install dependencies, which only runs on the PR itself." This reverts commit f19120c75495da9f20357bbc37a9de0133bea562. --- ...e-static-web-apps-mango-bush-01e607f10.yml | 4 +++ ...static-web-apps-polite-smoke-017c65c10.yml | 6 ++++ .github/workflows/pr-check.yml | 29 ------------------- 3 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/pr-check.yml diff --git a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml index 892381f3..db94e74f 100644 --- a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml +++ b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml @@ -4,6 +4,10 @@ on: push: branches: - main + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - main jobs: build_and_deploy_job: diff --git a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml index 6a91fe27..738bd279 100644 --- a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml +++ b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml @@ -4,12 +4,18 @@ on: push: branches: - dev + pull_request: + types: [opened, synchronize, reopened, closed] + branches: + - dev jobs: build_and_deploy_job: + if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') runs-on: ubuntu-latest name: Build and Deploy Job steps: + - name: Checkout Code uses: actions/checkout@v3 with: diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml deleted file mode 100644 index 621a54d3..00000000 --- a/.github/workflows/pr-check.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Pull Request Check - -on: - pull_request: - branches: - - dev - - main - -jobs: - setup_flutter: - runs-on: ubuntu-latest - name: Setup Flutter and Dependencies - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - submodules: true - lfs: false - - - name: Set up Flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: '3.27.3' - - - name: Install dependencies - run: flutter pub get - - - name: Run Flutter Build - run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart