From 8dfa2e5843ee2a4ed1a4336943e94f90b0356ffb Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Fri, 31 Mar 2023 01:51:20 +0200 Subject: [PATCH] refactor: full package names --- .../lib/data/fight_result.dart | 2 +- .../lib/data/fight_role.dart | 2 +- .../lib/data/gender.dart | 2 +- .../lib/data/wrestling_style.dart | 2 +- wrestling_scoreboard_client/lib/main.dart | 4 +- .../lib/mocks/mock_data_provider.dart | 4 +- .../lib/mocks/mocks.dart | 2 +- .../lib/ui/components/consumer.dart | 8 ++-- .../lib/ui/components/edit.dart | 2 +- .../lib/ui/components/info.dart | 4 +- .../lib/ui/edit/bout_config_edit.dart | 8 ++-- .../lib/ui/edit/club_edit.dart | 6 +-- .../lib/ui/edit/league_edit.dart | 8 ++-- .../lib/ui/edit/league_weight_class_edit.dart | 6 +-- .../lib/ui/edit/lineup_edit.dart | 12 +++--- .../lib/ui/edit/membership_edit.dart | 6 +-- .../lib/ui/edit/person_edit.dart | 12 +++--- .../lib/ui/edit/team_edit.dart | 8 ++-- .../lib/ui/edit/team_match_edit.dart | 10 ++--- .../lib/ui/edit/weight_class_edit.dart | 10 ++--- .../lib/ui/fight/fight_action_controls.dart | 4 +- .../lib/ui/fight/fight_actions.dart | 6 +-- .../lib/ui/fight/fight_main_controls.dart | 8 ++-- .../lib/ui/fight/fight_screen.dart | 26 ++++++------- .../lib/ui/fight/fight_shortcuts.dart | 6 +-- .../lib/ui/fight/technical_points.dart | 12 +++--- .../lib/ui/fight/time_display.dart | 4 +- .../lib/ui/home/home.dart | 16 ++++---- .../lib/ui/match/common_elements.dart | 4 +- .../lib/ui/match/match_sequence.dart | 16 ++++---- .../ui/models/participant_state_model.dart | 2 +- .../lib/ui/overview/club_overview.dart | 20 +++++----- .../lib/ui/overview/league_overview.dart | 24 ++++++------ .../league_weight_class_overview.dart | 10 ++--- .../lib/ui/overview/membership_overview.dart | 12 +++--- .../lib/ui/overview/person_overview.dart | 16 ++++---- .../lib/ui/overview/team_match_overview.dart | 16 ++++---- .../lib/ui/overview/team_overview.dart | 18 ++++----- .../ui/overview/weight_class_overview.dart | 14 +++---- .../lib/ui/settings/settings.dart | 10 ++--- .../lib/util/audio/audio.dart | 4 +- .../lib/util/network/data_provider.dart | 6 +-- .../lib/util/network/remote/rest.dart | 10 ++--- .../lib/util/network/remote/web_socket.dart | 6 +-- .../flutter/generated_plugin_registrant.cc | 4 -- .../linux/flutter/generated_plugins.cmake | 1 - wrestling_scoreboard_client/pubspec.lock | 14 +++---- wrestling_scoreboard_client/pubspec.yaml | 4 +- .../test/data/person_test.dart | 2 +- .../test/widget_test.dart | 2 +- .../flutter/generated_plugin_registrant.cc | 3 -- .../windows/flutter/generated_plugins.cmake | 1 - .../windows/runner/Runner.rc | 2 +- wrestling_scoreboard_server/bin/server.dart | 2 +- .../controllers/bout_config_controller.dart | 4 +- .../lib/controllers/club_controller.dart | 8 ++-- .../lib/controllers/entity_controller.dart | 38 +++++++++---------- .../controllers/fight_action_controller.dart | 2 +- .../lib/controllers/fight_controller.dart | 2 +- .../lib/controllers/league_controller.dart | 10 ++--- .../league_weight_class_controller.dart | 2 +- .../lib/controllers/lineup_controller.dart | 2 +- .../controllers/membership_controller.dart | 2 +- .../participant_state_controller.dart | 2 +- .../controllers/participation_controller.dart | 2 +- .../lib/controllers/person_controller.dart | 2 +- .../lib/controllers/team_controller.dart | 4 +- .../controllers/team_match_controller.dart | 14 +++---- .../team_match_fight_controller.dart | 2 +- .../controllers/tournament_controller.dart | 2 +- .../tournament_fight_controller.dart | 2 +- .../lib/controllers/websocket_handler.dart | 20 +++++----- .../controllers/weight_class_controller.dart | 2 +- .../lib/middleware/cors.dart | 2 +- .../lib/routes/api_route.dart | 2 +- wrestling_scoreboard_server/lib/server.dart | 6 +-- .../lib/services/postgres_db.dart | 2 +- wrestling_scoreboard_server/pubspec.lock | 14 +++---- wrestling_scoreboard_server/pubspec.yaml | 2 +- 79 files changed, 282 insertions(+), 291 deletions(-) diff --git a/wrestling_scoreboard_client/lib/data/fight_result.dart b/wrestling_scoreboard_client/lib/data/fight_result.dart index 7a7887b6..cc089620 100644 --- a/wrestling_scoreboard_client/lib/data/fight_result.dart +++ b/wrestling_scoreboard_client/lib/data/fight_result.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/wrestling_scoreboard_client/lib/data/fight_role.dart b/wrestling_scoreboard_client/lib/data/fight_role.dart index 1b652255..ed4a594f 100644 --- a/wrestling_scoreboard_client/lib/data/fight_role.dart +++ b/wrestling_scoreboard_client/lib/data/fight_role.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; MaterialColor getColorFromFightRole(FightRole role) { diff --git a/wrestling_scoreboard_client/lib/data/gender.dart b/wrestling_scoreboard_client/lib/data/gender.dart index ae2befaa..0eb5d96a 100644 --- a/wrestling_scoreboard_client/lib/data/gender.dart +++ b/wrestling_scoreboard_client/lib/data/gender.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/wrestling_scoreboard_client/lib/data/wrestling_style.dart b/wrestling_scoreboard_client/lib/data/wrestling_style.dart index f38e620d..a87ba7f2 100644 --- a/wrestling_scoreboard_client/lib/data/wrestling_style.dart +++ b/wrestling_scoreboard_client/lib/data/wrestling_style.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; diff --git a/wrestling_scoreboard_client/lib/main.dart b/wrestling_scoreboard_client/lib/main.dart index fc7855e8..91d085b8 100644 --- a/wrestling_scoreboard_client/lib/main.dart +++ b/wrestling_scoreboard_client/lib/main.dart @@ -3,8 +3,8 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:wrestling_scoreboard/ui/app_navigation.dart'; -import 'package:wrestling_scoreboard/ui/settings/preferences.dart'; +import 'package:wrestling_scoreboard_client/ui/app_navigation.dart'; +import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart'; void main() async { await dotenv.load(fileName: '.env'); diff --git a/wrestling_scoreboard_client/lib/mocks/mock_data_provider.dart b/wrestling_scoreboard_client/lib/mocks/mock_data_provider.dart index 1d67948a..37082949 100644 --- a/wrestling_scoreboard_client/lib/mocks/mock_data_provider.dart +++ b/wrestling_scoreboard_client/lib/mocks/mock_data_provider.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:math'; -import 'package:common/common.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; import 'mocks.dart'; diff --git a/wrestling_scoreboard_client/lib/mocks/mocks.dart b/wrestling_scoreboard_client/lib/mocks/mocks.dart index 1c7c37cc..686d60ea 100644 --- a/wrestling_scoreboard_client/lib/mocks/mocks.dart +++ b/wrestling_scoreboard_client/lib/mocks/mocks.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; League _leagueMenRPW = League( id: 1, diff --git a/wrestling_scoreboard_client/lib/ui/components/consumer.dart b/wrestling_scoreboard_client/lib/ui/components/consumer.dart index c0f472a1..d56f1408 100644 --- a/wrestling_scoreboard_client/lib/ui/components/consumer.dart +++ b/wrestling_scoreboard_client/lib/ui/components/consumer.dart @@ -1,8 +1,8 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; -import 'package:wrestling_scoreboard/ui/components/exception.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; -import 'package:wrestling_scoreboard/util/network/remote/web_socket.dart'; +import 'package:wrestling_scoreboard_client/ui/components/exception.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/web_socket.dart'; class SingleConsumer extends StatefulWidget { final int? id; diff --git a/wrestling_scoreboard_client/lib/ui/components/edit.dart b/wrestling_scoreboard_client/lib/ui/components/edit.dart index 28b07568..ccdd56e2 100644 --- a/wrestling_scoreboard_client/lib/ui/components/edit.dart +++ b/wrestling_scoreboard_client/lib/ui/components/edit.dart @@ -2,7 +2,7 @@ import 'dart:developer' as developer; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/util/network/remote/rest.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/rest.dart'; class EditWidget extends StatelessWidget { final String typeLocalization; diff --git a/wrestling_scoreboard_client/lib/ui/components/info.dart b/wrestling_scoreboard_client/lib/ui/components/info.dart index 6d5b8791..a6bd3d3d 100644 --- a/wrestling_scoreboard_client/lib/ui/components/info.dart +++ b/wrestling_scoreboard_client/lib/ui/components/info.dart @@ -1,7 +1,7 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; class InfoWidget extends StatelessWidget { final DataObject obj; diff --git a/wrestling_scoreboard_client/lib/ui/edit/bout_config_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/bout_config_edit.dart index c8472b23..ffdcac2e 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/bout_config_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/bout_config_edit.dart @@ -1,10 +1,10 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/common.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/common.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; abstract class BoutConfigEdit extends StatefulWidget { final BoutConfig? boutConfig; diff --git a/wrestling_scoreboard_client/lib/ui/edit/club_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/club_edit.dart index 0412c590..c4b73df1 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/club_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/club_edit.dart @@ -1,8 +1,8 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class ClubEdit extends StatefulWidget { final Club? club; diff --git a/wrestling_scoreboard_client/lib/ui/edit/league_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/league_edit.dart index e7e9a24c..9c22bdf9 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/league_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/league_edit.dart @@ -1,9 +1,9 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/edit/bout_config_edit.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/bout_config_edit.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class LeagueEdit extends BoutConfigEdit { final League? league; diff --git a/wrestling_scoreboard_client/lib/ui/edit/league_weight_class_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/league_weight_class_edit.dart index 18f4fc1d..7bc22dba 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/league_weight_class_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/league_weight_class_edit.dart @@ -1,9 +1,9 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/edit/weight_class_edit.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/weight_class_edit.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class LeagueWeightClassEdit extends WeightClassEdit { final LeagueWeightClass? leagueWeightClass; diff --git a/wrestling_scoreboard_client/lib/ui/edit/lineup_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/lineup_edit.dart index 20ea884c..df37b246 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/lineup_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/lineup_edit.dart @@ -1,14 +1,14 @@ import 'dart:collection'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/dropdown.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/ui/components/font.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/ui/components/font.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class LineupEdit extends StatefulWidget { final Lineup lineup; diff --git a/wrestling_scoreboard_client/lib/ui/edit/membership_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/membership_edit.dart index 14967047..78bfd26b 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/membership_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/membership_edit.dart @@ -1,8 +1,8 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/edit/person_edit.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/person_edit.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class MembershipEdit extends PersonEdit { final Membership? membership; diff --git a/wrestling_scoreboard_client/lib/ui/edit/person_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/person_edit.dart index 85429daa..a1cc9e4c 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/person_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/person_edit.dart @@ -1,11 +1,11 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/gender.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/common.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/gender.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/common.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; abstract class PersonEdit extends StatefulWidget { final Person? person; diff --git a/wrestling_scoreboard_client/lib/ui/edit/team_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/team_edit.dart index 16f3b5cd..3d5ce5f5 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/team_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/team_edit.dart @@ -1,9 +1,9 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/dropdown.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class TeamEdit extends StatefulWidget { final Team? team; diff --git a/wrestling_scoreboard_client/lib/ui/edit/team_match_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/team_match_edit.dart index a2519e03..38cacdb3 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/team_match_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/team_match_edit.dart @@ -1,10 +1,10 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/dropdown.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/ui/components/dropdown.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; class TeamMatchEdit extends StatefulWidget { final TeamMatch? teamMatch; diff --git a/wrestling_scoreboard_client/lib/ui/edit/weight_class_edit.dart b/wrestling_scoreboard_client/lib/ui/edit/weight_class_edit.dart index c3c057a0..ce662d93 100644 --- a/wrestling_scoreboard_client/lib/ui/edit/weight_class_edit.dart +++ b/wrestling_scoreboard_client/lib/ui/edit/weight_class_edit.dart @@ -1,11 +1,11 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/common.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/common.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; abstract class WeightClassEdit extends StatefulWidget { final WeightClass? weightClass; diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart index 0bae771f..cb67c1a3 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/fight_action_controls.dart @@ -1,7 +1,7 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/fitted_text.dart'; +import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart'; import 'fight_shortcuts.dart'; diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_actions.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_actions.dart index 9eff5151..c7fea758 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/fight_actions.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/fight_actions.dart @@ -1,7 +1,7 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; -import 'package:wrestling_scoreboard/data/fight_role.dart'; -import 'package:wrestling_scoreboard/ui/components/fitted_text.dart'; +import 'package:wrestling_scoreboard_client/data/fight_role.dart'; +import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart'; class ActionsWidget extends StatelessWidget { final List actions; diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_main_controls.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_main_controls.dart index d8eb78c8..23077987 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/fight_main_controls.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/fight_main_controls.dart @@ -1,10 +1,10 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; -import 'package:wrestling_scoreboard/data/fight_result.dart'; -import 'package:wrestling_scoreboard/data/fight_role.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/fight_result.dart'; +import 'package:wrestling_scoreboard_client/data/fight_role.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; import 'fight_screen.dart'; import 'fight_shortcuts.dart'; diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_screen.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_screen.dart index d7cb9eb1..9f92140b 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/fight_screen.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/fight_screen.dart @@ -1,21 +1,21 @@ import 'dart:async'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; -import 'package:wrestling_scoreboard/data/fight_role.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/fight/fight_action_controls.dart'; -import 'package:wrestling_scoreboard/ui/fight/fight_shortcuts.dart'; -import 'package:wrestling_scoreboard/ui/fight/technical_points.dart'; -import 'package:wrestling_scoreboard/ui/fight/time_display.dart'; -import 'package:wrestling_scoreboard/ui/models/participant_state_model.dart'; -import 'package:wrestling_scoreboard/util/audio/audio.dart'; -import 'package:wrestling_scoreboard/util/colors.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; -import 'package:wrestling_scoreboard/util/units.dart'; +import 'package:wrestling_scoreboard_client/data/fight_role.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/fight_action_controls.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/fight_shortcuts.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/technical_points.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/time_display.dart'; +import 'package:wrestling_scoreboard_client/ui/models/participant_state_model.dart'; +import 'package:wrestling_scoreboard_client/util/audio/audio.dart'; +import 'package:wrestling_scoreboard_client/util/colors.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/units.dart'; import '../components/fitted_text.dart'; import '../match/common_elements.dart'; diff --git a/wrestling_scoreboard_client/lib/ui/fight/fight_shortcuts.dart b/wrestling_scoreboard_client/lib/ui/fight/fight_shortcuts.dart index fd5e7e91..6cf3bd09 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/fight_shortcuts.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/fight_shortcuts.dart @@ -1,10 +1,10 @@ import 'dart:async'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:wrestling_scoreboard/util/audio/audio.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/audio/audio.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; import 'fight_screen.dart'; diff --git a/wrestling_scoreboard_client/lib/ui/fight/technical_points.dart b/wrestling_scoreboard_client/lib/ui/fight/technical_points.dart index 34878ef4..d0500a1f 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/technical_points.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/technical_points.dart @@ -1,13 +1,13 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; -import 'package:wrestling_scoreboard/data/fight_role.dart'; -import 'package:wrestling_scoreboard/ui/components/fitted_text.dart'; -import 'package:wrestling_scoreboard/ui/fight/time_display.dart'; -import 'package:wrestling_scoreboard/ui/models/participant_state_model.dart'; -import 'package:wrestling_scoreboard/util/colors.dart'; +import 'package:wrestling_scoreboard_client/data/fight_role.dart'; +import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/time_display.dart'; +import 'package:wrestling_scoreboard_client/ui/models/participant_state_model.dart'; +import 'package:wrestling_scoreboard_client/util/colors.dart'; class TechnicalPoints extends StatelessWidget { final double height; diff --git a/wrestling_scoreboard_client/lib/ui/fight/time_display.dart b/wrestling_scoreboard_client/lib/ui/fight/time_display.dart index be1d9328..0a9cebdd 100644 --- a/wrestling_scoreboard_client/lib/ui/fight/time_display.dart +++ b/wrestling_scoreboard_client/lib/ui/fight/time_display.dart @@ -1,6 +1,6 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; -import 'package:wrestling_scoreboard/ui/components/fitted_text.dart'; +import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart'; class TimeDisplay extends StatefulWidget { final MaterialColor color; diff --git a/wrestling_scoreboard_client/lib/ui/home/home.dart b/wrestling_scoreboard_client/lib/ui/home/home.dart index f7413113..5b9338f7 100644 --- a/wrestling_scoreboard_client/lib/ui/home/home.dart +++ b/wrestling_scoreboard_client/lib/ui/home/home.dart @@ -1,13 +1,13 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/edit/club_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/league_edit.dart'; -import 'package:wrestling_scoreboard/ui/overview/club_overview.dart'; -import 'package:wrestling_scoreboard/ui/overview/league_overview.dart'; -import 'package:wrestling_scoreboard/util/network/remote/web_socket.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/club_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/league_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/club_overview.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/league_overview.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/web_socket.dart'; class Home extends StatefulWidget { const Home({Key? key}) : super(key: key); diff --git a/wrestling_scoreboard_client/lib/ui/match/common_elements.dart b/wrestling_scoreboard_client/lib/ui/match/common_elements.dart index bdefaf67..a7c13ace 100644 --- a/wrestling_scoreboard_client/lib/ui/match/common_elements.dart +++ b/wrestling_scoreboard_client/lib/ui/match/common_elements.dart @@ -1,6 +1,6 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; -import 'package:wrestling_scoreboard/ui/components/fitted_text.dart'; +import 'package:wrestling_scoreboard_client/ui/components/fitted_text.dart'; class CommonElements { static List getTeamHeader(TeamMatch match, List fights, BuildContext context) { diff --git a/wrestling_scoreboard_client/lib/ui/match/match_sequence.dart b/wrestling_scoreboard_client/lib/ui/match/match_sequence.dart index 5daac193..cbc0c957 100644 --- a/wrestling_scoreboard_client/lib/ui/match/match_sequence.dart +++ b/wrestling_scoreboard_client/lib/ui/match/match_sequence.dart @@ -1,13 +1,13 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/fight_result.dart'; -import 'package:wrestling_scoreboard/data/fight_role.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/fight/fight_screen.dart'; -import 'package:wrestling_scoreboard/ui/overview/team_match_overview.dart'; -import 'package:wrestling_scoreboard/util/units.dart'; +import 'package:wrestling_scoreboard_client/data/fight_result.dart'; +import 'package:wrestling_scoreboard_client/data/fight_role.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/fight/fight_screen.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/team_match_overview.dart'; +import 'package:wrestling_scoreboard_client/util/units.dart'; import '../components/fitted_text.dart'; import 'common_elements.dart'; diff --git a/wrestling_scoreboard_client/lib/ui/models/participant_state_model.dart b/wrestling_scoreboard_client/lib/ui/models/participant_state_model.dart index bafa1510..37cefac0 100644 --- a/wrestling_scoreboard_client/lib/ui/models/participant_state_model.dart +++ b/wrestling_scoreboard_client/lib/ui/models/participant_state_model.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; class ParticipantStateModel { ParticipantState? pStatus; diff --git a/wrestling_scoreboard_client/lib/ui/overview/club_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/club_overview.dart index f09b4f2c..dd44c61e 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/club_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/club_overview.dart @@ -1,15 +1,15 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/edit/club_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/membership_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/team_edit.dart'; -import 'package:wrestling_scoreboard/ui/overview/membership_overview.dart'; -import 'package:wrestling_scoreboard/ui/overview/team_overview.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/club_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/membership_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/team_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/membership_overview.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/team_overview.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class ClubOverview extends StatelessWidget { final Club filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/league_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/league_overview.dart index c1c2a22d..14e401ae 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/league_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/league_overview.dart @@ -1,17 +1,17 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/edit/league_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/league_weight_class_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/team_edit.dart'; -import 'package:wrestling_scoreboard/ui/overview/league_weight_class_overview.dart'; -import 'package:wrestling_scoreboard/ui/overview/team_overview.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/league_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/league_weight_class_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/team_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/league_weight_class_overview.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/team_overview.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class LeagueOverview extends StatelessWidget { final League filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/league_weight_class_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/league_weight_class_overview.dart index 04b935c5..60ae5027 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/league_weight_class_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/league_weight_class_overview.dart @@ -1,10 +1,10 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/edit/league_weight_class_edit.dart'; -import 'package:wrestling_scoreboard/ui/overview/weight_class_overview.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/league_weight_class_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/weight_class_overview.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class LeagueWeightClassOverview extends WeightClassOverview { final LeagueWeightClass filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/membership_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/membership_overview.dart index f4510d58..2e08a560 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/membership_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/membership_overview.dart @@ -1,11 +1,11 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/edit/membership_edit.dart'; -import 'package:wrestling_scoreboard/ui/overview/person_overview.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/membership_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/person_overview.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class MembershipOverview extends PersonOverview { final Membership _filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/person_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/person_overview.dart index 59db14b7..f8bf5809 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/person_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/person_overview.dart @@ -1,13 +1,13 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/gender.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/overview/common.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/gender.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/common.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; abstract class PersonOverview extends StatelessWidget implements AbstractOverview { final Person _filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/team_match_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/team_match_overview.dart index 5b41f49a..011be2d3 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/team_match_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/team_match_overview.dart @@ -1,13 +1,13 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/edit/lineup_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/team_match_edit.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/lineup_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/team_match_edit.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class TeamMatchOverview extends StatelessWidget { final TeamMatch match; diff --git a/wrestling_scoreboard_client/lib/ui/overview/team_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/team_overview.dart index 63e1c893..0ce1acb8 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/team_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/team_overview.dart @@ -1,14 +1,14 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/edit/team_edit.dart'; -import 'package:wrestling_scoreboard/ui/edit/team_match_edit.dart'; -import 'package:wrestling_scoreboard/ui/match/match_sequence.dart'; -import 'package:wrestling_scoreboard/util/date_time.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/team_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/edit/team_match_edit.dart'; +import 'package:wrestling_scoreboard_client/ui/match/match_sequence.dart'; +import 'package:wrestling_scoreboard_client/util/date_time.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; class TeamOverview extends StatelessWidget { final Team filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/overview/weight_class_overview.dart b/wrestling_scoreboard_client/lib/ui/overview/weight_class_overview.dart index 3d637c00..82246cc5 100644 --- a/wrestling_scoreboard_client/lib/ui/overview/weight_class_overview.dart +++ b/wrestling_scoreboard_client/lib/ui/overview/weight_class_overview.dart @@ -1,12 +1,12 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:wrestling_scoreboard/data/wrestling_style.dart'; -import 'package:wrestling_scoreboard/ui/components/consumer.dart'; -import 'package:wrestling_scoreboard/ui/components/grouped_list.dart'; -import 'package:wrestling_scoreboard/ui/components/info.dart'; -import 'package:wrestling_scoreboard/ui/overview/common.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/data/wrestling_style.dart'; +import 'package:wrestling_scoreboard_client/ui/components/consumer.dart'; +import 'package:wrestling_scoreboard_client/ui/components/grouped_list.dart'; +import 'package:wrestling_scoreboard_client/ui/components/info.dart'; +import 'package:wrestling_scoreboard_client/ui/overview/common.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; abstract class WeightClassOverview extends StatelessWidget implements AbstractOverview { final WeightClass _filterObject; diff --git a/wrestling_scoreboard_client/lib/ui/settings/settings.dart b/wrestling_scoreboard_client/lib/ui/settings/settings.dart index 005f99e0..b33d2ec5 100644 --- a/wrestling_scoreboard_client/lib/ui/settings/settings.dart +++ b/wrestling_scoreboard_client/lib/ui/settings/settings.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:settings_ui/settings_ui.dart'; -import 'package:wrestling_scoreboard/ui/components/ok_dialog.dart'; -import 'package:wrestling_scoreboard/ui/settings/preferences.dart'; -import 'package:wrestling_scoreboard/util/asset.dart'; -import 'package:wrestling_scoreboard/util/audio/audio.dart'; -import 'package:wrestling_scoreboard/util/environment.dart'; +import 'package:wrestling_scoreboard_client/ui/components/ok_dialog.dart'; +import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart'; +import 'package:wrestling_scoreboard_client/util/asset.dart'; +import 'package:wrestling_scoreboard_client/util/audio/audio.dart'; +import 'package:wrestling_scoreboard_client/util/environment.dart'; class CustomSettingsScreen extends StatefulWidget { const CustomSettingsScreen({Key? key}) : super(key: key); diff --git a/wrestling_scoreboard_client/lib/util/audio/audio.dart b/wrestling_scoreboard_client/lib/util/audio/audio.dart index 92260cfa..29bef610 100644 --- a/wrestling_scoreboard_client/lib/util/audio/audio.dart +++ b/wrestling_scoreboard_client/lib/util/audio/audio.dart @@ -1,5 +1,5 @@ -import 'package:wrestling_scoreboard/ui/settings/preferences.dart'; -import 'package:wrestling_scoreboard/util/environment.dart'; +import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart'; +import 'package:wrestling_scoreboard_client/util/environment.dart'; import 'default_audio_player.dart'; diff --git a/wrestling_scoreboard_client/lib/util/network/data_provider.dart b/wrestling_scoreboard_client/lib/util/network/data_provider.dart index fee00e14..1d31a3ac 100644 --- a/wrestling_scoreboard_client/lib/util/network/data_provider.dart +++ b/wrestling_scoreboard_client/lib/util/network/data_provider.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:common/common.dart'; -import 'package:wrestling_scoreboard/mocks/mock_data_provider.dart'; -import 'package:wrestling_scoreboard/util/network/remote/rest.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_client/mocks/mock_data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/rest.dart'; import '../environment.dart'; diff --git a/wrestling_scoreboard_client/lib/util/network/remote/rest.dart b/wrestling_scoreboard_client/lib/util/network/remote/rest.dart index 783f09b6..77fed011 100644 --- a/wrestling_scoreboard_client/lib/util/network/remote/rest.dart +++ b/wrestling_scoreboard_client/lib/util/network/remote/rest.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:http/http.dart' as http; -import 'package:wrestling_scoreboard/ui/settings/preferences.dart'; -import 'package:wrestling_scoreboard/util/environment.dart'; -import 'package:wrestling_scoreboard/util/network/data_provider.dart'; -import 'package:wrestling_scoreboard/util/network/remote/url.dart'; +import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart'; +import 'package:wrestling_scoreboard_client/util/environment.dart'; +import 'package:wrestling_scoreboard_client/util/network/data_provider.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/url.dart'; import 'web_socket.dart'; diff --git a/wrestling_scoreboard_client/lib/util/network/remote/web_socket.dart b/wrestling_scoreboard_client/lib/util/network/remote/web_socket.dart index 54229f53..966ab61b 100644 --- a/wrestling_scoreboard_client/lib/util/network/remote/web_socket.dart +++ b/wrestling_scoreboard_client/lib/util/network/remote/web_socket.dart @@ -3,9 +3,9 @@ import 'dart:developer'; import 'dart:io'; import 'package:web_socket_channel/web_socket_channel.dart'; -import 'package:wrestling_scoreboard/ui/settings/preferences.dart'; -import 'package:wrestling_scoreboard/util/environment.dart'; -import 'package:wrestling_scoreboard/util/network/remote/url.dart'; +import 'package:wrestling_scoreboard_client/ui/settings/preferences.dart'; +import 'package:wrestling_scoreboard_client/util/environment.dart'; +import 'package:wrestling_scoreboard_client/util/network/remote/url.dart'; enum WebSocketConnectionState { connecting, diff --git a/wrestling_scoreboard_client/linux/flutter/generated_plugin_registrant.cc b/wrestling_scoreboard_client/linux/flutter/generated_plugin_registrant.cc index 1830e5c7..e71a16d2 100644 --- a/wrestling_scoreboard_client/linux/flutter/generated_plugin_registrant.cc +++ b/wrestling_scoreboard_client/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,6 @@ #include "generated_plugin_registrant.h" -#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin"); - audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar); } diff --git a/wrestling_scoreboard_client/linux/flutter/generated_plugins.cmake b/wrestling_scoreboard_client/linux/flutter/generated_plugins.cmake index e9abb912..2e1de87a 100644 --- a/wrestling_scoreboard_client/linux/flutter/generated_plugins.cmake +++ b/wrestling_scoreboard_client/linux/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - audioplayers_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/wrestling_scoreboard_client/pubspec.lock b/wrestling_scoreboard_client/pubspec.lock index 893a4a27..8441eb9f 100644 --- a/wrestling_scoreboard_client/pubspec.lock +++ b/wrestling_scoreboard_client/pubspec.lock @@ -129,13 +129,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.0" - common: - dependency: "direct main" - description: - path: "../common" - relative: true - source: path - version: "1.0.0" convert: dependency: transitive description: @@ -577,6 +570,13 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.3" + wrestling_scoreboard_common: + dependency: "direct main" + description: + path: "../wrestling_scoreboard_common" + relative: true + source: path + version: "1.0.0" xdg_directories: dependency: transitive description: diff --git a/wrestling_scoreboard_client/pubspec.yaml b/wrestling_scoreboard_client/pubspec.yaml index 50f86170..c6bd124a 100644 --- a/wrestling_scoreboard_client/pubspec.yaml +++ b/wrestling_scoreboard_client/pubspec.yaml @@ -20,13 +20,13 @@ dependencies: provider: ^6.0.2 audioplayers: ^3.0.1 - common: - path: ../wrestling_scoreboard_common web_socket_channel: ^2.1.0 flutter_lints: ^2.0.1 path_provider: ^2.0.8 settings_ui: ^2.0.2 shared_preferences: ^2.0.13 + wrestling_scoreboard_common: + path: ../wrestling_scoreboard_common dev_dependencies: flutter_test: diff --git a/wrestling_scoreboard_client/test/data/person_test.dart b/wrestling_scoreboard_client/test/data/person_test.dart index 58c5247c..aa02a333 100644 --- a/wrestling_scoreboard_client/test/data/person_test.dart +++ b/wrestling_scoreboard_client/test/data/person_test.dart @@ -5,7 +5,7 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/wrestling_scoreboard_client/test/widget_test.dart b/wrestling_scoreboard_client/test/widget_test.dart index 8103b7a3..e933ea3a 100644 --- a/wrestling_scoreboard_client/test/widget_test.dart +++ b/wrestling_scoreboard_client/test/widget_test.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:wrestling_scoreboard/main.dart'; +import 'package:wrestling_scoreboard_client/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/wrestling_scoreboard_client/windows/flutter/generated_plugin_registrant.cc b/wrestling_scoreboard_client/windows/flutter/generated_plugin_registrant.cc index 09e8e2c3..8b6d4680 100644 --- a/wrestling_scoreboard_client/windows/flutter/generated_plugin_registrant.cc +++ b/wrestling_scoreboard_client/windows/flutter/generated_plugin_registrant.cc @@ -6,9 +6,6 @@ #include "generated_plugin_registrant.h" -#include void RegisterPlugins(flutter::PluginRegistry* registry) { - AudioplayersWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin")); } diff --git a/wrestling_scoreboard_client/windows/flutter/generated_plugins.cmake b/wrestling_scoreboard_client/windows/flutter/generated_plugins.cmake index 375535c9..b93c4c30 100644 --- a/wrestling_scoreboard_client/windows/flutter/generated_plugins.cmake +++ b/wrestling_scoreboard_client/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - audioplayers_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/wrestling_scoreboard_client/windows/runner/Runner.rc b/wrestling_scoreboard_client/windows/runner/Runner.rc index 06acff28..0c5574eb 100644 --- a/wrestling_scoreboard_client/windows/runner/Runner.rc +++ b/wrestling_scoreboard_client/windows/runner/Runner.rc @@ -90,7 +90,7 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "dev.oberhauser" "\0" - VALUE "FileDescription", "A new Flutter project." "\0" + VALUE "FileDescription", "Wrestling software for managing team fights and tournaments." "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "client" "\0" VALUE "LegalCopyright", "Copyright (C) 2022 dev.oberhauser. All rights reserved." "\0" diff --git a/wrestling_scoreboard_server/bin/server.dart b/wrestling_scoreboard_server/bin/server.dart index 3efd2571..ec053b78 100644 --- a/wrestling_scoreboard_server/bin/server.dart +++ b/wrestling_scoreboard_server/bin/server.dart @@ -1,4 +1,4 @@ -import 'package:server/server.dart' as server; +import 'package:wrestling_scoreboard_server/server.dart' as server; void main(List arguments) { server.init(); diff --git a/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart b/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart index 1b1344d7..bcc5218e 100644 --- a/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/bout_config_controller.dart @@ -1,6 +1,6 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; -import 'package:server/controllers/entity_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/entity_controller.dart'; class BoutConfigController extends EntityController { static final BoutConfigController _singleton = BoutConfigController._internal(); diff --git a/wrestling_scoreboard_server/lib/controllers/club_controller.dart b/wrestling_scoreboard_server/lib/controllers/club_controller.dart index 8f410a18..24fe7960 100644 --- a/wrestling_scoreboard_server/lib/controllers/club_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/club_controller.dart @@ -1,7 +1,7 @@ -import 'package:common/common.dart'; -import 'package:server/controllers/entity_controller.dart'; -import 'package:server/controllers/membership_controller.dart'; -import 'package:server/controllers/team_controller.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_server/controllers/entity_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/membership_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_controller.dart'; import 'package:shelf/shelf.dart'; class ClubController extends EntityController { diff --git a/wrestling_scoreboard_server/lib/controllers/entity_controller.dart b/wrestling_scoreboard_server/lib/controllers/entity_controller.dart index 48df40ad..01be11cf 100644 --- a/wrestling_scoreboard_server/lib/controllers/entity_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/entity_controller.dart @@ -1,25 +1,25 @@ import 'dart:convert'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; -import 'package:server/controllers/bout_config_controller.dart'; -import 'package:server/controllers/club_controller.dart'; -import 'package:server/controllers/fight_action_controller.dart'; -import 'package:server/controllers/fight_controller.dart'; -import 'package:server/controllers/league_controller.dart'; -import 'package:server/controllers/league_weight_class_controller.dart'; -import 'package:server/controllers/lineup_controller.dart'; -import 'package:server/controllers/membership_controller.dart'; -import 'package:server/controllers/participant_state_controller.dart'; -import 'package:server/controllers/participation_controller.dart'; -import 'package:server/controllers/person_controller.dart'; -import 'package:server/controllers/team_controller.dart'; -import 'package:server/controllers/team_match_controller.dart'; -import 'package:server/controllers/team_match_fight_controller.dart'; -import 'package:server/controllers/tournament_controller.dart'; -import 'package:server/controllers/websocket_handler.dart'; -import 'package:server/controllers/weight_class_controller.dart'; -import 'package:server/services/postgres_db.dart'; +import 'package:wrestling_scoreboard_server/controllers/bout_config_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/club_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/fight_action_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/fight_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_weight_class_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/lineup_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/membership_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/participant_state_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/participation_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/person_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_match_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_match_fight_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/tournament_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/websocket_handler.dart'; +import 'package:wrestling_scoreboard_server/controllers/weight_class_controller.dart'; +import 'package:wrestling_scoreboard_server/services/postgres_db.dart'; import 'package:shelf/shelf.dart'; Map typeDartToCodeMap = { diff --git a/wrestling_scoreboard_server/lib/controllers/fight_action_controller.dart b/wrestling_scoreboard_server/lib/controllers/fight_action_controller.dart index 100bde65..5166d505 100644 --- a/wrestling_scoreboard_server/lib/controllers/fight_action_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/fight_action_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/fight_controller.dart b/wrestling_scoreboard_server/lib/controllers/fight_controller.dart index a3cb4994..94b9c423 100644 --- a/wrestling_scoreboard_server/lib/controllers/fight_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/fight_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'package:shelf/shelf.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/league_controller.dart b/wrestling_scoreboard_server/lib/controllers/league_controller.dart index a1c9086b..e5a79c32 100644 --- a/wrestling_scoreboard_server/lib/controllers/league_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/league_controller.dart @@ -1,8 +1,8 @@ -import 'package:common/common.dart'; -import 'package:server/controllers/entity_controller.dart'; -import 'package:server/controllers/league_weight_class_controller.dart'; -import 'package:server/controllers/team_controller.dart'; -import 'package:server/controllers/weight_class_controller.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_server/controllers/entity_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_weight_class_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/weight_class_controller.dart'; import 'package:shelf/shelf.dart'; class LeagueController extends EntityController { diff --git a/wrestling_scoreboard_server/lib/controllers/league_weight_class_controller.dart b/wrestling_scoreboard_server/lib/controllers/league_weight_class_controller.dart index 6bdbeb26..ce3a0f44 100644 --- a/wrestling_scoreboard_server/lib/controllers/league_weight_class_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/league_weight_class_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart b/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart index 313e3bcf..5044fb42 100644 --- a/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/lineup_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:shelf/shelf.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/membership_controller.dart b/wrestling_scoreboard_server/lib/controllers/membership_controller.dart index edeb7d08..8b5c16c1 100644 --- a/wrestling_scoreboard_server/lib/controllers/membership_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/membership_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart b/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart index dab6daeb..7f4d2ebb 100644 --- a/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/participant_state_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/participation_controller.dart b/wrestling_scoreboard_server/lib/controllers/participation_controller.dart index af0ca64f..e214a836 100644 --- a/wrestling_scoreboard_server/lib/controllers/participation_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/participation_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/person_controller.dart b/wrestling_scoreboard_server/lib/controllers/person_controller.dart index 0a63a271..25f8043e 100644 --- a/wrestling_scoreboard_server/lib/controllers/person_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/person_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/team_controller.dart b/wrestling_scoreboard_server/lib/controllers/team_controller.dart index 4865e98f..f13b1d0d 100644 --- a/wrestling_scoreboard_server/lib/controllers/team_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/team_controller.dart @@ -1,5 +1,5 @@ -import 'package:common/common.dart'; -import 'package:server/controllers/team_match_controller.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_match_controller.dart'; import 'package:shelf/shelf.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/team_match_controller.dart b/wrestling_scoreboard_server/lib/controllers/team_match_controller.dart index a4e0ee7e..51ab3053 100644 --- a/wrestling_scoreboard_server/lib/controllers/team_match_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/team_match_controller.dart @@ -1,13 +1,13 @@ import 'dart:convert'; -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; -import 'package:server/controllers/league_controller.dart'; -import 'package:server/controllers/participant_state_controller.dart'; -import 'package:server/controllers/participation_controller.dart'; -import 'package:server/controllers/team_match_fight_controller.dart'; -import 'package:server/controllers/websocket_handler.dart'; -import 'package:server/services/postgres_db.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/participant_state_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/participation_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_match_fight_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/websocket_handler.dart'; +import 'package:wrestling_scoreboard_server/services/postgres_db.dart'; import 'package:shelf/shelf.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/team_match_fight_controller.dart b/wrestling_scoreboard_server/lib/controllers/team_match_fight_controller.dart index 4f5ee455..610eb0f2 100644 --- a/wrestling_scoreboard_server/lib/controllers/team_match_fight_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/team_match_fight_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/tournament_controller.dart b/wrestling_scoreboard_server/lib/controllers/tournament_controller.dart index ec689924..440cde30 100644 --- a/wrestling_scoreboard_server/lib/controllers/tournament_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/tournament_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'package:shelf/shelf.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/tournament_fight_controller.dart b/wrestling_scoreboard_server/lib/controllers/tournament_fight_controller.dart index f1024967..5891b789 100644 --- a/wrestling_scoreboard_server/lib/controllers/tournament_fight_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/tournament_fight_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/websocket_handler.dart b/wrestling_scoreboard_server/lib/controllers/websocket_handler.dart index 508d0b50..29de73d3 100644 --- a/wrestling_scoreboard_server/lib/controllers/websocket_handler.dart +++ b/wrestling_scoreboard_server/lib/controllers/websocket_handler.dart @@ -1,16 +1,16 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:common/common.dart'; -import 'package:server/controllers/club_controller.dart'; -import 'package:server/controllers/fight_action_controller.dart'; -import 'package:server/controllers/league_controller.dart'; -import 'package:server/controllers/league_weight_class_controller.dart'; -import 'package:server/controllers/lineup_controller.dart'; -import 'package:server/controllers/membership_controller.dart'; -import 'package:server/controllers/participation_controller.dart'; -import 'package:server/controllers/team_controller.dart'; -import 'package:server/controllers/team_match_controller.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; +import 'package:wrestling_scoreboard_server/controllers/club_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/fight_action_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_weight_class_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/lineup_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/membership_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/participation_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/team_match_controller.dart'; import 'package:shelf_web_socket/shelf_web_socket.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; diff --git a/wrestling_scoreboard_server/lib/controllers/weight_class_controller.dart b/wrestling_scoreboard_server/lib/controllers/weight_class_controller.dart index 6d457c3f..839048fb 100644 --- a/wrestling_scoreboard_server/lib/controllers/weight_class_controller.dart +++ b/wrestling_scoreboard_server/lib/controllers/weight_class_controller.dart @@ -1,4 +1,4 @@ -import 'package:common/common.dart'; +import 'package:wrestling_scoreboard_common/common.dart'; import 'package:postgres/postgres.dart'; import 'entity_controller.dart'; diff --git a/wrestling_scoreboard_server/lib/middleware/cors.dart b/wrestling_scoreboard_server/lib/middleware/cors.dart index f88d982b..945fb95a 100644 --- a/wrestling_scoreboard_server/lib/middleware/cors.dart +++ b/wrestling_scoreboard_server/lib/middleware/cors.dart @@ -1,4 +1,4 @@ -import 'package:server/server.dart'; +import 'package:wrestling_scoreboard_server/server.dart'; import 'package:shelf/shelf.dart'; final corsHeaders = { diff --git a/wrestling_scoreboard_server/lib/routes/api_route.dart b/wrestling_scoreboard_server/lib/routes/api_route.dart index 1561d66e..c3772c70 100644 --- a/wrestling_scoreboard_server/lib/routes/api_route.dart +++ b/wrestling_scoreboard_server/lib/routes/api_route.dart @@ -1,4 +1,4 @@ -import 'package:server/controllers/league_weight_class_controller.dart'; +import 'package:wrestling_scoreboard_server/controllers/league_weight_class_controller.dart'; import 'package:shelf/shelf.dart'; import 'package:shelf_router/shelf_router.dart'; diff --git a/wrestling_scoreboard_server/lib/server.dart b/wrestling_scoreboard_server/lib/server.dart index 2d10f62e..676b6430 100644 --- a/wrestling_scoreboard_server/lib/server.dart +++ b/wrestling_scoreboard_server/lib/server.dart @@ -5,9 +5,9 @@ import 'dart:io'; import 'package:dotenv/dotenv.dart' show DotEnv; -import 'package:server/controllers/websocket_handler.dart'; -import 'package:server/routes/api_route.dart'; -import 'package:server/services/postgres_db.dart'; +import 'package:wrestling_scoreboard_server/controllers/websocket_handler.dart'; +import 'package:wrestling_scoreboard_server/routes/api_route.dart'; +import 'package:wrestling_scoreboard_server/services/postgres_db.dart'; import 'package:shelf/shelf.dart'; import 'package:shelf/shelf_io.dart' as shelf_io; import 'package:shelf_router/shelf_router.dart' as shelf_router; diff --git a/wrestling_scoreboard_server/lib/services/postgres_db.dart b/wrestling_scoreboard_server/lib/services/postgres_db.dart index 5c001f3e..a6204822 100644 --- a/wrestling_scoreboard_server/lib/services/postgres_db.dart +++ b/wrestling_scoreboard_server/lib/services/postgres_db.dart @@ -1,5 +1,5 @@ import 'package:postgres/postgres.dart'; -import 'package:server/server.dart'; +import 'package:wrestling_scoreboard_server/server.dart'; class PostgresDb { final String postgresHost = env['DATABASE_HOST'] ?? 'localhost'; diff --git a/wrestling_scoreboard_server/pubspec.lock b/wrestling_scoreboard_server/pubspec.lock index ba38d9b5..9170a7ab 100644 --- a/wrestling_scoreboard_server/pubspec.lock +++ b/wrestling_scoreboard_server/pubspec.lock @@ -65,13 +65,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.17.1" - common: - dependency: "direct main" - description: - path: "../common" - relative: true - source: path - version: "1.0.0" convert: dependency: transitive description: @@ -456,6 +449,13 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + wrestling_scoreboard_common: + dependency: "direct main" + description: + path: "../wrestling_scoreboard_common" + relative: true + source: path + version: "1.0.0" yaml: dependency: transitive description: diff --git a/wrestling_scoreboard_server/pubspec.yaml b/wrestling_scoreboard_server/pubspec.yaml index ca7901c6..73226abd 100644 --- a/wrestling_scoreboard_server/pubspec.yaml +++ b/wrestling_scoreboard_server/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: shelf: ^1.0.0 shelf_router: ^1.0.0 shelf_static: ^1.0.0 - common: + wrestling_scoreboard_common: path: ../wrestling_scoreboard_common postgres: ^2.4.0 web_socket_channel: ^2.1.0