merge conflict

src/pages/dashboard/machinary-office/index.jsx

@@ -0,0 +1,23 @@
+import DashboardMachinaryOfficeComponent from "@/components/dashboard/machinary-office";
+import TitlePage from "@/core/components/TitlePage";
+import WithAuthMiddleware from "@/middlewares/WithAuth";
+import { parse } from "next-useragent";
+
+export default function PassengerOffice() {
+  return (
+    <WithAuthMiddleware>
+      <TitlePage text="Dashboard.machinary_office_page" />
+      <DashboardMachinaryOfficeComponent />
+    </WithAuthMiddleware>
+  );
+}
+
+export async function getServerSideProps({ req, locale }) {
+  const { isBot } = parse(req.headers["user-agent"]);
+  return {
+    props: {
+      messages: (await import(`&/locales/${locale}/app.json`)).default,
+      isBot,
+    },
+  };
+}

src/pages/dashboard/passenger-office/index.jsx

@@ -0,0 +1,23 @@
+import DashboardPassengerOfficeComponent from "@/components/dashboard/passenger-office";
+import TitlePage from "@/core/components/TitlePage";
+import WithAuthMiddleware from "@/middlewares/WithAuth";
+import { parse } from "next-useragent";
+
+export default function PassengerOffice() {
+  return (
+    <WithAuthMiddleware>
+      <TitlePage text="Dashboard.passenger_office_page" />
+      <DashboardPassengerOfficeComponent />
+    </WithAuthMiddleware>
+  );
+}
+
+export async function getServerSideProps({ req, locale }) {
+  const { isBot } = parse(req.headers["user-agent"]);
+  return {
+    props: {
+      messages: (await import(`&/locales/${locale}/app.json`)).default,
+      isBot,
+    },
+  };
+}