fix: alot

lib/app/router.dart

@@ -12,7 +12,6 @@ import '../views/bar/bar_screen_view.dart';
 import '../views/dev_menu_view.dart';
 import '../views/error_screen_view.dart';
 import '../views/history_screen_view.dart';
-import '../views/import_names_view.dart';
 import '../views/pin_lock_view.dart';
 import '../views/product_form_view.dart';
 import '../views/product_list_view.dart';
@@ -35,24 +34,18 @@ String? _redirectApp({
   }
 
   final location = state.uri.path;
-  final isConfigured = remoteSyncViewModel.isConfigured;
+  final returnTo = _returnLocation(state);
 
-  if (!isConfigured && location != '/register') {
-    return '/register';
+  if (remoteSyncViewModel.isConfigured && location == '/register') {
+    return '/admin';
   }
 
-  if (isConfigured && location == '/register') {
-    return '/bar';
-  }
-
-  if (!isConfigured) return null;
-
   final goingToLock = location == '/lock';
   final goingToAdminLock = location == '/admin/lock';
   final mustBeOnLock = _mustBeOnLock(pinLockViewModel);
 
-  if (mustBeOnLock && !goingToLock) return '/lock';
-  if (!mustBeOnLock && goingToLock) return '/bar';
+  if (mustBeOnLock && !goingToLock) return _lockLocation('/lock', state);
+  if (!mustBeOnLock && goingToLock) return returnTo ?? '/bar';
 
   final isAdminArea = _isAdminArea(location);
   final isDebugShortcutArea = _isDebugShortcutArea(location);
@@ -61,14 +54,34 @@ String? _redirectApp({
       !isDebugShortcutArea &&
       !goingToAdminLock &&
       !adminPinViewModel.isUnlocked) {
-    return '/admin/lock';
+    return _lockLocation('/admin/lock', state);
   }
 
-  if (goingToAdminLock && adminPinViewModel.isUnlocked) return '/admin';
+  if (goingToAdminLock && adminPinViewModel.isUnlocked) {
+    return returnTo ?? '/admin';
+  }
 
   return null;
 }
 
+/// Sends the user back where they were headed once the PIN is entered.
+String _lockLocation(String lockPath, GoRouterState state) {
+  return Uri(
+    path: lockPath,
+    queryParameters: {'from': state.uri.toString()},
+  ).toString();
+}
+
+String? _returnLocation(GoRouterState state) {
+  final from = state.uri.queryParameters['from'];
+  if (from == null || !from.startsWith('/')) return null;
+
+  final path = Uri.parse(from).path;
+  if (path == '/lock' || path == '/admin/lock') return null;
+
+  return from;
+}
+
 bool _mustBeOnLock(PinLockViewModel pinLockViewModel) {
   final needsPinSetup =
       !pinLockViewModel.isPinSet && pinLockViewModel.pinRequired;
@@ -83,6 +96,9 @@ bool _mustBeOnLock(PinLockViewModel pinLockViewModel) {
 bool _isAdminArea(String location) {
   return location == '/admin' ||
       location.startsWith('/admin/') ||
+      location == '/settings' ||
+      location == '/dev' ||
+      location == '/register' ||
       location == '/products' ||
       location.startsWith('/products/') ||
       location == '/history' ||
@@ -135,9 +151,7 @@ GoRouter createAppRouter({
           mode: pinLockViewModel.isPinSet
               ? PinEntryMode.unlock
               : PinEntryMode.create,
-          onSuccess: () {
-            context.go('/bar');
-          },
+          onSuccess: () => context.go(_returnLocation(state) ?? '/bar'),
         ),
       ),
 
@@ -153,19 +167,13 @@ GoRouter createAppRouter({
           onVerify: adminPinViewModel.verify,
           onSet: adminPinViewModel.setPin,
           error: () => adminPinViewModel.error,
-          onSuccess: () => context.go('/admin'),
+          onSuccess: () => context.go(_returnLocation(state) ?? '/admin'),
         ),
       ),
 
       GoRoute(
         path: '/admin',
         builder: (context, state) => const AdminScreenView(),
-        routes: [
-          GoRoute(
-            path: 'import',
-            builder: (context, state) => const ImportNamesView(),
-          ),
-        ],
       ),
 
       GoRoute(