From 1bb89ee764bfa523145034cdba747278ebfa927d Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 3 Sep 2023 16:34:49 +0330 Subject: [PATCH] TF-85 make follow up request and page design for navgan --- .../navgan/followUp-loan/RequestCard.jsx | 29 +++++ .../dashboard/navgan/followUp-loan/index.jsx | 121 +++++------------- src/core/data/apiRoutes.js | 1 + 3 files changed, 59 insertions(+), 92 deletions(-) diff --git a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx index e69de29..6e5dfd3 100644 --- a/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx +++ b/src/components/dashboard/navgan/followUp-loan/RequestCard.jsx @@ -0,0 +1,29 @@ +import {Card, CardContent, CardHeader, Grid, Typography} from "@mui/material"; +import SellIcon from '@mui/icons-material/Sell'; +import {useTranslations} from "next-intl"; + + +const RequestCard = ({item}) => { + const t = useTranslations(); + return ( + + + } + title={`${t("LoanFollowUp.request_number")}: (${item.id})`} + subheader={item.latest_history_created_at} + /> + + + {item.loan_state} + + + + + ); +}; + +export default RequestCard; \ No newline at end of file diff --git a/src/components/dashboard/navgan/followUp-loan/index.jsx b/src/components/dashboard/navgan/followUp-loan/index.jsx index cda243c..de3176c 100644 --- a/src/components/dashboard/navgan/followUp-loan/index.jsx +++ b/src/components/dashboard/navgan/followUp-loan/index.jsx @@ -1,66 +1,37 @@ import DashboardLayouts from "@/layouts/dashboardLayouts"; -import useUser from "@/lib/app/hooks/useUser"; -import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import { - Avatar, - Card, - CardActions, - CardContent, - CardHeader, - Collapse, Grid, - IconButton, Stack, - Typography } from "@mui/material"; -import {styled} from "@mui/material/styles"; -import {useTranslations} from "next-intl"; -import {useState} from "react"; - -const ExpandMore = styled((props) => { - const {expand, ...other} = props; - return ; -})(({theme, expand}) => ({ - transform: !expand ? "rotate(0deg)" : "rotate(180deg)", - marginLeft: "auto", - transition: theme.transitions.create("transform", { - duration: theme.transitions.duration.shortest, - }), -})); - -const data = [ - { - name: "جان دو", - date: "۱۳۹۹/۰۴/۲۵", - description: - "لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است.", - }, - { - name: "جین اسمیت", - date: "۱۳۹۹/۰۴/۲۶", - description: "نُلا ویته الیت لیبرو آ، آ فارِترا آوگوه.", - }, - { - name: "مایک جانسون", - date: "۱۳۹۹/۰۴/۲۷", - description: - "دوئیس مولیس، است نُن کُمُدو لُکتوس، نیسی ارات پورتیتور لیگولا.", - }, -]; +import {useEffect, useState} from "react"; +import {SHOW_LOAN_REQUEST_NAVGAN} from "@/core/data/apiRoutes"; +import useLoading from "@/lib/app/hooks/useLoading"; +import useRequest from "@/lib/app/hooks/useRequest"; +import moment from "jalali-moment"; +import RequestCard from "@/components/dashboard/navgan/followUp-loan/RequestCard"; const LoanFollowUpComponent = () => { - const t = useTranslations(); - const {token} = useUser(); - - const [expanded, setExpanded] = useState([]); - - const handleExpandClick = (index) => { - setExpanded((prevExpanded) => { - const newExpanded = [...prevExpanded]; - newExpanded[index] = !newExpanded[index]; - return newExpanded; - }); - }; + const requestServer = useRequest(); + const {setLoadingPage} = useLoading(); + const [requestsList, setRequestsList] = useState([]); + // get form data + useEffect(() => { + setLoadingPage(true) + requestServer(SHOW_LOAN_REQUEST_NAVGAN, "get", {auth: true, notification: false}) + .then(function ({data}) { + const items = data.data; + const formattedData = items.map((item, index) => ({ + id: item.id, + latest_history_created_at: moment(item.latest_history_created_at).locale("fa").format("HH:mm | YYYY/MM/DD"), + state_id: item.state_id, + loan_state: item.loan_state, + })); + setRequestsList(formattedData); + setLoadingPage(false) + }) + .catch(function (error) { + }) + }, []); return ( @@ -77,42 +48,8 @@ const LoanFollowUpComponent = () => { rowSpacing={2} sx={{alignItems: "start", justifyContent: "center"}} > - {data.map((item, index) => ( - - - - } - title={item.name} - subheader={item.date} - /> - - - متن تست - - - - handleExpandClick(index)} - aria-expanded={expanded[index]} - aria-label="show more" - > - - - - - - اطلاعات تکمیلی: - {item.description} - - - - + {requestsList.map((item, index) => ( + ))} diff --git a/src/core/data/apiRoutes.js b/src/core/data/apiRoutes.js index 26c6128..64cbc59 100644 --- a/src/core/data/apiRoutes.js +++ b/src/core/data/apiRoutes.js @@ -6,6 +6,7 @@ export const LOGIN = BASE_URL + "/login"; export const SEND_OTP_TOKEN = BASE_URL + "/otp"; export const REGISTER = BASE_URL + "/register"; export const USER_INFO = BASE_URL + "/profile/info"; +export const SHOW_LOAN_REQUEST_NAVGAN = BASE_URL + "/navgan/loan/index"; export const SEND_LOAN_REQUEST_NAVGAN = BASE_URL + "/navgan/loan/store"; export const SHOW_LOAN_REQUEST_WELFARE = BASE_URL + "/refahi/loan/index"; export const SEND_LOAN_REQUEST_WELFARE = BASE_URL + "/refahi/loan/store";