Merge branch 'main' into feature/dynasty-list-parity

# Conflicts:
#	tools/frontend-legacy-parity/playwright.config.mjs

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

@@ -10,6 +10,7 @@ import NationInfoView from '../views/NationInfoView.vue';
 import GlobalInfoView from '../views/GlobalInfoView.vue';
 import CurrentCityView from '../views/CurrentCityView.vue';
 import NationGeneralsView from '../views/NationGeneralsView.vue';
+import NationSecretView from '../views/NationSecretView.vue';
 import NationPersonnelView from '../views/NationPersonnelView.vue';
 import NationStratFinanView from '../views/NationStratFinanView.vue';
 import ChiefCenterView from '../views/ChiefCenterView.vue';
@@ -20,7 +21,6 @@ import NotFoundView from '../views/NotFoundView.vue';
 import TournamentView from '../views/TournamentView.vue';
 import BettingView from '../views/BettingView.vue';
 import MyPageView from '../views/MyPageView.vue';
-import MySettingsView from '../views/MySettingsView.vue';
 import BoardView from '../views/BoardView.vue';
 import DiplomacyView from '../views/DiplomacyView.vue';
 import BestGeneralView from '../views/BestGeneralView.vue';
@@ -32,6 +32,7 @@ import TroopView from '../views/TroopView.vue';
 import YearbookView from '../views/YearbookView.vue';
 import NationBettingView from '../views/NationBettingView.vue';
 import NpcListView from '../views/NpcListView.vue';
+import TrafficView from '../views/TrafficView.vue';
 import { useSessionStore } from '../stores/session';
 
 const routes = [
@@ -148,6 +149,12 @@ const routes = [
             requiresGeneral: true,
         },
     },
+    {
+        path: '/nation/secret',
+        name: 'nation-secret',
+        component: NationSecretView,
+        meta: { requiresAuth: true, requiresGeneral: true },
+    },
     {
         path: '/nation/personnel',
         name: 'nation-personnel',
@@ -190,7 +197,6 @@ const routes = [
         component: BattleSimulatorView,
         meta: {
             requiresAuth: true,
-            requiresGeneral: true,
         },
     },
     {
@@ -252,6 +258,11 @@ const routes = [
             requiresGeneral: true,
         },
     },
+    {
+        path: '/traffic',
+        name: 'traffic',
+        component: TrafficView,
+    },
     {
         path: '/npc-list',
         name: 'npc-list',
@@ -277,8 +288,7 @@ const routes = [
     },
     {
         path: '/my-settings',
-        name: 'my-settings',
-        component: MySettingsView,
+        redirect: '/my-page',
         meta: {
             requiresAuth: true,
             requiresGeneral: true,