From 74ead06cc851b096acd1c1bc1b0f6b987c10d86f Mon Sep 17 00:00:00 2001 From: Thunder22020 Date: Sun, 20 Jul 2025 16:05:23 +0300 Subject: [PATCH 1/2] Some commit # Conflicts: # frontend/.dart_tool/package_config.json # frontend/.dart_tool/package_config_subset --- frontend/.dart_tool/package_config.json | 2 +- frontend/.dart_tool/package_config_subset | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/.dart_tool/package_config.json b/frontend/.dart_tool/package_config.json index fc011c5..46dfdb0 100644 --- a/frontend/.dart_tool/package_config.json +++ b/frontend/.dart_tool/package_config.json @@ -307,4 +307,4 @@ "flutterRoot": "file:///Users/danila/development/flutter", "flutterVersion": "3.32.6", "pubCache": "file:///Users/danila/.pub-cache" -} \ No newline at end of file +} diff --git a/frontend/.dart_tool/package_config_subset b/frontend/.dart_tool/package_config_subset index 9227f1c..321a3cb 100644 --- a/frontend/.dart_tool/package_config_subset +++ b/frontend/.dart_tool/package_config_subset @@ -198,4 +198,4 @@ flutter_web_plugins 3.7 file:///Users/danila/development/flutter/packages/flutter_web_plugins/ file:///Users/danila/development/flutter/packages/flutter_web_plugins/lib/ -2 \ No newline at end of file +2 From 71b503da2f7aea93d370f3b0825e4f67137d12f9 Mon Sep 17 00:00:00 2001 From: Thunder22020 Date: Sun, 20 Jul 2025 18:13:12 +0300 Subject: [PATCH 2/2] MVP3 v4 --- .../in_memory_test_repository.dart | 13 ++++------ .../data/repositories/test_repository.dart | 8 +++--- .../lib/presentation/pages/design_page.dart | 26 +++---------------- .../lib/presentation/pages/loading_page.dart | 9 +++++-- .../presentation/providers/test_provider.dart | 5 ++-- 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/frontend/lib/data/repositories/in_memory_test_repository.dart b/frontend/lib/data/repositories/in_memory_test_repository.dart index 11e2b43..691ea4a 100644 --- a/frontend/lib/data/repositories/in_memory_test_repository.dart +++ b/frontend/lib/data/repositories/in_memory_test_repository.dart @@ -8,17 +8,14 @@ class InMemoryTestRepository extends TestRepository { final List _tests = []; @override - Future> sendUrlForScan({ - required String url, - required List tests, - }) async { + Future> sendUrlForScan( + {required String url, + required List tests, + required bool designTest}) async { final response = await http.post( Uri.parse('https://innotest.tech/api/tests'), headers: {'Content-Type': 'application/json'}, - body: jsonEncode({ - 'url': url, - 'tests': tests, - }), + body: jsonEncode({'url': url, 'tests': tests, 'needUIUX': designTest}), ); if (response.statusCode == 200) { diff --git a/frontend/lib/data/repositories/test_repository.dart b/frontend/lib/data/repositories/test_repository.dart index 087b019..7b2d1cb 100644 --- a/frontend/lib/data/repositories/test_repository.dart +++ b/frontend/lib/data/repositories/test_repository.dart @@ -6,8 +6,8 @@ abstract class TestRepository { void removeTest(String id); void removeAllTests(); - Future> sendUrlForScan({ - required String url, - required List tests, - }); + Future> sendUrlForScan( + {required String url, + required List tests, + required bool designTest}); } diff --git a/frontend/lib/presentation/pages/design_page.dart b/frontend/lib/presentation/pages/design_page.dart index 52726a3..c25174f 100644 --- a/frontend/lib/presentation/pages/design_page.dart +++ b/frontend/lib/presentation/pages/design_page.dart @@ -9,11 +9,12 @@ class DesignPage extends StatelessWidget { const DesignPage({super.key, required this.url, required this.tests}); - void redirectLoadingPage(BuildContext context) { + void redirectLoadingPage(BuildContext context, bool designTest) { Navigator.of(context).push(MaterialPageRoute( builder: (_) => LoadingPage( url: url, tests: tests, + designTest: designTest, ), )); } @@ -70,7 +71,7 @@ class DesignPage extends StatelessWidget { children: [ GestureDetector( onTap: () { - redirectLoadingPage(context); + redirectLoadingPage(context, false); }, child: MouseRegion( cursor: SystemMouseCursors.click, @@ -120,7 +121,7 @@ class DesignPage extends StatelessWidget { ), GestureDetector( onTap: () { - redirectLoadingPage(context); + redirectLoadingPage(context, true); }, child: MouseRegion( cursor: SystemMouseCursors.click, @@ -170,25 +171,6 @@ class DesignPage extends StatelessWidget { ], ), ), - SizedBox( - height: 30, - ), - Container( - alignment: Alignment.center, - width: 145, - height: 40, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - color: Color(0xFFF5F5F5)), - child: Text( - "Never ask again", - style: TextStyle( - fontFamily: "Inter", - fontWeight: FontWeight.w500, - fontSize: 16, - color: Color(0xFF898989)), - ), - ) ], ), ), diff --git a/frontend/lib/presentation/pages/loading_page.dart b/frontend/lib/presentation/pages/loading_page.dart index b34a3c9..7afd42c 100644 --- a/frontend/lib/presentation/pages/loading_page.dart +++ b/frontend/lib/presentation/pages/loading_page.dart @@ -9,8 +9,13 @@ import '../providers/test_provider.dart'; class LoadingPage extends StatefulWidget { final String url; final List tests; + final bool designTest; - const LoadingPage({super.key, required this.tests, required this.url}); + const LoadingPage( + {super.key, + required this.tests, + required this.url, + required this.designTest}); @override State createState() => _LoadingPageState(); @@ -26,7 +31,7 @@ class _LoadingPageState extends State { Future _startTest() async { try { await Provider.of(context, listen: false) - .runTests(widget.url, widget.tests); + .runTests(widget.url, widget.tests, widget.designTest); if (mounted) { Navigator.of(context).pushReplacement( MaterialPageRoute(builder: (_) => const ResultPage()), diff --git a/frontend/lib/presentation/providers/test_provider.dart b/frontend/lib/presentation/providers/test_provider.dart index ce10ee8..8c464b5 100644 --- a/frontend/lib/presentation/providers/test_provider.dart +++ b/frontend/lib/presentation/providers/test_provider.dart @@ -15,8 +15,9 @@ class TestProvider extends ChangeNotifier { TestProvider(this.testRepository); - Future runTests(String url, List tests) async { - _results = await testRepository.sendUrlForScan(url: url, tests: tests); + Future runTests(String url, List tests, bool designTest) async { + _results = await testRepository.sendUrlForScan( + url: url, tests: tests, designTest: designTest); notifyListeners(); }