Merge remote-tracking branch 'origin/develop' into components
# Conflicts: # apps/mobile_app/lib/navigation/app_router.dart # apps/mobile_app/pubspec.yaml # modules/auth/lib/src/device_sign_up/add_kid_screen.dart # modules/auth/lib/src/login/presentation/link_phone_screen.dart # modules/auth/lib/src/login/presentation/login_screen.dart # modules/auth/lib/src/login/presentation/phone_code_screen.dart # modules/auth/lib/src/onboarding/presentation/welcome_screen.dart # modules/auth/lib/src/recover_password/presentation/new_password_screen.dart # modules/auth/lib/src/sign_up/signup_screen.dart # modules/home/lib/src/presentation/deposit_screen.dart # modules/home/lib/src/presentation/home_screen.dart # modules/home/lib/src/presentation/wage_screen.dart # modules/notifications/lib/src/core/activity_list.dart # packages/design_system/lib/design_system.dart
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
import 'package:auth/auth.dart';
|
||||
import 'package:dashboard_shell/dashboard_builder.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:home/home.dart';
|
||||
|
||||
import 'package:navigation/navigation.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'package:notifications/notifications.dart';
|
||||
import 'package:profile/profile.dart';
|
||||
|
||||
@@ -16,41 +15,41 @@ late final GoRouter appRouter;
|
||||
void configureAppRouter() {
|
||||
appRouter = GoRouter(
|
||||
navigatorKey: rootNavigatorKey,
|
||||
initialLocation: '/onboarding',
|
||||
// redirect: (context, state) {},
|
||||
initialLocation: AppRoutes.login,
|
||||
debugLogDiagnostics: true,
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/login',
|
||||
path: AppRoutes.login,
|
||||
name: 'login',
|
||||
pageBuilder: LoginBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/signup',
|
||||
path: AppRoutes.signup,
|
||||
name: 'signup',
|
||||
pageBuilder: SignupBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/onboarding',
|
||||
path: AppRoutes.onboarding,
|
||||
name: 'onboarding',
|
||||
pageBuilder: OnboardingBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/link_phone',
|
||||
path: AppRoutes.linkPhone,
|
||||
name: 'link_phone',
|
||||
pageBuilder: LinkPhoneBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/phone_code',
|
||||
path: AppRoutes.phoneCode,
|
||||
name: 'phone_code',
|
||||
pageBuilder: PhoneCodeBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/recover_password',
|
||||
path: AppRoutes.recoverPassword,
|
||||
name: 'recover_password',
|
||||
pageBuilder: RecoverPasswordBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: '/device_signup',
|
||||
path: AppRoutes.deviceSignup,
|
||||
name: 'device_signup',
|
||||
pageBuilder: DeviceSignupBuilder().buildPage,
|
||||
),
|
||||
@@ -62,7 +61,7 @@ void configureAppRouter() {
|
||||
StatefulShellBranch(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/main/home',
|
||||
path: AppRoutes.dashboardHome,
|
||||
name: 'home',
|
||||
pageBuilder: const HomeBuilder().buildPage,
|
||||
),
|
||||
@@ -71,7 +70,7 @@ void configureAppRouter() {
|
||||
StatefulShellBranch(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/main/activity',
|
||||
path: AppRoutes.dashboardActivity,
|
||||
name: 'activity',
|
||||
pageBuilder: const ActivityBuilder().buildPage,
|
||||
),
|
||||
@@ -80,7 +79,7 @@ void configureAppRouter() {
|
||||
StatefulShellBranch(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/main/notifications',
|
||||
path: AppRoutes.dashboardNotifications,
|
||||
name: 'notifications',
|
||||
pageBuilder: const NotificationsBuilder().buildPage,
|
||||
),
|
||||
@@ -89,7 +88,7 @@ void configureAppRouter() {
|
||||
StatefulShellBranch(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: '/main/profile',
|
||||
path: AppRoutes.dashboardProfile,
|
||||
name: 'profile',
|
||||
pageBuilder: const ProfileBuilder().buildPage,
|
||||
),
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
enum AppRoutes {
|
||||
onboarding,
|
||||
linkPhone,
|
||||
phoneCode,
|
||||
login,
|
||||
recoverPassword,
|
||||
home,
|
||||
activity,
|
||||
notifications,
|
||||
profile,
|
||||
}
|
||||
Reference in New Issue
Block a user