From bfb9f3cbcb3b35e4a1899f6eb93d089365e0fabc Mon Sep 17 00:00:00 2001 From: hamid zarghami Date: Sun, 26 Jan 2025 08:57:06 +0330 Subject: [PATCH] messages --- package-lock.json | 3 -- src/components/DatePicker.tsx | 15 ++++--- src/config/Pages.ts | 7 +-- src/langs/fa.json | 9 ++++ src/pages/messages/List.tsx | 82 +++++++++++++++++++++++++++++++++++ src/router/Main.tsx | 2 + 6 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 src/pages/messages/List.tsx diff --git a/package-lock.json b/package-lock.json index 427c4b2..d1bc9ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3401,10 +3401,7 @@ "version": "3.7.6", "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", "integrity": "sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==", -<<<<<<< HEAD "dev": true, -======= ->>>>>>> add-discount-blog "license": "BSD-3-Clause", "engines": { "node": ">=0.8.0" diff --git a/src/components/DatePicker.tsx b/src/components/DatePicker.tsx index 6e2f994..1b6ac87 100644 --- a/src/components/DatePicker.tsx +++ b/src/components/DatePicker.tsx @@ -4,6 +4,7 @@ import persian from 'react-date-object/calendars/persian'; import persian_fa from 'react-date-object/locales/persian_fa'; import DateObject from 'react-date-object'; import CalenderIcon from '../assets/images/calendar.svg' +import { clx } from '../helpers/utils'; type Props = { onChange: (date: string) => void; @@ -13,7 +14,7 @@ type Props = { reset?: boolean; isDateTime?: boolean; className?: string; - label: string + label?: string }; const DatePickerComponent: FC = (props: Props) => { @@ -45,10 +46,14 @@ const DatePickerComponent: FC = (props: Props) => { return (
-
- {props.label} -
-
+ {props.label && +
+ {props.label} +
} +
{ + + const { t } = useTranslation('global') + + return ( +
+
+ {t('messages.messages_list')} +
+ +
+
+ { }} + placeholder={t('messages.submit_date')} + /> +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + +
+ + + + + + + + +
+
+
+ ) +} + +export default MessagesList \ No newline at end of file diff --git a/src/router/Main.tsx b/src/router/Main.tsx index 5a2cd9f..292e615 100644 --- a/src/router/Main.tsx +++ b/src/router/Main.tsx @@ -37,6 +37,7 @@ import Category from '../pages/service/Category' import CustomerList from '../pages/customer/List' import CreateCustomer from '../pages/customer/Create' import TicketCategory from '../pages/ticket/Category' +import MessagesList from '../pages/messages/List' const MainRouter: FC = () => { @@ -86,6 +87,7 @@ const MainRouter: FC = () => { } /> } /> } /> + } />