Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/user into feature/mohammad_update_form_refactor
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard"
|
||||
NEXT_PUBLIC_API_VERSION = "1.26.14"
|
||||
NEXT_PUBLIC_API_VERSION = "1.26.16"
|
||||
NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
|
||||
NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"
|
||||
|
||||
|
||||
@@ -3,13 +3,14 @@ import process from "next/dist/build/webpack/loaders/resolve-url-loader/lib/post
|
||||
|
||||
export const globalServerProps = async ({req, locale}) => {
|
||||
const {isBot} = parse(req.headers["user-agent"]);
|
||||
|
||||
const responseConfig = await fetch(process.env.NEXT_PUBLIC_CONFIG_APP_URL);
|
||||
|
||||
const responseConfig = await fetch(`${process.env.NEXT_PUBLIC_CONFIG_APP_URL}?_=${Math.random()}`);
|
||||
|
||||
return {
|
||||
config: await responseConfig.json(),
|
||||
messages: (await import(`&/locales/${locale}/app.json`)).default,
|
||||
isBot,
|
||||
locale,
|
||||
today: new Date().getTime()
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@ import moment from "jalali-moment";
|
||||
import SvgMaintenance from "@/core/components/svgs/SvgMaintenance";
|
||||
import {Typography} from "@mui/material";
|
||||
|
||||
const DeadlineMiddleware = ({children, type = '', withMessage = false}) => {
|
||||
const DeadlineMiddleware = ({children, type = '', withMessage = false, serverToday}) => {
|
||||
const {config} = useConfig()
|
||||
const middleware = config.deadlines[type]
|
||||
|
||||
@@ -11,7 +11,7 @@ const DeadlineMiddleware = ({children, type = '', withMessage = false}) => {
|
||||
|
||||
const fromDate = moment(middleware.date.from, 'jYYYY/jMM/jDD')
|
||||
const toDate = moment(middleware.date.to, 'jYYYY/jMM/jDD')
|
||||
const today = moment()
|
||||
const today = moment(serverToday)
|
||||
|
||||
if (today.isBetween(fromDate, toDate, null, '[]')) {
|
||||
return children
|
||||
|
||||
@@ -2,8 +2,8 @@ import LoanRequestComponent from "@/components/dashboard/navgan/add-request-loan
|
||||
import {globalServerProps} from "@/core/utils/globalServerProps";
|
||||
import DeadlineMiddleware from "@/middlewares/Deadline";
|
||||
|
||||
export default function AddLoanRequest() {
|
||||
return (<DeadlineMiddleware type={'register'} withMessage={true}>
|
||||
export default function AddLoanRequest(props) {
|
||||
return (<DeadlineMiddleware serverToday={props.today} type={'register'} withMessage={true}>
|
||||
<LoanRequestComponent/>
|
||||
</DeadlineMiddleware>);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user