Merge origin/main into frontend parity worktree

app/game-frontend/src/router/index.ts

@@ -4,6 +4,7 @@ import PublicView from '../views/PublicView.vue';
 import LoginView from '../views/LoginView.vue';
 import JoinView from '../views/JoinView.vue';
 import InheritView from '../views/InheritView.vue';
+import AuctionView from '../views/AuctionView.vue';
 import NationCitiesView from '../views/NationCitiesView.vue';
 import NationGeneralsView from '../views/NationGeneralsView.vue';
 import NationPersonnelView from '../views/NationPersonnelView.vue';
@@ -70,6 +71,15 @@ const routes = [
             requiresGeneral: true,
         },
     },
+    {
+        path: '/auction',
+        name: 'auction',
+        component: AuctionView,
+        meta: {
+            requiresAuth: true,
+            requiresGeneral: true,
+        },
+    },
     {
         path: '/nation/cities',
         name: 'nation-cities',