From 99e6d43f3242115da4a9bfccb0494845930a65db Mon Sep 17 00:00:00 2001
From: Ankit Mahato <ankmahato@gmail.com>
Date: Sun, 28 Sep 2025 15:12:22 +0530
Subject: [PATCH] Fix navigation order for Terminal and Settings pages

Corrects the navigation indices for Terminal (Logs) and Settings pages in both desktop and mobile dashboards and navbars, ensuring consistent navigation and page rendering.
---
 lib/screens/dashboard.dart        | 8 ++++----
 lib/screens/mobile/dashboard.dart | 7 +++++--
 lib/screens/mobile/navbar.dart    | 4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/screens/dashboard.dart b/lib/screens/dashboard.dart
index 4c7ab274..16de58b0 100644
--- a/lib/screens/dashboard.dart
+++ b/lib/screens/dashboard.dart
@@ -73,9 +73,9 @@ class Dashboard extends ConsumerWidget {
                     ),
                     kVSpacer10,
                     IconButton(
-                      isSelected: railIdx == 4,
+                      isSelected: railIdx == 3,
                       onPressed: () {
-                        ref.read(navRailIndexStateProvider.notifier).state = 4;
+                        ref.read(navRailIndexStateProvider.notifier).state = 3;
                       },
                       icon: const Icon(Icons.terminal),
                       selectedIcon: const Icon(Icons.terminal),
@@ -108,7 +108,7 @@ class Dashboard extends ConsumerWidget {
                         padding: const EdgeInsets.only(bottom: 16.0),
                         child: NavbarButton(
                           railIdx: railIdx,
-                          buttonIdx: 3,
+                          buttonIdx: 4,
                           selectedIcon: Icons.settings,
                           icon: Icons.settings_outlined,
                           label: 'Settings',
@@ -134,8 +134,8 @@ class Dashboard extends ConsumerWidget {
                   HomePage(),
                   EnvironmentPage(),
                   HistoryPage(),
-                  SettingsPage(),
                   TerminalPage(),
+                  SettingsPage(),
                 ],
               ),
             )
diff --git a/lib/screens/mobile/dashboard.dart b/lib/screens/mobile/dashboard.dart
index 1ecac4b4..48e77c90 100644
--- a/lib/screens/mobile/dashboard.dart
+++ b/lib/screens/mobile/dashboard.dart
@@ -74,12 +74,15 @@ class PageBranch extends ConsumerWidget {
       case 2:
         return const HistoryPage();
       case 3:
+        return const PageBase(
+          title: 'Logs',
+          scaffoldBody: TerminalPage(),
+        );
+      case 4:
         return const PageBase(
           title: 'Settings',
           scaffoldBody: SettingsPage(),
         );
-      case 4:
-        return const TerminalPage();
       default:
         return const RequestResponsePage();
     }
diff --git a/lib/screens/mobile/navbar.dart b/lib/screens/mobile/navbar.dart
index 4069be9f..922fbb6c 100644
--- a/lib/screens/mobile/navbar.dart
+++ b/lib/screens/mobile/navbar.dart
@@ -60,7 +60,7 @@ class BottomNavBar extends ConsumerWidget {
                 Expanded(
                   child: NavbarButton(
                     railIdx: railIdx,
-                    buttonIdx: 4,
+                    buttonIdx: 3,
                     selectedIcon: Icons.terminal,
                     icon: Icons.terminal,
                     label: 'Logs',
@@ -69,7 +69,7 @@ class BottomNavBar extends ConsumerWidget {
                 Expanded(
                   child: NavbarButton(
                     railIdx: railIdx,
-                    buttonIdx: 3,
+                    buttonIdx: 4,
                     selectedIcon: Icons.settings,
                     icon: Icons.settings_outlined,
                     label: 'Settings',