diff --git a/.circleci/config.yml b/.circleci/config.yml index 15248346a..f7fad1f22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -609,13 +609,12 @@ jobs: working_directory: ~/project/backend check_frontend: docker: - - image: cimg/node:20.18.0-browsers + - image: cimg/node:20.18.0 resource_class: small steps: - checkout: path: ~/project - install_app_toolbelt - - browser-tools/install-chrome - install_dart_linux - install_fvm - run: diff --git a/.circleci/src/jobs/check_frontend.yml b/.circleci/src/jobs/check_frontend.yml index cfa7667c3..37507bf91 100644 --- a/.circleci/src/jobs/check_frontend.yml +++ b/.circleci/src/jobs/check_frontend.yml @@ -1,11 +1,10 @@ docker: - - image: cimg/node:20.18.0-browsers + - image: cimg/node:20.18.0 resource_class: small steps: - checkout: path: ~/project - install_app_toolbelt - - browser-tools/install-chrome - install_dart_linux - install_fvm - run: diff --git a/frontend/.gitignore b/frontend/.gitignore index 41ec52033..b1c832f39 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -34,7 +34,7 @@ lib/graphql/graphql_api.graphql.dart lib/graphql/graphql_api.graphql.g.dart lib/proto -/lib/l10n/translations.g.dart +lib/l10n dist/ diff --git a/frontend/lib/identification/card_detail_view/card_carousel.dart b/frontend/lib/identification/card_detail_view/card_carousel.dart index 9647306b1..ec90447a1 100644 --- a/frontend/lib/identification/card_detail_view/card_carousel.dart +++ b/frontend/lib/identification/card_detail_view/card_carousel.dart @@ -5,7 +5,7 @@ class CardCarousel extends StatefulWidget { final List cards; final int cardIndex; final Function(int index) updateIndex; - final CarouselController carouselController; + final CarouselSliderController carouselController; const CardCarousel( {super.key, diff --git a/frontend/lib/identification/identification_page.dart b/frontend/lib/identification/identification_page.dart index 1288219c8..d50a4ac4b 100644 --- a/frontend/lib/identification/identification_page.dart +++ b/frontend/lib/identification/identification_page.dart @@ -26,7 +26,7 @@ class IdentificationPage extends StatefulWidget { } class IdentificationPageState extends State { - CarouselController carouselController = CarouselController(); + CarouselSliderController carouselController = CarouselSliderController(); int cardIndex = 0; @override diff --git a/frontend/lib/identification/verification_workflow/dialogs/remove_card_confirmation_dialog.dart b/frontend/lib/identification/verification_workflow/dialogs/remove_card_confirmation_dialog.dart index d9903401d..3d97de317 100644 --- a/frontend/lib/identification/verification_workflow/dialogs/remove_card_confirmation_dialog.dart +++ b/frontend/lib/identification/verification_workflow/dialogs/remove_card_confirmation_dialog.dart @@ -8,14 +8,14 @@ import 'package:provider/provider.dart'; class RemoveCardConfirmationDialog extends StatefulWidget { final DynamicUserCode userCode; - final CarouselController carouselController; + final CarouselSliderController carouselController; const RemoveCardConfirmationDialog({super.key, required this.userCode, required this.carouselController}); static Future show( {required BuildContext context, required DynamicUserCode userCode, - required CarouselController carouselController}) => + required CarouselSliderController carouselController}) => showDialog( context: context, builder: (_) => RemoveCardConfirmationDialog(userCode: userCode, carouselController: carouselController), diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart index 2474a2e44..e3cf45641 100644 --- a/frontend/lib/main.dart +++ b/frontend/lib/main.dart @@ -8,7 +8,7 @@ import 'package:ehrenamtskarte/settings_provider.dart'; import 'package:ehrenamtskarte/util/android_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:slang/builder/model/enums.dart'; +import 'package:slang/overrides.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock index 7f56fd0ce..5df2daa1b 100644 --- a/frontend/pubspec.lock +++ b/frontend/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: transitive description: name: build_daemon - sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9" url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" build_resolvers: dependency: transitive description: @@ -101,18 +101,18 @@ packages: dependency: "direct dev" description: name: build_runner - sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.4.11" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.3.1" built_collection: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: "direct main" description: name: carousel_slider - sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42" + sha256: "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae" url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "5.0.0" characters: dependency: transitive description: @@ -197,26 +197,26 @@ packages: dependency: transitive description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" coverage: dependency: transitive description: name: coverage - sha256: "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e" + sha256: "4b03e11f6d5b8f6e5bb5e9f7889a56fe6c5cbe942da5378ea4d4d7f73ef9dfe5" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" crypto: dependency: "direct main" description: name: crypto - sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.6" csv: dependency: transitive description: @@ -253,10 +253,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95 url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "11.1.1" device_info_plus_platform_interface: dependency: transitive description: @@ -416,18 +416,18 @@ packages: dependency: transitive description: name: frontend_server_client - sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "4.0.0" geolocator: dependency: "direct main" description: name: geolocator - sha256: "6cb9fb6e5928b58b9a84bdf85012d757fd07aab8215c5205337021c4999bad27" + sha256: "149876cc5207a0f5daf4fdd3bfcf0a0f27258b3fe95108fa084f527ad0568f1b" url: "https://pub.dev" source: hosted - version: "11.1.0" + version: "12.0.0" geolocator_android: dependency: "direct main" description: @@ -440,10 +440,10 @@ packages: dependency: transitive description: name: geolocator_apple - sha256: bc2aca02423ad429cb0556121f56e60360a2b7d694c8570301d06ea0c00732fd + sha256: "6154ea2682563f69fc0125762ed7e91e7ed85d0b9776595653be33918e064807" url: "https://pub.dev" source: hosted - version: "2.3.7" + version: "2.3.8+1" geolocator_platform_interface: dependency: transitive description: @@ -456,10 +456,10 @@ packages: dependency: transitive description: name: geolocator_web - sha256: "49d8f846ebeb5e2b6641fe477a7e97e5dd73f03cbfef3fd5c42177b7300fb0ed" + sha256: "2ed69328e05cd94e7eb48bb0535f5fc0c0c44d1c4fa1e9737267484d05c29b5e" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.1.1" geolocator_windows: dependency: transitive description: @@ -552,10 +552,10 @@ packages: dependency: transitive description: name: graphql - sha256: bda5b794345087ccbd16942045be8091e2ac4619285bb22e73555d5fd88c4043 + sha256: b061201579040e9548cec2bae17bbdea0ab30666cb4e7ba48b9675f14d982199 url: "https://pub.dev" source: hosted - version: "5.2.0-beta.1" + version: "5.1.3" graphql_flutter: dependency: "direct main" description: @@ -568,10 +568,10 @@ packages: dependency: transitive description: name: graphs - sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" hive: dependency: transitive description: @@ -616,10 +616,10 @@ packages: dependency: "direct main" description: name: infinite_scroll_pagination - sha256: b68bce20752fcf36c7739e60de4175494f74e99e9a69b4dd2fe3a1dd07a7f16a + sha256: "4047eb8191e8b33573690922a9e995af64c3949dc87efc844f936b039ea279df" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" intl: dependency: "direct main" description: @@ -701,7 +701,7 @@ packages: source: hosted version: "3.0.1" lint: - dependency: "direct dev" + dependency: transitive description: name: lint sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565 @@ -712,18 +712,18 @@ packages: dependency: "direct dev" description: name: lints - sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "4.0.0" logging: dependency: transitive description: name: logging - sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" maplibre_gl: dependency: "direct main" description: @@ -835,10 +835,10 @@ packages: dependency: transitive description: name: normalize - sha256: "8a60e37de5b608eeaf9b839273370c71ebba445e9f73b08eee7725e0d92dbc43" + sha256: baf8caf2d8b745af5737cca6c24f7fe3cf3158897fdbcde9a909b9c8d3e2e5af url: "https://pub.dev" source: hosted - version: "0.8.2+1" + version: "0.7.2" otp: dependency: "direct main" description: @@ -859,18 +859,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.1.1" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" path: dependency: transitive description: @@ -883,26 +883,26 @@ packages: dependency: transitive description: name: path_parsing - sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" path_provider: dependency: transitive description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" url: "https://pub.dev" source: hosted - version: "2.2.4" + version: "2.2.10" path_provider_foundation: dependency: transitive description: @@ -963,10 +963,10 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 + sha256: "6b9cb54b7135073841a35513fba39e598b421702d5f4d92319992fd6eb5532a9" url: "https://pub.dev" source: hosted - version: "0.1.3+2" + version: "0.1.3+4" permission_handler_platform_interface: dependency: transitive description: @@ -1076,10 +1076,10 @@ packages: dependency: transitive description: name: qr - sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3" + sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.2" qr_flutter: dependency: "direct main" description: @@ -1108,34 +1108,34 @@ packages: dependency: transitive description: name: sentry - sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd" + sha256: "2440763ae96fa8fd1bcdfc224f5232e1b7a09af76a72f4e626ee313a261faf6f" url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.10.1" sentry_flutter: dependency: "direct main" description: name: sentry_flutter - sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a" + sha256: "3b30038b3b9303540a8b2c8b1c8f0bb93a207f8e4b25691c59d969ddeb4734fd" url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.10.1" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.3" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.2" shared_preferences_foundation: dependency: transitive description: @@ -1164,10 +1164,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "59dc807b94d29d52ddbb1b3c0d3b9d0a67fc535a64e62a5542c8db0513fcb6c2" + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" shared_preferences_windows: dependency: transitive description: @@ -1217,26 +1217,26 @@ packages: dependency: "direct main" description: name: slang - sha256: a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed + sha256: "0af2983d4863f9b57f7a28f47fdd86df4ada462e1fad727b47e6bf5fc64d0060" url: "https://pub.dev" source: hosted - version: "3.32.0" + version: "4.2.1" slang_build_runner: dependency: "direct dev" description: name: slang_build_runner - sha256: b2e0c63f3c801a4aa70b4ca43173893d6eb7d5a421fc9d97ad983527397631b3 + sha256: "2c0f2790ad0f68210c151fefee86b863c483f315816cbe59496dbbe744ef90e2" url: "https://pub.dev" source: hosted - version: "3.32.0" + version: "4.2.0" slang_flutter: dependency: "direct main" description: name: slang_flutter - sha256: "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7" + sha256: "1693804c4c16a14134e753e48e488dca6a86ad682d5faf3c9c53e80b7b2e6b49" url: "https://pub.dev" source: hosted - version: "3.32.0" + version: "4.2.0" sliver_tools: dependency: transitive description: @@ -1401,10 +1401,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" + sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79 url: "https://pub.dev" source: hosted - version: "6.3.2" + version: "6.3.9" url_launcher_ios: dependency: transitive description: @@ -1417,10 +1417,10 @@ packages: dependency: transitive description: name: url_launcher_linux - sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af + sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" url_launcher_macos: dependency: transitive description: @@ -1513,18 +1513,18 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.2.0" webkit_inspection_protocol: dependency: transitive description: @@ -1537,18 +1537,18 @@ packages: dependency: transitive description: name: win32 - sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb" + sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.5.4" win32_registry: dependency: transitive description: name: win32_registry - sha256: "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb" + sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.1.5" xdg_directories: dependency: transitive description: diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml index a7cef3860..49e87c091 100644 --- a/frontend/pubspec.yaml +++ b/frontend/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: flutter: sdk: flutter - device_info_plus: ^10.0.1 + device_info_plus: ^11.1.1 flutter_localizations: sdk: flutter intl: ^0.19.0 @@ -24,33 +24,33 @@ dependencies: provider: ^6.0.3 graphql_flutter: ^5.1.2 url_launcher: ^6.2.5 - flutter_svg: ^2.0.2 + flutter_svg: ^2.0.9 permission_handler: ^11.3.0 - package_info_plus: ^4.0.1 # for about dialog + package_info_plus: ^8.1.1 # for about dialog mobile_scanner: ^4.0.1 fixnum: ^1.1.0 # Locking this version due to this issue https://github.com/mogol/flutter_secure_storage/issues/762 flutter_secure_storage: 9.0.0 - infinite_scroll_pagination: ^4.0.0 - geolocator: ^11.0.0 + infinite_scroll_pagination: ^4.1.0 + geolocator: ^12.0.0 geolocator_android: ^4.3.1 protobuf: ^3.1.0 base32: ^2.1.3 qr_flutter: ^4.0.0 otp: ^3.1.3 - crypto: ^3.0.2 + crypto: ^3.0.6 intro_slider: ^4.2.0 - shared_preferences: ^2.0.18 + shared_preferences: ^2.3.3 tinycolor2: ^3.0.1 - sentry_flutter: ^8.4.0 - carousel_slider: ^4.2.1 - slang: ^3.25.0 - slang_flutter: ^3.25.0 + sentry_flutter: ^8.10.1 + carousel_slider: ^5.0.0 + slang: ^4.2.1 + slang_flutter: ^4.2.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.5 - collection: ^1.17.0 + collection: ^1.18.0 meta: ^1.8.0 http: ^0.13.5 equatable: ^2.0.5 @@ -60,7 +60,7 @@ dependencies: go_router: 13.2.1 dev_dependencies: - build_runner: ^2.3.3 + build_runner: ^2.4.11 # We can use the version from pub.dev once the following PR is merged: # https://github.com/pikaju/dart-protoc-builder/pull/21 # For now, we pin the version of the mentioned PR: @@ -69,13 +69,13 @@ dev_dependencies: url: https://github.com/fischerscode/dart-protoc-builder.git ref: fb036776680fb11ac01300915663b72d42213a4b protoc_plugin: ^21.1.2 - slang_build_runner: ^3.25.0 + slang_build_runner: ^4.2.0 df_build_config: path: ./pubs/df_build_config flutter_test: sdk: flutter json_serializable: ^6.3.1 - lints: ^3.0.0 + lints: ^4.0.0 test: '>=1.0.0' mocktail: ^1.0.4 @@ -83,7 +83,6 @@ dev_dependencies: artemis: '>=6.0.0' # only if you're using ArtemisClient! json_annotation: ^4.7.0 gql: '>=0.12.3 <1.0.0' - lint: ^2.0.1 # For information on the generic Dart part of this file, see the