Migrated to GoRouter
Reasons for migration: - buggy behaviour from old router - GoRouter is a recommended flutter plugin - ShellRoutes allow exposing Providers to a limited scope of routes - GoRoutes provides named routes, and the navigator allows us to provide parameters directly.
This commit is contained in:
parent
bb9a8621a0
commit
5b9b48cd24
14 changed files with 316 additions and 278 deletions
221
lib/main.dart
221
lib/main.dart
|
@ -1,4 +1,5 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/themes.dart';
|
import 'package:outbag_app/backend/themes.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/screens/room/edit.dart';
|
import 'package:outbag_app/screens/room/edit.dart';
|
||||||
|
@ -14,13 +15,19 @@ import './screens/welcome.dart';
|
||||||
import './screens/room/main.dart';
|
import './screens/room/main.dart';
|
||||||
import './screens/auth.dart';
|
import './screens/auth.dart';
|
||||||
import './backend/request.dart';
|
import './backend/request.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
runApp(const OutbagApp());
|
runApp(const OutbagApp());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final GlobalKey<NavigatorState> _rootNavigatorKey =
|
||||||
|
GlobalKey<NavigatorState>(debugLabel: 'root');
|
||||||
|
final GlobalKey<NavigatorState> _userShellNavigatorKey =
|
||||||
|
GlobalKey<NavigatorState>(debugLabel: 'user');
|
||||||
|
final GlobalKey<NavigatorState> _roomShellNavigatorKey =
|
||||||
|
GlobalKey<NavigatorState>(debugLabel: 'room');
|
||||||
|
|
||||||
class OutbagApp extends StatefulWidget {
|
class OutbagApp extends StatefulWidget {
|
||||||
const OutbagApp({super.key});
|
const OutbagApp({super.key});
|
||||||
|
|
||||||
|
@ -41,6 +48,7 @@ class _OutbagAppState extends State {
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||||
// wait for user to be authorized
|
// wait for user to be authorized
|
||||||
User.listen((_) async {
|
User.listen((_) async {
|
||||||
try {
|
try {
|
||||||
|
@ -48,7 +56,7 @@ class _OutbagAppState extends State {
|
||||||
setState(() {
|
setState(() {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
});
|
});
|
||||||
fetchInfo();
|
fetchInfo(user);
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// no userdata found
|
// no userdata found
|
||||||
setState(() {
|
setState(() {
|
||||||
|
@ -64,20 +72,21 @@ class _OutbagAppState extends State {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
(() async {
|
// load theme
|
||||||
|
try {
|
||||||
final theme = await AppTheme.fromDisk();
|
final theme = await AppTheme.fromDisk();
|
||||||
setState(() {
|
setState(() {
|
||||||
this.theme = theme;
|
this.theme = theme;
|
||||||
});
|
});
|
||||||
})();
|
} catch (_) {}
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
// load user
|
||||||
try {
|
try {
|
||||||
final user = await User.fromDisk();
|
final user = await User.fromDisk();
|
||||||
setState(() {
|
setState(() {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
});
|
});
|
||||||
fetchInfo();
|
fetchInfo(user);
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// user unavailable
|
// user unavailable
|
||||||
// invalid credentials
|
// invalid credentials
|
||||||
|
@ -89,15 +98,15 @@ class _OutbagAppState extends State {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void fetchInfo() async {
|
void fetchInfo(User user) async {
|
||||||
// try to obtain user account information
|
// try to obtain user account information
|
||||||
// with existing details
|
// with existing details
|
||||||
// NOTE: also functions as a way to verify ther data
|
// NOTE: also functions as a way to verify ther data
|
||||||
doNetworkRequest(null,
|
doNetworkRequest(null,
|
||||||
req: () => postWithCreadentials(
|
req: () => postWithCreadentials(
|
||||||
target: (user?.server)!,
|
target: user.server,
|
||||||
path: 'getMyAccount',
|
path: 'getMyAccount',
|
||||||
credentials: user!,
|
credentials: user,
|
||||||
body: {}),
|
body: {}),
|
||||||
onOK: (body) {
|
onOK: (body) {
|
||||||
final info = AccountMeta.fromJSON(body['data']);
|
final info = AccountMeta.fromJSON(body['data']);
|
||||||
|
@ -111,7 +120,7 @@ class _OutbagAppState extends State {
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
info = null;
|
info = null;
|
||||||
user = null;
|
this.user = null;
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
@ -132,87 +141,139 @@ class _OutbagAppState extends State {
|
||||||
value: info,
|
value: info,
|
||||||
),
|
),
|
||||||
Provider<AppTheme>.value(value: theme),
|
Provider<AppTheme>.value(value: theme),
|
||||||
// conditional user provider
|
|
||||||
// used to only provide a user outside of the login area
|
|
||||||
...(user!=null)?[
|
|
||||||
Provider<User>.value(value:user!)
|
|
||||||
]:[]
|
|
||||||
],
|
],
|
||||||
child: MaterialApp.router(
|
child: MaterialApp.router(
|
||||||
title: "Outbag",
|
title: "Outbag",
|
||||||
themeMode: theme.mode,
|
themeMode: theme.mode,
|
||||||
theme: ThemeData(useMaterial3: true, brightness: Brightness.light),
|
theme: ThemeData(useMaterial3: true, brightness: Brightness.light),
|
||||||
darkTheme: ThemeData(useMaterial3: true, brightness: Brightness.dark),
|
darkTheme: ThemeData(useMaterial3: true, brightness: Brightness.dark),
|
||||||
routerDelegate: RoutemasterDelegate(
|
routerConfig: GoRouter(
|
||||||
routesBuilder: (context) => RouteMap(
|
navigatorKey: _rootNavigatorKey,
|
||||||
routes: {
|
initialLocation: '/',
|
||||||
// pre authentification routes
|
redirect: (context, state) async {
|
||||||
...(user == null)
|
if (user == null) {
|
||||||
? {
|
// prelogin
|
||||||
'/welcome/': (_) =>
|
if (!state.subloc.startsWith('/welcome')) {
|
||||||
const MaterialPage(child: WelcomePage()),
|
// prevent unauthorized user from accessing home
|
||||||
'/signup': (_) => const MaterialPage(
|
return '/welcome';
|
||||||
child: AuthPage(mode: Mode.signup)),
|
}
|
||||||
'/signupOTA': (_) => const MaterialPage(
|
} else {
|
||||||
child: AuthPage(mode: Mode.signupOTA)),
|
// post login
|
||||||
'/signin': (_) => const MaterialPage(
|
if (state.subloc.startsWith('/welcome')) {
|
||||||
child: AuthPage(mode: Mode.signin)),
|
// prevent authorized user from accessing /welcome
|
||||||
|
return '/';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
: {},
|
|
||||||
|
|
||||||
// routes that need the user
|
|
||||||
// to exis
|
|
||||||
...(user!=null)?{
|
|
||||||
'/': (_) => const MaterialPage(child: HomePage()),
|
|
||||||
|
|
||||||
// user-space settings
|
|
||||||
'/settings': (_) =>
|
|
||||||
const MaterialPage(child: SettingsPage()),
|
|
||||||
|
|
||||||
// server dashboard
|
|
||||||
// TODO: add permission check
|
|
||||||
// so routes are only available
|
|
||||||
// if user is allowed to view dashboard
|
|
||||||
...{
|
|
||||||
|
|
||||||
|
return null;
|
||||||
},
|
},
|
||||||
// room related settings
|
routes: <RouteBase>[
|
||||||
'/add-room/new': (_) =>
|
// unauthorized routes
|
||||||
const MaterialPage(child: NewRoomPage()),
|
GoRoute(
|
||||||
'/add-room': (_) =>
|
name: 'welcome',
|
||||||
const MaterialPage(child: JoinRoomPage()),
|
path: '/welcome',
|
||||||
'/r/:server/:tag/': (info) {
|
builder: (context, state) => const WelcomePage(),
|
||||||
final server = info.pathParameters['server'] ?? "";
|
routes: <RouteBase>[
|
||||||
final tag = info.pathParameters['tag'] ?? "";
|
GoRoute(
|
||||||
|
name: 'signin',
|
||||||
|
path: 'signin',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const AuthPage(mode: Mode.signin),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
name: 'signup',
|
||||||
|
path: 'signup',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const AuthPage(mode: Mode.signup),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
name: 'signup-ota',
|
||||||
|
path: 'signup-ota',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const AuthPage(mode: Mode.signupOTA),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
|
||||||
return MaterialPage(child: RoomPage(server, tag));
|
// authorized routes
|
||||||
},
|
ShellRoute(
|
||||||
'/r/:server/:tag/edit': (info) {
|
navigatorKey: _userShellNavigatorKey,
|
||||||
final server = info.pathParameters['server'] ?? "";
|
builder: (context, state, child) =>
|
||||||
final tag = info.pathParameters['tag'] ?? "";
|
Provider.value(value: user!, child: child),
|
||||||
|
routes: <RouteBase>[
|
||||||
|
GoRoute(
|
||||||
|
path: '/',
|
||||||
|
name: 'home',
|
||||||
|
builder: (context, state) => const HomePage(),
|
||||||
|
routes: [
|
||||||
|
GoRoute(
|
||||||
|
name: 'settings',
|
||||||
|
path: 'settings',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const SettingsPage()),
|
||||||
|
GoRoute(
|
||||||
|
path: 'join-room',
|
||||||
|
name: 'add-room',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const JoinRoomPage(),
|
||||||
|
routes: <RouteBase>[
|
||||||
|
GoRoute(
|
||||||
|
path: 'new',
|
||||||
|
name: 'new-room',
|
||||||
|
builder: (context, state) =>
|
||||||
|
const NewRoomPage()),
|
||||||
|
]),
|
||||||
|
GoRoute(
|
||||||
|
name: 'room',
|
||||||
|
path: 'r/:server/:id',
|
||||||
|
builder: (context, state) => RoomPage(
|
||||||
|
state.params['server'] ?? '',
|
||||||
|
state.params['id'] ?? ''),
|
||||||
|
routes: <RouteBase>[
|
||||||
|
ShellRoute(
|
||||||
|
navigatorKey: _roomShellNavigatorKey,
|
||||||
|
builder: (context, state, child) =>
|
||||||
|
Provider.value(
|
||||||
|
// TODO: provide nullable room data
|
||||||
|
value: null,
|
||||||
|
child: child),
|
||||||
|
routes: <RouteBase>[
|
||||||
|
GoRoute(
|
||||||
|
name: 'edit-room',
|
||||||
|
path: 'edit',
|
||||||
|
builder: (context, state) =>
|
||||||
|
EditRoomPage(
|
||||||
|
state.params['server'] ??
|
||||||
|
'',
|
||||||
|
state.params['id'] ?? '')),
|
||||||
|
GoRoute(
|
||||||
|
name: 'room-members',
|
||||||
|
path: 'members',
|
||||||
|
builder: (context, state) =>
|
||||||
|
ManageRoomMembersPage(
|
||||||
|
state.params['server'] ??
|
||||||
|
'',
|
||||||
|
state.params['id'] ?? '')),
|
||||||
|
GoRoute(
|
||||||
|
name: 'room-permissions',
|
||||||
|
path: 'roles',
|
||||||
|
builder: (context, state) =>
|
||||||
|
EditRoomPermissionSetPage(
|
||||||
|
state.params['server'] ??
|
||||||
|
'',
|
||||||
|
state.params['id'] ?? '')),
|
||||||
|
])
|
||||||
|
])
|
||||||
|
]),
|
||||||
|
]),
|
||||||
|
|
||||||
return MaterialPage(child: EditRoomPage(server, tag));
|
// routes that can be accessed
|
||||||
},
|
// with and without an account
|
||||||
'/r/:server/:tag/members': (info) {
|
// i.e the about screen
|
||||||
final server = info.pathParameters['server'] ?? "";
|
GoRoute(
|
||||||
final tag = info.pathParameters['tag'] ?? "";
|
path: '/about',
|
||||||
|
name: 'about',
|
||||||
return MaterialPage(
|
builder: (context, state) => const Text('About'))
|
||||||
child: ManageRoomMembersPage(server, tag));
|
]),
|
||||||
},
|
|
||||||
'/r/:server/:tag/permissions': (info) {
|
|
||||||
final server = info.pathParameters['server'] ?? "";
|
|
||||||
final tag = info.pathParameters['tag'] ?? "";
|
|
||||||
|
|
||||||
return MaterialPage(
|
|
||||||
child: EditRoomPermissionSetPage(server, tag));
|
|
||||||
},
|
|
||||||
}:{}
|
|
||||||
},
|
|
||||||
onUnknownRoute: (_) => (user == null)
|
|
||||||
? const MaterialPage(child: WelcomePage())
|
|
||||||
: const Redirect('/'))),
|
|
||||||
routeInformationParser: const RoutemasterParser(),
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,6 @@ import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:outbag_app/tools/snackbar.dart';
|
import 'package:outbag_app/tools/snackbar.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
import '../backend/resolve_url.dart';
|
import '../backend/resolve_url.dart';
|
||||||
|
|
||||||
enum Mode {
|
enum Mode {
|
||||||
|
@ -58,14 +57,6 @@ class _AuthPageState extends State<AuthPage> {
|
||||||
: Scaffold(
|
: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text(modeName),
|
title: Text(modeName),
|
||||||
leading: IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
// go back
|
|
||||||
Routemaster.of(context).history.back();
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
tooltip: "Go back",
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
body: Center(
|
body: Center(
|
||||||
child: ConstrainedBox(
|
child: ConstrainedBox(
|
||||||
|
|
|
@ -5,7 +5,7 @@ import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import '../backend/room.dart';
|
import '../backend/room.dart';
|
||||||
|
|
||||||
class HomePage extends StatefulWidget {
|
class HomePage extends StatefulWidget {
|
||||||
|
@ -94,7 +94,7 @@ class _HomePageState extends State<HomePage> {
|
||||||
child: const Text('Settings'),
|
child: const Text('Settings'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// show settings screen
|
// show settings screen
|
||||||
Routemaster.of(context).push("/settings");
|
context.goNamed('settings');
|
||||||
}),
|
}),
|
||||||
...(context.watch<AccountMeta?>() != null &&
|
...(context.watch<AccountMeta?>() != null &&
|
||||||
(context.watch<AccountMeta?>()?.permissions)! &
|
(context.watch<AccountMeta?>()?.permissions)! &
|
||||||
|
@ -106,7 +106,7 @@ class _HomePageState extends State<HomePage> {
|
||||||
child: const Text('Server Dashboard'),
|
child: const Text('Server Dashboard'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// show settings screen
|
// show settings screen
|
||||||
Routemaster.of(context).push("/server");
|
context.goNamed('dash');
|
||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
: [],
|
: [],
|
||||||
|
@ -115,7 +115,7 @@ class _HomePageState extends State<HomePage> {
|
||||||
child: const Text('About'),
|
child: const Text('About'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// show about screen
|
// show about screen
|
||||||
Routemaster.of(context).push("/about");
|
context.goNamed('about');
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
@ -132,8 +132,8 @@ class _HomePageState extends State<HomePage> {
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// open room
|
// open room
|
||||||
Routemaster.of(context)
|
context.goNamed('room',
|
||||||
.push("/r/${room.serverTag}/${room.id}");
|
params: {'server': room.serverTag, 'id': room.id});
|
||||||
},
|
},
|
||||||
onLongPress: () {
|
onLongPress: () {
|
||||||
// open bottom sheet
|
// open bottom sheet
|
||||||
|
@ -158,7 +158,7 @@ class _HomePageState extends State<HomePage> {
|
||||||
icon: const Icon(Icons.add),
|
icon: const Icon(Icons.add),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// create new room
|
// create new room
|
||||||
Routemaster.of(context).push("/add-room");
|
context.goNamed('add-room');
|
||||||
},
|
},
|
||||||
tooltip: 'Add new Room',
|
tooltip: 'Add new Room',
|
||||||
),
|
),
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/errors.dart';
|
import 'package:outbag_app/backend/errors.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
class EditRoomPage extends StatefulWidget {
|
class EditRoomPage extends StatefulWidget {
|
||||||
|
@ -44,7 +44,7 @@ class _EditRoomPageState extends State<EditRoomPage> {
|
||||||
// fetch room information
|
// fetch room information
|
||||||
void fetchInfo() {
|
void fetchInfo() {
|
||||||
final sm = ScaffoldMessenger.of(context);
|
final sm = ScaffoldMessenger.of(context);
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
final user = context.read<User>();
|
final user = context.read<User>();
|
||||||
|
|
||||||
doNetworkRequest(
|
doNetworkRequest(
|
||||||
|
@ -69,7 +69,7 @@ class _EditRoomPageState extends State<EditRoomPage> {
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
// no room data available
|
// no room data available
|
||||||
// close screen
|
// close screen
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('homoe');
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
return true;
|
return true;
|
||||||
|
@ -77,7 +77,7 @@ class _EditRoomPageState extends State<EditRoomPage> {
|
||||||
onServerErr: (json) {
|
onServerErr: (json) {
|
||||||
// user not allowed to be here
|
// user not allowed to be here
|
||||||
// close screen
|
// close screen
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('homoe');
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
class JoinRoomPage extends StatefulWidget {
|
class JoinRoomPage extends StatefulWidget {
|
||||||
|
@ -99,14 +99,6 @@ class _JoinRoomPageState extends State {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: const Text('Join Room'),
|
title: const Text('Join Room'),
|
||||||
leading: IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
// go back
|
|
||||||
Routemaster.of(context).history.back();
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
tooltip: "Go back",
|
|
||||||
),
|
|
||||||
actions: [
|
actions: [
|
||||||
IconButton(
|
IconButton(
|
||||||
icon: const Icon(Icons.search),
|
icon: const Icon(Icons.search),
|
||||||
|
@ -143,7 +135,7 @@ class _JoinRoomPageState extends State {
|
||||||
child: const Text('Join invite-only room'),
|
child: const Text('Join invite-only room'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// show settings screen
|
// show settings screen
|
||||||
Routemaster.of(context).push("/add-room/by-id");
|
context.goNamed('join-room-ota');
|
||||||
}),
|
}),
|
||||||
])
|
])
|
||||||
],
|
],
|
||||||
|
@ -243,13 +235,13 @@ class _JoinRoomPageState extends State {
|
||||||
final scaffMgr =
|
final scaffMgr =
|
||||||
ScaffoldMessenger.of(
|
ScaffoldMessenger.of(
|
||||||
context);
|
context);
|
||||||
final rmaster =
|
|
||||||
Routemaster.of(
|
|
||||||
context);
|
|
||||||
final nav =
|
final nav =
|
||||||
Navigator.of(context);
|
Navigator.of(context);
|
||||||
final user =
|
final user =
|
||||||
context.read<User>();
|
context.read<User>();
|
||||||
|
final router =
|
||||||
|
GoRouter.of(context);
|
||||||
|
|
||||||
doNetworkRequest(scaffMgr,
|
doNetworkRequest(scaffMgr,
|
||||||
req: () =>
|
req: () =>
|
||||||
|
@ -269,8 +261,14 @@ class _JoinRoomPageState extends State {
|
||||||
onOK: (body) async {
|
onOK: (body) async {
|
||||||
await room.toDisk();
|
await room.toDisk();
|
||||||
nav.pop();
|
nav.pop();
|
||||||
rmaster.replace(
|
router
|
||||||
'/r/${room.serverTag}/${room.id}');
|
.pushReplacementNamed(
|
||||||
|
'room',
|
||||||
|
params: {
|
||||||
|
'server': room
|
||||||
|
.serverTag,
|
||||||
|
'id': room.id
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
|
@ -300,7 +298,7 @@ class _JoinRoomPageState extends State {
|
||||||
icon: const Icon(Icons.add),
|
icon: const Icon(Icons.add),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// create new room
|
// create new room
|
||||||
Routemaster.of(context).push("/add-room/new");
|
context.goNamed('new-room');
|
||||||
},
|
},
|
||||||
tooltip: 'Create Room',
|
tooltip: 'Create Room',
|
||||||
),
|
),
|
||||||
|
|
|
@ -8,7 +8,6 @@ import 'package:outbag_app/screens/room/pages/products.dart';
|
||||||
import 'package:outbag_app/screens/room/pages/list.dart';
|
import 'package:outbag_app/screens/room/pages/list.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
class RoomPage extends StatefulWidget {
|
class RoomPage extends StatefulWidget {
|
||||||
final String server;
|
final String server;
|
||||||
|
@ -105,14 +104,6 @@ class _RoomPageState extends State<RoomPage> {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text(room?.name ?? 'Unknown Room'),
|
title: Text(room?.name ?? 'Unknown Room'),
|
||||||
leading: IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
// go back
|
|
||||||
Routemaster.of(context).history.back();
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
tooltip: "Go back",
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
body: PageView(
|
body: PageView(
|
||||||
controller: _ctr,
|
controller: _ctr,
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/permissions.dart';
|
import 'package:outbag_app/backend/permissions.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
class ManageRoomMembersPage extends StatefulWidget {
|
class ManageRoomMembersPage extends StatefulWidget {
|
||||||
final String server;
|
final String server;
|
||||||
|
@ -22,7 +22,7 @@ class _ManageRoomMembersPageState extends State<ManageRoomMembersPage> {
|
||||||
RoomInfo? info;
|
RoomInfo? info;
|
||||||
|
|
||||||
void fetchUserInfo() {
|
void fetchUserInfo() {
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
final sm = ScaffoldMessenger.of(context);
|
final sm = ScaffoldMessenger.of(context);
|
||||||
final user = context.read<User>();
|
final user = context.read<User>();
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ class _ManageRoomMembersPageState extends State<ManageRoomMembersPage> {
|
||||||
onAnyErr: () {
|
onAnyErr: () {
|
||||||
// user should not be here
|
// user should not be here
|
||||||
// close screen
|
// close screen
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
onOK: (body) async {
|
onOK: (body) async {
|
||||||
|
@ -50,7 +50,7 @@ class _ManageRoomMembersPageState extends State<ManageRoomMembersPage> {
|
||||||
}
|
}
|
||||||
|
|
||||||
void fetchMembers() {
|
void fetchMembers() {
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
final sm = ScaffoldMessenger.of(context);
|
final sm = ScaffoldMessenger.of(context);
|
||||||
final user = context.read<User>();
|
final user = context.read<User>();
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ class _ManageRoomMembersPageState extends State<ManageRoomMembersPage> {
|
||||||
onAnyErr: () {
|
onAnyErr: () {
|
||||||
// user should not be here
|
// user should not be here
|
||||||
// close screen
|
// close screen
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
onOK: (body) {
|
onOK: (body) {
|
||||||
|
@ -303,11 +303,7 @@ class _ManageRoomMembersPageState extends State<ManageRoomMembersPage> {
|
||||||
doNetworkRequest(
|
doNetworkRequest(
|
||||||
scaffMgr,
|
scaffMgr,
|
||||||
req: () =>
|
req: () =>
|
||||||
postWithCreadentials(
|
postWithCreadentials(path: 'kickMember', credentials: user, target: user.server, body: {
|
||||||
path: 'kickMember',
|
|
||||||
credentials: user,
|
|
||||||
target: user.server,
|
|
||||||
body: {
|
|
||||||
'room': widget.tag,
|
'room': widget.tag,
|
||||||
'roomServer': widget.server,
|
'roomServer': widget.server,
|
||||||
'name': item.id,
|
'name': item.id,
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:outbag_app/tools/snackbar.dart';
|
import 'package:outbag_app/tools/snackbar.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
class NewRoomPage extends StatefulWidget {
|
class NewRoomPage extends StatefulWidget {
|
||||||
|
@ -48,14 +48,6 @@ class _NewRoomPageState extends State {
|
||||||
: Scaffold(
|
: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: const Text('New Room'),
|
title: const Text('New Room'),
|
||||||
leading: IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
// go back
|
|
||||||
Routemaster.of(context).history.back();
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
tooltip: "Go back",
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
body: SingleChildScrollView(
|
body: SingleChildScrollView(
|
||||||
child: Center(
|
child: Center(
|
||||||
|
@ -186,7 +178,7 @@ class _NewRoomPageState extends State {
|
||||||
floatingActionButton: FloatingActionButton.extended(
|
floatingActionButton: FloatingActionButton.extended(
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
final scaffMgr = ScaffoldMessenger.of(context);
|
final scaffMgr = ScaffoldMessenger.of(context);
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
|
|
||||||
// ID should be at least three characters long
|
// ID should be at least three characters long
|
||||||
if (_ctrID.text.length < 3) {
|
if (_ctrID.text.length < 3) {
|
||||||
|
@ -233,7 +225,7 @@ class _NewRoomPageState extends State {
|
||||||
// save room
|
// save room
|
||||||
await room.toDisk();
|
await room.toDisk();
|
||||||
// move to home page
|
// move to home page
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
label: const Text('Create'),
|
label: const Text('Create'),
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/permissions.dart';
|
import 'package:outbag_app/backend/permissions.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
|
@ -7,7 +8,6 @@ import 'package:outbag_app/backend/user.dart';
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
class AboutRoomPage extends StatefulWidget {
|
class AboutRoomPage extends StatefulWidget {
|
||||||
final RoomInfo? info;
|
final RoomInfo? info;
|
||||||
|
@ -161,8 +161,10 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
'Change the rooms name, description and icon'),
|
'Change the rooms name, description and icon'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// show edit room screen
|
// show edit room screen
|
||||||
Routemaster.of(context).push(
|
context.goNamed('edit-room', params: {
|
||||||
'/r/${widget.room?.serverTag}/${widget.room?.id}/edit');
|
'server': (widget.room?.serverTag)!,
|
||||||
|
'id': (widget.room?.id)!
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
@ -174,8 +176,10 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
subtitle: const Text('Show Member list'),
|
subtitle: const Text('Show Member list'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// open member view screen
|
// open member view screen
|
||||||
Routemaster.of(context).push(
|
context.goNamed('room-members', params: {
|
||||||
'/r/${widget.room?.serverTag}/${widget.room?.id}/members');
|
'server': (widget.room?.serverTag)!,
|
||||||
|
'id': (widget.room?.id)!
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
// edit default member permission
|
// edit default member permission
|
||||||
|
@ -193,8 +197,10 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
'Change the default permission-set for all members'),
|
'Change the default permission-set for all members'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// show checkbox screen
|
// show checkbox screen
|
||||||
Routemaster.of(context).push(
|
context.goNamed('room-permissions', params: {
|
||||||
'/r/${widget.room?.serverTag}/${widget.room?.id}/permissions');
|
'server': (widget.room?.serverTag)!,
|
||||||
|
'id': (widget.room?.id)!
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
@ -211,8 +217,10 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
subtitle: const Text('Add and delete OTAs'),
|
subtitle: const Text('Add and delete OTAs'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// show manage ota screen
|
// show manage ota screen
|
||||||
Routemaster.of(context).push(
|
context.goNamed('room-ota', params: {
|
||||||
'/r/${widget.room?.serverTag}/${widget.room?.id}/ota');
|
'server': (widget.room?.serverTag)!,
|
||||||
|
'id': (widget.room?.id)!
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
|
@ -221,8 +229,10 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
subtitle: const Text('Invite people to this room'),
|
subtitle: const Text('Invite people to this room'),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
// show manage ota screen
|
// show manage ota screen
|
||||||
Routemaster.of(context).push(
|
context.goNamed('room-invite', params: {
|
||||||
'/r/${widget.room?.serverTag}/${widget.room?.id}/invite');
|
'server': (widget.room?.serverTag)!,
|
||||||
|
'id': (widget.room?.id)!
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
@ -262,7 +272,7 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
final scaffMgr =
|
final scaffMgr =
|
||||||
ScaffoldMessenger.of(ctx);
|
ScaffoldMessenger.of(ctx);
|
||||||
final nav = Navigator.of(ctx);
|
final nav = Navigator.of(ctx);
|
||||||
final rmaster = Routemaster.of(ctx);
|
final router = GoRouter.of(ctx);
|
||||||
final user = ctx.read<User>();
|
final user = ctx.read<User>();
|
||||||
|
|
||||||
doNetworkRequest(scaffMgr,
|
doNetworkRequest(scaffMgr,
|
||||||
|
@ -284,7 +294,7 @@ class _AboutRoomPageState extends State<AboutRoomPage> {
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
|
|
||||||
// go back home
|
// go back home
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
},
|
},
|
||||||
after: () {
|
after: () {
|
||||||
// close popup
|
// close popup
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/permissions.dart';
|
import 'package:outbag_app/backend/permissions.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/room.dart';
|
import 'package:outbag_app/backend/room.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
class EditRoomPermissionSetPage extends StatefulWidget {
|
class EditRoomPermissionSetPage extends StatefulWidget {
|
||||||
final String server;
|
final String server;
|
||||||
|
@ -24,7 +24,7 @@ class _EditRoomPermissionSetPageState extends State<EditRoomPermissionSetPage> {
|
||||||
int permissions = 0;
|
int permissions = 0;
|
||||||
|
|
||||||
void fetchInfo() {
|
void fetchInfo() {
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
final sm = ScaffoldMessenger.of(context);
|
final sm = ScaffoldMessenger.of(context);
|
||||||
final user = context.read<User>();
|
final user = context.read<User>();
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class _EditRoomPermissionSetPageState extends State<EditRoomPermissionSetPage> {
|
||||||
onAnyErr: () {
|
onAnyErr: () {
|
||||||
// user should not be here
|
// user should not be here
|
||||||
// close screen
|
// close screen
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
onOK: (body) async {
|
onOK: (body) async {
|
||||||
|
@ -95,7 +95,7 @@ class _EditRoomPermissionSetPageState extends State<EditRoomPermissionSetPage> {
|
||||||
tooltip: "Update default permission set",
|
tooltip: "Update default permission set",
|
||||||
label: const Text('Edit'),
|
label: const Text('Edit'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
final rmaster = Routemaster.of(context);
|
final router = GoRouter.of(context);
|
||||||
final sm = ScaffoldMessenger.of(context);
|
final sm = ScaffoldMessenger.of(context);
|
||||||
final user = context.read<User>();
|
final user = context.read<User>();
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ class _EditRoomPermissionSetPageState extends State<EditRoomPermissionSetPage> {
|
||||||
'rights': permissions
|
'rights': permissions
|
||||||
}),
|
}),
|
||||||
onOK: (_) {
|
onOK: (_) {
|
||||||
rmaster.pop();
|
router.pop();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/backend/request.dart';
|
import 'package:outbag_app/backend/request.dart';
|
||||||
import 'package:outbag_app/backend/themes.dart';
|
import 'package:outbag_app/backend/themes.dart';
|
||||||
import 'package:outbag_app/backend/user.dart';
|
import 'package:outbag_app/backend/user.dart';
|
||||||
import 'package:outbag_app/screens/settings/dialogs/password.dart';
|
import 'package:outbag_app/screens/settings/dialogs/password.dart';
|
||||||
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
import 'package:outbag_app/tools/fetch_wrapper.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
|
|
||||||
class SettingsPage extends StatefulWidget {
|
class SettingsPage extends StatefulWidget {
|
||||||
const SettingsPage({super.key});
|
const SettingsPage({super.key});
|
||||||
|
@ -27,14 +27,6 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: const Text('Settings'),
|
title: const Text('Settings'),
|
||||||
leading: IconButton(
|
|
||||||
onPressed: () {
|
|
||||||
// go back
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
tooltip: "Go back",
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
body: SingleChildScrollView(
|
body: SingleChildScrollView(
|
||||||
child: Center(
|
child: Center(
|
||||||
|
@ -182,7 +174,7 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||||
// send request
|
// send request
|
||||||
final scaffMgr = ScaffoldMessenger.of(ctx);
|
final scaffMgr = ScaffoldMessenger.of(ctx);
|
||||||
final nav = Navigator.of(ctx);
|
final nav = Navigator.of(ctx);
|
||||||
final rmaster = Routemaster.of(ctx);
|
final router = GoRouter.of(ctx);
|
||||||
|
|
||||||
doNetworkRequest(scaffMgr,
|
doNetworkRequest(scaffMgr,
|
||||||
req: () => postWithCreadentials(
|
req: () => postWithCreadentials(
|
||||||
|
@ -199,7 +191,7 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||||
// TODO: delete all rooms
|
// TODO: delete all rooms
|
||||||
|
|
||||||
// go back home
|
// go back home
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
},
|
},
|
||||||
after: () {
|
after: () {
|
||||||
// close popup
|
// close popup
|
||||||
|
@ -238,7 +230,7 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||||
FilledButton(
|
FilledButton(
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
// send request
|
// send request
|
||||||
final rmaster = Routemaster.of(ctx);
|
final router = GoRouter.of(ctx);
|
||||||
|
|
||||||
// delete everything
|
// delete everything
|
||||||
// delete user data (meta)
|
// delete user data (meta)
|
||||||
|
@ -248,7 +240,7 @@ class _SettingsPageState extends State<SettingsPage> {
|
||||||
// TODO: delete all rooms
|
// TODO: delete all rooms
|
||||||
|
|
||||||
// go back home
|
// go back home
|
||||||
rmaster.replace('/');
|
router.pushReplacementNamed('home');
|
||||||
},
|
},
|
||||||
child: const Text('Log out'),
|
child: const Text('Log out'),
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:outbag_app/tools/assets.dart';
|
import 'package:outbag_app/tools/assets.dart';
|
||||||
import 'package:routemaster/routemaster.dart';
|
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
|
@ -64,8 +64,7 @@ class _WelcomePageState extends State<WelcomePage> {
|
||||||
SvgPicture.asset(asset("undraw/undraw_shopping_app.svg"),
|
SvgPicture.asset(asset("undraw/undraw_shopping_app.svg"),
|
||||||
fit: BoxFit.contain,
|
fit: BoxFit.contain,
|
||||||
width: smallest * 0.5,
|
width: smallest * 0.5,
|
||||||
height: smallest*0.5
|
height: smallest * 0.5),
|
||||||
),
|
|
||||||
Text(
|
Text(
|
||||||
'Welcome to Outbag',
|
'Welcome to Outbag',
|
||||||
style: textTheme.displaySmall,
|
style: textTheme.displaySmall,
|
||||||
|
@ -125,7 +124,7 @@ class _WelcomePageState extends State<WelcomePage> {
|
||||||
)),
|
)),
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Routemaster.of(context).push("/signin");
|
context.goNamed('signin');
|
||||||
},
|
},
|
||||||
child: const Text('I already have an account'),
|
child: const Text('I already have an account'),
|
||||||
)
|
)
|
||||||
|
@ -138,7 +137,7 @@ class _WelcomePageState extends State<WelcomePage> {
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
if (controller.page == 4 - 1) {
|
if (controller.page == 4 - 1) {
|
||||||
// open signup screen
|
// open signup screen
|
||||||
Routemaster.of(context).push("/signup");
|
context.goNamed('signup');
|
||||||
} else {
|
} else {
|
||||||
// move to next page
|
// move to next page
|
||||||
controller.nextPage(
|
controller.nextPage(
|
||||||
|
|
24
pubspec.lock
24
pubspec.lock
|
@ -152,6 +152,14 @@ packages:
|
||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
version: "0.0.0"
|
||||||
|
go_router:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: go_router
|
||||||
|
sha256: "432409518740645ce7f28802171b78783197d01149fad44f9b8ae55f40277139"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "6.5.0"
|
||||||
http:
|
http:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
@ -208,6 +216,14 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.3.5"
|
version: "1.3.5"
|
||||||
|
logging:
|
||||||
|
dependency: transitive
|
||||||
|
description:
|
||||||
|
name: logging
|
||||||
|
sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "1.1.1"
|
||||||
matcher:
|
matcher:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -352,14 +368,6 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.0.5"
|
version: "6.0.5"
|
||||||
routemaster:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: routemaster
|
|
||||||
sha256: b3b10b6ee31c741b453091e6b33323cc96631b19e4a14fc6069e9de056c7311c
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "1.0.1"
|
|
||||||
sky_engine:
|
sky_engine:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description: flutter
|
description: flutter
|
||||||
|
|
|
@ -30,12 +30,12 @@ environment:
|
||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
routemaster: ^1.0.1
|
|
||||||
flutter_svg: ^2.0.4
|
flutter_svg: ^2.0.4
|
||||||
http: ^0.13.5
|
http: ^0.13.5
|
||||||
localstore: ^1.3.5
|
localstore: ^1.3.5
|
||||||
crypto: ^3.0.2
|
crypto: ^3.0.2
|
||||||
provider: ^6.0.5
|
provider: ^6.0.5
|
||||||
|
go_router: ^6.5.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|
Loading…
Reference in a new issue