diff --git a/src/App.jsx b/src/App.jsx
index 8d2c595..91b534b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -11,6 +11,24 @@ import Blank from './pages/blank/Blank';
 
 // Master
 import IndexDevice from './pages/master/device/IndexDevice';
+import IndexTag from './pages/master/tag/IndexTag';
+import IndexBrandDevice from './pages/master/brandDevice/IndexBrandDevice';
+import IndexErrorCode from './pages/master/errorCode/IndexErrorCode';
+
+// History
+import IndexTrending from './pages/history/trending/IndexTrending';
+import IndexReport from './pages/history/report/IndexReport';
+
+// Other Pages
+import IndexNotification from './pages/notification/IndexNotification';
+import IndexEventAlarm from './pages/eventAlarm/IndexEventAlarm';
+import IndexRole from './pages/role/IndexRole';
+import IndexUser from './pages/user/IndexUser';
+
+// Shift Management
+import IndexSchedule from './pages/shiftManagement/schedule/IndexSchedule';
+import IndexMember from './pages/shiftManagement/member/IndexMember';
+
 import SvgTest from './pages/home/SvgTest';
 
 const App = () => {
@@ -31,6 +49,35 @@ const App = () => {
 
                 <Route path="/master" element={<ProtectedRoute />}>
                     <Route path="device" element={<IndexDevice />} />
+                    <Route path="tag" element={<IndexTag />} />
+                    <Route path="brand-device" element={<IndexBrandDevice />} />
+                    <Route path="error-code" element={<IndexErrorCode />} />
+                </Route>
+
+                <Route path="/history" element={<ProtectedRoute />}>
+                    <Route path="trending" element={<IndexTrending />} />
+                    <Route path="report" element={<IndexReport />} />
+                </Route>
+
+                <Route path="/notification" element={<ProtectedRoute />}>
+                    <Route index element={<IndexNotification />} />
+                </Route>
+
+                <Route path="/event-alarm" element={<ProtectedRoute />}>
+                    <Route index element={<IndexEventAlarm />} />
+                </Route>
+
+                <Route path="/role" element={<ProtectedRoute />}>
+                    <Route index element={<IndexRole />} />
+                </Route>
+
+                <Route path="/user" element={<ProtectedRoute />}>
+                    <Route index element={<IndexUser />} />
+                </Route>
+
+                <Route path="/shift-management" element={<ProtectedRoute />}>
+                    <Route path="schedule" element={<IndexSchedule />} />
+                    <Route path="member" element={<IndexMember />} />
                 </Route>
 
                 {/* Catch-all */}