6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit aa91b34d
Changed files
.../screens/concierge/bloc/concierge_cubit.dart | 2 +- .../screens/concierge/concierge_route.dart | 1 - .../screens/concierge/concierge_screen.dart | 38 ---------------------- comwell_key_app/lib/routing/app_router.dart | 2 ++ 4 files changed, 3 insertions(+), 40 deletions(-)
Diff
diff --git a/comwell_key_app/lib/presentation/screens/concierge/bloc/concierge_cubit.dart b/comwell_key_app/lib/presentation/screens/concierge/bloc/concierge_cubit.dart
index 4f6013eb..0de8306a 100644
--- a/comwell_key_app/lib/presentation/screens/concierge/bloc/concierge_cubit.dart
+++ b/comwell_key_app/lib/presentation/screens/concierge/bloc/concierge_cubit.dart
@@ -16,7 +16,7 @@ class ConciergeCubit extends BaseCubit<ConciergeState> {
safeEmit(state.copyWith(userToken: userToken, isLoading: false, error: AppError.none));
} catch (e, st) {
logError(e, st);
- safeEmit(state.copyWith(error: AppError.unknown(e.toString())));
+ safeEmit(state.copyWith(error: AppError.unknown(e.toString()), isLoading: false));
}
}
}
\ No newline at end of file
diff --git a/comwell_key_app/lib/presentation/screens/concierge/concierge_route.dart b/comwell_key_app/lib/presentation/screens/concierge/concierge_route.dart
index da94e333..9424a53a 100644
--- a/comwell_key_app/lib/presentation/screens/concierge/concierge_route.dart
+++ b/comwell_key_app/lib/presentation/screens/concierge/concierge_route.dart
@@ -9,7 +9,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:comwell_key_app/presentation/navigation/transitions/slide_in_transition.dart';
import 'package:comwell_key_app/presentation/screens/concierge/bloc/concierge_cubit.dart';
-import 'package:comwell_key_app/presentation/screens/concierge/concierge_screen.dart';
part '../../../.generated/presentation/screens/concierge/concierge_route.g.dart';
diff --git a/comwell_key_app/lib/presentation/screens/concierge/concierge_screen.dart b/comwell_key_app/lib/presentation/screens/concierge/concierge_screen.dart
deleted file mode 100644
index 2513cbe8..00000000
--- a/comwell_key_app/lib/presentation/screens/concierge/concierge_screen.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:comwell_key_app/presentation/screens/concierge/bloc/concierge_cubit.dart';
-import 'package:comwell_key_app/presentation/screens/concierge/bloc/concierge_state.dart';
-
-class ConciergeScreen extends StatelessWidget {
- const ConciergeScreen({super.key});
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<ConciergeCubit, ConciergeState>(
- builder: (context, state) {
- final cubit = context.read<ConciergeCubit>();
- return MultiBlocListener(
- listeners: [
- BlocListener<ConciergeCubit, ConciergeState>(
- listenWhen: (prev, curr) =>
- prev.isLoading && !curr.isLoading && curr.error.isError,
- listener: (context, state) {
- // context.showErrorSnackBar(state.errorMessage);
- },
- )
- ],
- child: Scaffold(
- appBar: AppBar(),
- body: Center(
- child: Column(
- children: [
- Text("Concierge"),
- ],
- ),
- ),
- ),
- );
- },
- );
- }
-}
\ No newline at end of file
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index 1e881033..a384d9fe 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -1,5 +1,6 @@
import 'package:comwell_key_app/authentication/authentication_repository.dart';
import 'package:comwell_key_app/booking_details/booking_details_route.dart';
+import 'package:comwell_key_app/check_in/check_in_route.dart';
import 'package:comwell_key_app/check_out/checkout_routes.dart';
import 'package:comwell_key_app/choose_share_room/choose_share_room_route.dart';
import 'package:comwell_key_app/hotel_information/hotel_information_route.dart';
@@ -94,6 +95,7 @@ final router = GoRouter(
pastCancelledBookingDetailsRoute,
bookingDetailsRoute,
keyRoute,
+ checkInRoute,
chooseShareRoomRoute,
contactRoute,
findBookingRoute,