Revert "Merge branch 'devKA' into devka (resolve conflicts)"

This reverts commit 5f4184760d, reversing
changes made to 5e1da9617f.

Reverting changes on main

frontend/pweb/lib/app/router/router.dart

@@ -1,11 +1,13 @@
 import 'package:go_router/go_router.dart';
 
 import 'package:pweb/app/router/pages.dart';
+import 'package:pweb/app/router/page_params.dart';
 import 'package:pweb/pages/2fa/page.dart';
-import 'package:pweb/pages/errors/not_found.dart';
-import 'package:pweb/pages/login/page.dart';
 import 'package:pweb/pages/signup/page.dart';
-import 'package:pweb/app/router/payout_shell.dart';
+import 'package:pweb/pages/verification/page.dart';
+import 'package:pweb/widgets/sidebar/page.dart';
+import 'package:pweb/pages/login/page.dart';
+import 'package:pweb/pages/errors/not_found.dart';
 
 
 GoRouter createRouter() => GoRouter(
@@ -21,29 +23,31 @@ GoRouter createRouter() => GoRouter(
           path: routerPage(Pages.login),
           builder: (_, _) => const LoginPage(),
         ),
+        GoRoute(
+          name: Pages.dashboard.name,
+          path: routerPage(Pages.dashboard),
+          builder: (_, _) => const PageSelector(),
+        ),
         GoRoute(
           name: Pages.sfactor.name,
           path: routerPage(Pages.sfactor),
-          builder: (context, state) {
-            final isFromSignup = state.uri.queryParameters['from'] == 'signup';
-            
-            return TwoFactorCodePage(
-              onVerificationSuccess: () {
-                if (isFromSignup) {
-                  context.goNamed(Pages.login.name);
-                } else {
-                  context.goNamed(Pages.dashboard.name);
-                }
-              },
-            );
-          },
+          builder: (context, _) => TwoFactorCodePage(
+            onVerificationSuccess: () {
+              // trigger organization load
+              context.goNamed(Pages.dashboard.name);
+            },
+          ),
         ),
         GoRoute(
           name: Pages.signup.name,
           path: routerPage(Pages.signup),
           builder: (_, _) => const SignUpPage(),
         ),
-        payoutShellRoute(),
+        GoRoute(
+          name: Pages.verify.name,
+          path: '${routerPage(Pages.verify)}${routerAddParam(PageParams.token)}',
+          builder: (_, state) => AccountVerificationPage(token: state.pathParameters[PageParams.token.name]!),
+        ),
       ],
     ),
   ],