Merge branch 'release/1.26.1'

This commit is contained in:
AmirHossein Mahmoodi
2023-12-20 17:34:23 +03:30
11 changed files with 55 additions and 14 deletions

View File

@@ -1,5 +1,5 @@
NEXT_PUBLIC_API_NAME = "Loan Facilities Dashboard"
NEXT_PUBLIC_API_VERSION = "1.25.5"
NEXT_PUBLIC_API_VERSION = "1.26.1"
NEXT_PUBLIC_DEFAULT_LANGUAGE = "fa"
NEXT_PUBLIC_DEFAULT_DIRECTION = "rtl"

View File

@@ -17,7 +17,7 @@
"@mui/lab": "^5.0.0-alpha.152",
"@mui/material": "^5.12.0",
"@mui/x-date-pickers": "^6.18.5",
"@witel/webapp-builder": "^1.2.4",
"@witel/webapp-builder": "^1.3.1",
"axios": "^1.4.0",
"colord": "^2.9.3",
"date-fns-jalali": "^2.13.0-0",

View File

@@ -1,10 +1,16 @@
{
"middlewares": {},
"middlewares": {
"/dashboard/navgan/add-request-loan":{
"status" : false,
"title":"اطلاع رسانی",
"message": "ثبت نام به زودی آغاز خواهد شد."
}
},
"deadlines": {
"register": {
"date": {
"from": "1402/09/01",
"to": "1402/09/10"
"from": "1402/10/02",
"to": "1402/10/15"
},
"messages": {
"before": "ثبت نام هنوز شروع نشده",
@@ -17,8 +23,8 @@
},
"validation": {
"date": {
"from": "1402/09/15",
"to": "1402/11/10"
"from": "1402/10/15",
"to": "1402/10/30"
},
"messages": {},
"timeline_label": {
@@ -28,8 +34,8 @@
},
"done": {
"date": {
"from": "1402/11/10",
"to": "1402/12/20"
"from": "1402/11/01",
"to": "1402/11/20"
},
"messages": {},
"timeline_label": {

Binary file not shown.

BIN
public/icons/bpms.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

View File

@@ -16,11 +16,10 @@ const FooterDetails = () => {
</Grid>
<Grid item xs={12} md={4}>
<Stack direction="row" alignItems="center" justifyContent="center">
<img src='/icons/logoLandingPage.png' width={25} alt="Your Alt Text"/>
<img src='/icons/bpms.png' width={50} alt={t("powered_by_witel")}/>
<LinkRouting
sx={{margin: 0.5, fontSize: "20px", color: "white"}}
href={process.env.NEXT_PUBLIC_POWERED_BY_URL}
target="_blank"
sx={{margin: 0.5, fontSize: "16px", color: "white"}}
href={'#'}
underline="hover"
>
{t("powered_by_witel")}

View File

@@ -4,6 +4,7 @@ import Button from '@mui/material/Button';
import {AdapterDateFnsJalali} from "@mui/x-date-pickers/AdapterDateFnsJalali";
import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider';
import {DatePicker} from '@mui/x-date-pickers/DatePicker';
import {faIR} from "@mui/x-date-pickers/locales";
import {useTranslations} from "next-intl";
import moment from "jalali-moment";
import {FormControl, FormHelperText} from "@mui/material";
@@ -67,7 +68,16 @@ export default function PickerWithButtonField({formik, disabled}) {
size="small"
error={true}
>
<LocalizationProvider dateAdapter={AdapterDateFnsJalali}>
<LocalizationProvider
dateAdapter={AdapterDateFnsJalali}
localeText={
{
...faIR.components.MuiLocalizationProvider.defaultProps
.localeText,
okButtonLabel: 'تایید'
}
}
>
<ButtonDatePicker
label={formik.values.birthday
.locale("fa")

View File

@@ -0,0 +1,21 @@
import {Button, Link} from "@mui/material";
const headerItems = [
<Button
key="help"
variant={'contained'}
color={'warning'}
size={'small'}
sx={{mx: 2}}>
<Link
color={'white'}
download
underline="none"
href={'/files/راهنمای-سامانه.pdf'}
>
راهنمای سامانه
</Link>
</Button>
];
export default headerItems;

View File

@@ -1,11 +1,13 @@
import {createTheme} from "@mui/material/styles";
import theme from "./theme";
import {faIR} from "@mui/x-date-pickers/locales";
const themeRtl = createTheme({
direction: "rtl",
typography: {
fontFamily: `IRANSansFaNum, sans-serif`,
},
faIR,
...theme,
});

View File

@@ -5,6 +5,7 @@ import {GET_SIDEBAR_NOTIFICATION} from "@/core/data/apiRoutes";
import UserInfo from "@/middlewares/UserInfo";
import {useTranslations} from "next-intl";
import moment from "jalali-moment";
import headerItems from "@/core/data/headerItems";
const DashboardLayout = (props) => {
const {user} = useUser()
@@ -17,6 +18,7 @@ const DashboardLayout = (props) => {
user_introduction={user.phone_number}
headerProfileItems={headerProfileItems}
headerSubtitle={`${t('today')} ${moment().locale('fa').format('LL')}`}
HeaderItem={headerItems}
sidebarMenu={sidebarMenu}
urlNotification={GET_SIDEBAR_NOTIFICATION}
BC_segmentsToRemove={['navgan', '[id]']}

View File

@@ -5,6 +5,7 @@ export default function Home() {
return (
<>
<FirstComponent/>
</>
);
}