Merge branch 'functions' into legacy
# Conflicts: # apps/mobile_app/lib/navigation/app_router.dart # apps/mobile_app/pubspec.yaml # modules/legacy/melos_legacy.iml # packages/design_system/fonts/config.json
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import 'package:account/account.dart';
|
||||
import 'package:auth/auth.dart';
|
||||
import 'package:functions/functions.dart';
|
||||
import 'package:legacy_dashboard_shell/legacy_dashboard_builder.dart';
|
||||
import 'package:dashboard_shell/dashboard_builder.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -41,8 +42,32 @@ void configureAppRouter() {
|
||||
),
|
||||
],
|
||||
),
|
||||
StatefulShellBranch(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: AppRoutes.dashboardFunctions,
|
||||
name: 'functions',
|
||||
pageBuilder: FunctionsBuilder().buildPage,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.contacts,
|
||||
name: 'contacts',
|
||||
pageBuilder: ContactsBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.remoteConnection,
|
||||
name: 'remote_connection',
|
||||
pageBuilder: RemoteConnectionBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.locateDevice,
|
||||
name: 'locate_device',
|
||||
pageBuilder: LocateDeviceBuilder().buildPage,
|
||||
),
|
||||
GoRoute(
|
||||
path: AppRoutes.accountSettings,
|
||||
name: 'account_settings',
|
||||
|
||||
Reference in New Issue
Block a user