Merge branch 'develop' into 'feature/refahi_province_manager'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
This commit is contained in:
Amirhossein Mahmoodi
2023-08-12 16:27:25 +03:30
parent 83747201d7
commit 11dedbb616
15 changed files with 635 additions and 29 deletions

View File

@@ -0,0 +1,26 @@
import DashboardNavganProvinceManagerComponent from "src/components/dashboard/navgan-province-manager";
import RolePermissionMiddleware from "@/middlewares/RolePermission";
import WithAuthMiddleware from "@/middlewares/WithAuth";
import {parse} from "next-useragent";
const requiredPermissions = ["province_manager"];
export default function PassengerOffice() {
return (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>
<DashboardNavganProvinceManagerComponent/>
</RolePermissionMiddleware>
</WithAuthMiddleware>
);
}
export async function getServerSideProps({req, locale}) {
const {isBot} = parse(req.headers["user-agent"]);
return {
props: {
messages: (await import(`&/locales/${locale}/app.json`)).default,
title: "Dashboard.province_manager_page",
isBot,
},
};
}

View File

@@ -1,14 +1,14 @@
import DashboardProvinceManagerComponent from "@/components/dashboard/province-manager";
import RolePermissionMiddleware from "@/middlewares/RolePermission";
import WithAuthMiddleware from "@/middlewares/WithAuth";
import {parse} from "next-useragent";
import DashboardRefahiProvinceManagerComponent from "@/components/dashboard/refahi-province-manager";
const requiredPermissions = ["province_manager"];
export default function PassengerOffice() {
return (
<WithAuthMiddleware>
<RolePermissionMiddleware requiredPermissions={requiredPermissions}>
<DashboardProvinceManagerComponent/>
<DashboardRefahiProvinceManagerComponent/>
</RolePermissionMiddleware>
</WithAuthMiddleware>
);