fascano/web-menu-react-version-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add rate feature to orders page & enhance menu page

Browse Source
This commit is contained in:
Mohammed Al-yaseen
2025-12-30 01:22:49 +03:00
parent 0edd13f2fb
commit a64f92d1fd
10 changed files with 218 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/CustomBottomSheet/RateBottomSheet.tsx
View File

@@ -18,7 +18,7 @@ export function RateBottomSheet({
}: {
isOpen: boolean;
onClose: () => void;
orderIdProp: string;
orderIdProp?: string | undefined;
}) {
const { t } = useTranslation();
const [rating, setRating] = useState<number>(0);
@@ -34,7 +34,7 @@ export function RateBottomSheet({
onClose();
if (getUserDetails?.id) {
rateOrder({
orderID: orderId || orderIdProp,
orderID: orderId || orderIdProp || "",
rating: rating,
comment: "This is a test comment",
userID: getUserDetails?.id.toString() || "",

14
src/components/Icons/DeliveryIcon.tsx
View File

File diff suppressed because one or more lines are too long

83
src/components/Icons/ScheduleOrderIcon copy.tsx Normal file
View File

@@ -0,0 +1,83 @@
interface ScheduleOrderIconType {
className?: string;
onClick?: () => void;
}
const ScheduleOrderIcon = ({ className, onClick }: ScheduleOrderIconType) => {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className={className}
onClick={onClick}
>
<g clip-path="url(#clip0_1498_49735)">
<path
d="M4.96953 0.0218744C4.91016 0.0281248 4.71953 0.0625 4.54766 0.0968752C2.56328 0.490624 0.925781 1.9375 0.282031 3.86562C0.0507812 4.5625 0.0195312 4.7875 0.0195312 5.67188C0.0195312 6.55625 0.0507812 6.78125 0.282031 7.47188C1.01016 9.65937 3.01016 11.2125 5.26328 11.3406C5.62891 11.3625 6.28516 11.3344 6.41016 11.2969C6.46641 11.2781 6.46953 11.3 6.46953 12.1469C6.46953 12.8 6.47891 13.0312 6.51016 13.0656C6.52891 13.0938 7.57578 13.7625 8.83203 14.5562C10.6133 15.6813 11.1414 16 11.2195 16C11.2914 16 11.9695 15.6562 13.5727 14.8094C14.8133 14.1531 15.8633 13.5844 15.907 13.5406L15.9852 13.4688L15.9945 11.2219L16.0008 8.975L15.932 8.89375C15.8758 8.82812 13.1227 7.30625 11.6039 6.49687C11.3789 6.37813 11.2883 6.31563 11.2977 6.28125C11.3352 6.14375 11.3477 5.50313 11.3164 5.1875C11.2414 4.43125 11.0664 3.8125 10.7539 3.17188C9.92266 1.48125 8.34766 0.328125 6.47578 0.046875C6.19453 0.00312519 5.26328 -0.00937462 4.96953 0.0218744ZM6.29141 0.546875C8.26016 0.80625 9.92266 2.16875 10.5445 4.03438C10.757 4.66875 10.7977 4.93437 10.7945 5.6875C10.7914 6.05625 10.7789 6.4 10.7602 6.45C10.7289 6.55 10.7477 6.54062 8.06328 7.95937C7.26328 8.38125 6.57891 8.75625 6.54141 8.79063C6.46953 8.85313 6.46953 8.85938 6.46953 9.8125V10.7719L6.22891 10.7937C5.82266 10.8281 5.25703 10.8156 4.91953 10.7656C2.21641 10.3625 0.253906 7.86562 0.528906 5.17812C0.657031 3.95625 1.16016 2.89687 2.02891 2.03125C2.24766 1.81563 2.54766 1.55312 2.69766 1.44687C3.27578 1.04062 4.02266 0.724999 4.70703 0.596875C5.27578 0.490624 5.74766 0.474999 6.29141 0.546875ZM13.2883 8.01562L15.1852 9.04375L14.6695 9.32188L14.157 9.6L12.2258 8.54375C11.1664 7.9625 10.2727 7.47188 10.2414 7.45C10.1914 7.41875 10.2508 7.37813 10.6945 7.14687L11.2039 6.87813L11.2977 6.93437C11.3508 6.9625 12.2445 7.45 13.2883 8.01562ZM11.7664 8.85625L13.8914 10.0219L13.9008 10.6156L13.907 11.2062L13.6258 11.3844L13.3445 11.5594V10.9906C13.3445 10.5437 13.3352 10.4062 13.3008 10.3562C13.2758 10.3187 12.3195 9.78125 11.1758 9.15625C10.0289 8.53125 9.09453 8.00938 9.09453 8C9.09453 7.98125 9.59453 7.69063 9.62578 7.69063C9.63516 7.69063 10.5977 8.2125 11.7664 8.85625ZM10.5477 9.41875L12.5352 10.4938L12.3383 10.6031C11.5164 11.0531 11.2414 11.1906 11.1945 11.1719C11.0164 11.1062 7.29141 8.97813 7.31328 8.95625C7.36953 8.9 8.48828 8.31875 8.52266 8.32812C8.54453 8.33437 9.45391 8.825 10.5477 9.41875ZM9.33516 10.7406L10.9352 11.6406L10.9383 13.4625V15.2875L10.8477 15.2281C10.7977 15.1969 9.90703 14.6313 8.86328 13.9688L6.97266 12.7656L6.96953 11.0875V9.40937L7.35391 9.625C7.56328 9.74375 8.45391 10.2469 9.33516 10.7406ZM15.4383 11.3531V13.2062L15.2289 13.3187C15.1102 13.3812 14.307 13.8062 13.4383 14.2656C12.5695 14.725 11.7727 15.15 11.6664 15.2094L11.4695 15.3156V13.4937V11.6719L12.1352 11.3094L12.7977 10.9437L12.8133 11.5344C12.8289 12.0875 12.832 12.1281 12.8977 12.1906C12.9383 12.2313 13.0039 12.2594 13.057 12.2594C13.1539 12.2594 14.2727 11.6625 14.3508 11.5719C14.382 11.5344 14.3945 11.3312 14.407 10.7844L14.4227 10.0469L14.9227 9.775C15.1977 9.625 15.4258 9.5 15.432 9.5C15.4352 9.5 15.4383 10.3344 15.4383 11.3531Z"
fill="#434E5C"
/>
<path
d="M5.49778 0.96545C5.42903 1.01858 5.42278 1.05608 5.41341 1.32795C5.40716 1.49045 5.41028 1.66233 5.41966 1.70295C5.46653 1.89045 5.70091 1.96858 5.84778 1.8467C5.91966 1.79045 5.92278 1.76858 5.92278 1.40608C5.92278 1.04358 5.91966 1.0217 5.84778 0.96545C5.75403 0.89045 5.59153 0.89045 5.49778 0.96545Z"
fill="#434E5C"
/>
<path
d="M7.78125 1.50937C7.68125 1.55937 7.40625 2.04688 7.40625 2.175C7.40625 2.32812 7.5125 2.4375 7.65938 2.4375C7.80938 2.4375 7.85625 2.39375 8.025 2.08437C8.2 1.76875 8.2 1.60312 8.02812 1.51562C7.92188 1.45937 7.88125 1.45937 7.78125 1.50937Z"
fill="#434E5C"
/>
<path
d="M3.17282 1.60938C3.06344 1.71562 3.07594 1.8125 3.23844 2.1125C3.39157 2.39688 3.46657 2.46875 3.60407 2.46875C3.72907 2.46875 3.79782 2.425 3.84469 2.3125C3.88219 2.22187 3.87594 2.19688 3.75094 1.95C3.56032 1.57187 3.52282 1.53125 3.37282 1.53125C3.28219 1.53125 3.22594 1.55312 3.17282 1.60938Z"
fill="#434E5C"
/>
<path
d="M5.5375 2.53164C5.5 2.54726 5.45312 2.59726 5.4375 2.64101C5.41875 2.68789 5.40625 3.13476 5.40625 3.70664V4.68789L5.32187 4.71914C4.96875 4.84726 4.71875 5.16601 4.66875 5.55039C4.64375 5.76914 4.7 6.02226 4.83125 6.23476L4.9375 6.41601L4.5 7.15664C4.16562 7.72226 4.0625 7.92539 4.0625 8.00664C4.0625 8.14101 4.1125 8.21289 4.2375 8.24726C4.4375 8.30351 4.47812 8.25664 4.96875 7.42539C5.36562 6.75039 5.42812 6.65976 5.48437 6.67851C5.51875 6.68789 5.63437 6.69726 5.74062 6.69414C6.33437 6.68789 6.79062 6.12851 6.68437 5.54101C6.61562 5.18164 6.40937 4.90039 6.10625 4.75976L5.94062 4.68476L5.93125 3.65664C5.92187 2.51601 5.925 2.54414 5.71562 2.51601C5.65625 2.50664 5.57812 2.51601 5.5375 2.53164ZM5.90625 5.25351C6.14062 5.38476 6.225 5.70039 6.08437 5.90976C5.98125 6.05976 5.825 6.15664 5.67812 6.15664C5.30937 6.15664 5.05937 5.72851 5.25937 5.43476C5.41875 5.19414 5.675 5.12539 5.90625 5.25351Z"
fill="#434E5C"
/>
<path
d="M1.58125 3.19063C1.51562 3.24062 1.5 3.28125 1.5 3.39062C1.5 3.46875 1.51875 3.54688 1.54688 3.57188C1.63125 3.65937 2.11875 3.90625 2.2 3.90625C2.32812 3.90625 2.4375 3.77813 2.4375 3.62812C2.4375 3.48438 2.38438 3.4375 2.025 3.24062C1.7875 3.10938 1.69688 3.1 1.58125 3.19063Z"
fill="#434E5C"
/>
<path
d="M9.2125 3.25903C8.9 3.43403 8.84375 3.48715 8.84375 3.60903C8.84375 3.75278 8.92813 3.8434 9.07812 3.86215C9.18438 3.87465 9.24375 3.85278 9.46875 3.72778C9.77812 3.55278 9.8375 3.4684 9.78125 3.29653C9.70938 3.08403 9.55 3.07153 9.2125 3.25903Z"
fill="#434E5C"
/>
<path
d="M1.04133 5.43711C0.900707 5.49648 0.860082 5.71836 0.966332 5.84648C1.02258 5.91523 1.05383 5.92148 1.37258 5.93086L1.71946 5.94336L1.81321 5.84961C1.92258 5.73711 1.93508 5.60586 1.84758 5.49648C1.79133 5.42773 1.76321 5.42148 1.44758 5.41523C1.26321 5.40898 1.07883 5.42148 1.04133 5.43711Z"
fill="#434E5C"
/>
<path
d="M9.50183 5.49375C9.40183 5.59375 9.38621 5.66875 9.44246 5.79062C9.49558 5.90625 9.59871 5.9375 9.93621 5.9375C10.1987 5.9375 10.255 5.92812 10.3268 5.87187C10.3925 5.82187 10.4081 5.78125 10.4081 5.675C10.4081 5.45937 10.3456 5.425 9.93621 5.4125L9.59558 5.4L9.50183 5.49375Z"
fill="#434E5C"
/>
<path
d="M1.85 7.62187C1.70625 7.70312 1.575 7.79063 1.55937 7.81562C1.54375 7.84062 1.53125 7.90937 1.53125 7.97187C1.53125 8.1125 1.63437 8.21875 1.77187 8.21875C1.87187 8.21875 2.35937 7.96875 2.43125 7.88125C2.49687 7.79688 2.47812 7.6125 2.39687 7.5375C2.28125 7.43125 2.14687 7.45 1.85 7.62187Z"
fill="#434E5C"
/>
<path
d="M3.50938 8.92188C3.4125 8.99062 3.15625 9.475 3.15625 9.59375C3.15625 9.7125 3.28437 9.84375 3.40625 9.84375C3.53438 9.84375 3.6375 9.74375 3.77812 9.48438C3.9375 9.19687 3.95 9.0375 3.825 8.94063C3.72813 8.8625 3.60313 8.85625 3.50938 8.92188Z"
fill="#434E5C"
/>
<path
d="M5.54087 9.44375C5.43149 9.49687 5.40024 9.625 5.41274 9.9625C5.42524 10.3406 5.46274 10.4062 5.67524 10.4062C5.78149 10.4062 5.82212 10.3906 5.87212 10.325C5.92837 10.2531 5.93774 10.1969 5.93774 9.91563C5.93774 9.59688 5.93462 9.5875 5.84712 9.49687C5.75024 9.40312 5.65962 9.3875 5.54087 9.44375Z"
fill="#434E5C"
/>
<path
d="M7.48566 10.8906C7.38879 10.9844 7.37941 11.1844 7.46379 11.2563C7.49191 11.2844 8.12316 11.6531 8.86691 12.075C9.82629 12.6219 10.245 12.8438 10.3138 12.8438C10.3763 12.8438 10.4388 12.8156 10.4919 12.7625C10.5575 12.6969 10.5669 12.6625 10.5544 12.5687C10.5419 12.5094 10.5169 12.4406 10.495 12.4187C10.4732 12.3969 9.84191 12.0281 9.09816 11.5969C8.19191 11.075 7.71066 10.8125 7.65129 10.8125C7.59816 10.8125 7.52941 10.8438 7.48566 10.8906Z"
fill="#434E5C"
/>
<path
d="M7.45209 11.8591C7.35834 11.9498 7.34896 12.1185 7.43021 12.2123C7.51459 12.3123 10.1583 13.8248 10.2708 13.8373C10.4833 13.8623 10.6083 13.5904 10.4615 13.4248C10.4021 13.3623 8.14896 12.0185 7.78646 11.831C7.64896 11.7591 7.53959 11.7685 7.45209 11.8591Z"
fill="#434E5C"
/>
<path
d="M9.71782 0.0685797C9.63032 0.165454 9.63657 0.327954 9.73345 0.421704L9.80845 0.499829H11.9522H14.0928V3.38108V6.26233L13.5678 5.74045C13.1053 5.28108 13.0303 5.21858 12.9397 5.21858C12.8053 5.21858 12.6866 5.33733 12.6866 5.47483C12.6866 5.56545 12.7678 5.65608 13.4459 6.33733C13.8616 6.75608 14.2334 7.11233 14.2741 7.12795C14.3241 7.1467 14.3772 7.14045 14.4459 7.11233C14.5022 7.08733 14.8741 6.74045 15.2741 6.33733C15.9834 5.6217 15.9991 5.60295 15.9991 5.47795C15.9991 5.37483 15.9834 5.3342 15.9178 5.2842C15.7397 5.14358 15.6897 5.17483 15.1334 5.72483L14.6241 6.23108L14.6178 3.18108C14.6084 0.23108 14.6053 0.127954 14.5491 0.0654545C14.4897 -0.000170708 14.4897 -0.000170708 12.1366 -0.000170708H9.78345L9.71782 0.0685797Z"
fill="#434E5C"
/>
</g>
</svg>
);
};
export default ScheduleOrderIcon;

83
src/components/Icons/ScheduleOrderIcon.tsx Normal file
View File

@@ -0,0 +1,83 @@
interface ScheduleOrderIconType {
className?: string;
onClick?: () => void;
}
const ScheduleOrderIcon = ({ className, onClick }: ScheduleOrderIconType) => {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className={className}
onClick={onClick}
>
<g clip-path="url(#clip0_1498_49735)">
<path
d="M4.96953 0.0218744C4.91016 0.0281248 4.71953 0.0625 4.54766 0.0968752C2.56328 0.490624 0.925781 1.9375 0.282031 3.86562C0.0507812 4.5625 0.0195312 4.7875 0.0195312 5.67188C0.0195312 6.55625 0.0507812 6.78125 0.282031 7.47188C1.01016 9.65937 3.01016 11.2125 5.26328 11.3406C5.62891 11.3625 6.28516 11.3344 6.41016 11.2969C6.46641 11.2781 6.46953 11.3 6.46953 12.1469C6.46953 12.8 6.47891 13.0312 6.51016 13.0656C6.52891 13.0938 7.57578 13.7625 8.83203 14.5562C10.6133 15.6813 11.1414 16 11.2195 16C11.2914 16 11.9695 15.6562 13.5727 14.8094C14.8133 14.1531 15.8633 13.5844 15.907 13.5406L15.9852 13.4688L15.9945 11.2219L16.0008 8.975L15.932 8.89375C15.8758 8.82812 13.1227 7.30625 11.6039 6.49687C11.3789 6.37813 11.2883 6.31563 11.2977 6.28125C11.3352 6.14375 11.3477 5.50313 11.3164 5.1875C11.2414 4.43125 11.0664 3.8125 10.7539 3.17188C9.92266 1.48125 8.34766 0.328125 6.47578 0.046875C6.19453 0.00312519 5.26328 -0.00937462 4.96953 0.0218744ZM6.29141 0.546875C8.26016 0.80625 9.92266 2.16875 10.5445 4.03438C10.757 4.66875 10.7977 4.93437 10.7945 5.6875C10.7914 6.05625 10.7789 6.4 10.7602 6.45C10.7289 6.55 10.7477 6.54062 8.06328 7.95937C7.26328 8.38125 6.57891 8.75625 6.54141 8.79063C6.46953 8.85313 6.46953 8.85938 6.46953 9.8125V10.7719L6.22891 10.7937C5.82266 10.8281 5.25703 10.8156 4.91953 10.7656C2.21641 10.3625 0.253906 7.86562 0.528906 5.17812C0.657031 3.95625 1.16016 2.89687 2.02891 2.03125C2.24766 1.81563 2.54766 1.55312 2.69766 1.44687C3.27578 1.04062 4.02266 0.724999 4.70703 0.596875C5.27578 0.490624 5.74766 0.474999 6.29141 0.546875ZM13.2883 8.01562L15.1852 9.04375L14.6695 9.32188L14.157 9.6L12.2258 8.54375C11.1664 7.9625 10.2727 7.47188 10.2414 7.45C10.1914 7.41875 10.2508 7.37813 10.6945 7.14687L11.2039 6.87813L11.2977 6.93437C11.3508 6.9625 12.2445 7.45 13.2883 8.01562ZM11.7664 8.85625L13.8914 10.0219L13.9008 10.6156L13.907 11.2062L13.6258 11.3844L13.3445 11.5594V10.9906C13.3445 10.5437 13.3352 10.4062 13.3008 10.3562C13.2758 10.3187 12.3195 9.78125 11.1758 9.15625C10.0289 8.53125 9.09453 8.00938 9.09453 8C9.09453 7.98125 9.59453 7.69063 9.62578 7.69063C9.63516 7.69063 10.5977 8.2125 11.7664 8.85625ZM10.5477 9.41875L12.5352 10.4938L12.3383 10.6031C11.5164 11.0531 11.2414 11.1906 11.1945 11.1719C11.0164 11.1062 7.29141 8.97813 7.31328 8.95625C7.36953 8.9 8.48828 8.31875 8.52266 8.32812C8.54453 8.33437 9.45391 8.825 10.5477 9.41875ZM9.33516 10.7406L10.9352 11.6406L10.9383 13.4625V15.2875L10.8477 15.2281C10.7977 15.1969 9.90703 14.6313 8.86328 13.9688L6.97266 12.7656L6.96953 11.0875V9.40937L7.35391 9.625C7.56328 9.74375 8.45391 10.2469 9.33516 10.7406ZM15.4383 11.3531V13.2062L15.2289 13.3187C15.1102 13.3812 14.307 13.8062 13.4383 14.2656C12.5695 14.725 11.7727 15.15 11.6664 15.2094L11.4695 15.3156V13.4937V11.6719L12.1352 11.3094L12.7977 10.9437L12.8133 11.5344C12.8289 12.0875 12.832 12.1281 12.8977 12.1906C12.9383 12.2313 13.0039 12.2594 13.057 12.2594C13.1539 12.2594 14.2727 11.6625 14.3508 11.5719C14.382 11.5344 14.3945 11.3312 14.407 10.7844L14.4227 10.0469L14.9227 9.775C15.1977 9.625 15.4258 9.5 15.432 9.5C15.4352 9.5 15.4383 10.3344 15.4383 11.3531Z"
fill="#434E5C"
/>
<path
d="M5.49778 0.96545C5.42903 1.01858 5.42278 1.05608 5.41341 1.32795C5.40716 1.49045 5.41028 1.66233 5.41966 1.70295C5.46653 1.89045 5.70091 1.96858 5.84778 1.8467C5.91966 1.79045 5.92278 1.76858 5.92278 1.40608C5.92278 1.04358 5.91966 1.0217 5.84778 0.96545C5.75403 0.89045 5.59153 0.89045 5.49778 0.96545Z"
fill="#434E5C"
/>
<path
d="M7.78125 1.50937C7.68125 1.55937 7.40625 2.04688 7.40625 2.175C7.40625 2.32812 7.5125 2.4375 7.65938 2.4375C7.80938 2.4375 7.85625 2.39375 8.025 2.08437C8.2 1.76875 8.2 1.60312 8.02812 1.51562C7.92188 1.45937 7.88125 1.45937 7.78125 1.50937Z"
fill="#434E5C"
/>
<path
d="M3.17282 1.60938C3.06344 1.71562 3.07594 1.8125 3.23844 2.1125C3.39157 2.39688 3.46657 2.46875 3.60407 2.46875C3.72907 2.46875 3.79782 2.425 3.84469 2.3125C3.88219 2.22187 3.87594 2.19688 3.75094 1.95C3.56032 1.57187 3.52282 1.53125 3.37282 1.53125C3.28219 1.53125 3.22594 1.55312 3.17282 1.60938Z"
fill="#434E5C"
/>
<path
d="M5.5375 2.53164C5.5 2.54726 5.45312 2.59726 5.4375 2.64101C5.41875 2.68789 5.40625 3.13476 5.40625 3.70664V4.68789L5.32187 4.71914C4.96875 4.84726 4.71875 5.16601 4.66875 5.55039C4.64375 5.76914 4.7 6.02226 4.83125 6.23476L4.9375 6.41601L4.5 7.15664C4.16562 7.72226 4.0625 7.92539 4.0625 8.00664C4.0625 8.14101 4.1125 8.21289 4.2375 8.24726C4.4375 8.30351 4.47812 8.25664 4.96875 7.42539C5.36562 6.75039 5.42812 6.65976 5.48437 6.67851C5.51875 6.68789 5.63437 6.69726 5.74062 6.69414C6.33437 6.68789 6.79062 6.12851 6.68437 5.54101C6.61562 5.18164 6.40937 4.90039 6.10625 4.75976L5.94062 4.68476L5.93125 3.65664C5.92187 2.51601 5.925 2.54414 5.71562 2.51601C5.65625 2.50664 5.57812 2.51601 5.5375 2.53164ZM5.90625 5.25351C6.14062 5.38476 6.225 5.70039 6.08437 5.90976C5.98125 6.05976 5.825 6.15664 5.67812 6.15664C5.30937 6.15664 5.05937 5.72851 5.25937 5.43476C5.41875 5.19414 5.675 5.12539 5.90625 5.25351Z"
fill="#434E5C"
/>
<path
d="M1.58125 3.19063C1.51562 3.24062 1.5 3.28125 1.5 3.39062C1.5 3.46875 1.51875 3.54688 1.54688 3.57188C1.63125 3.65937 2.11875 3.90625 2.2 3.90625C2.32812 3.90625 2.4375 3.77813 2.4375 3.62812C2.4375 3.48438 2.38438 3.4375 2.025 3.24062C1.7875 3.10938 1.69688 3.1 1.58125 3.19063Z"
fill="#434E5C"
/>
<path
d="M9.2125 3.25903C8.9 3.43403 8.84375 3.48715 8.84375 3.60903C8.84375 3.75278 8.92813 3.8434 9.07812 3.86215C9.18438 3.87465 9.24375 3.85278 9.46875 3.72778C9.77812 3.55278 9.8375 3.4684 9.78125 3.29653C9.70938 3.08403 9.55 3.07153 9.2125 3.25903Z"
fill="#434E5C"
/>
<path
d="M1.04133 5.43711C0.900707 5.49648 0.860082 5.71836 0.966332 5.84648C1.02258 5.91523 1.05383 5.92148 1.37258 5.93086L1.71946 5.94336L1.81321 5.84961C1.92258 5.73711 1.93508 5.60586 1.84758 5.49648C1.79133 5.42773 1.76321 5.42148 1.44758 5.41523C1.26321 5.40898 1.07883 5.42148 1.04133 5.43711Z"
fill="#434E5C"
/>
<path
d="M9.50183 5.49375C9.40183 5.59375 9.38621 5.66875 9.44246 5.79062C9.49558 5.90625 9.59871 5.9375 9.93621 5.9375C10.1987 5.9375 10.255 5.92812 10.3268 5.87187C10.3925 5.82187 10.4081 5.78125 10.4081 5.675C10.4081 5.45937 10.3456 5.425 9.93621 5.4125L9.59558 5.4L9.50183 5.49375Z"
fill="#434E5C"
/>
<path
d="M1.85 7.62187C1.70625 7.70312 1.575 7.79063 1.55937 7.81562C1.54375 7.84062 1.53125 7.90937 1.53125 7.97187C1.53125 8.1125 1.63437 8.21875 1.77187 8.21875C1.87187 8.21875 2.35937 7.96875 2.43125 7.88125C2.49687 7.79688 2.47812 7.6125 2.39687 7.5375C2.28125 7.43125 2.14687 7.45 1.85 7.62187Z"
fill="#434E5C"
/>
<path
d="M3.50938 8.92188C3.4125 8.99062 3.15625 9.475 3.15625 9.59375C3.15625 9.7125 3.28437 9.84375 3.40625 9.84375C3.53438 9.84375 3.6375 9.74375 3.77812 9.48438C3.9375 9.19687 3.95 9.0375 3.825 8.94063C3.72813 8.8625 3.60313 8.85625 3.50938 8.92188Z"
fill="#434E5C"
/>
<path
d="M5.54087 9.44375C5.43149 9.49687 5.40024 9.625 5.41274 9.9625C5.42524 10.3406 5.46274 10.4062 5.67524 10.4062C5.78149 10.4062 5.82212 10.3906 5.87212 10.325C5.92837 10.2531 5.93774 10.1969 5.93774 9.91563C5.93774 9.59688 5.93462 9.5875 5.84712 9.49687C5.75024 9.40312 5.65962 9.3875 5.54087 9.44375Z"
fill="#434E5C"
/>
<path
d="M7.48566 10.8906C7.38879 10.9844 7.37941 11.1844 7.46379 11.2563C7.49191 11.2844 8.12316 11.6531 8.86691 12.075C9.82629 12.6219 10.245 12.8438 10.3138 12.8438C10.3763 12.8438 10.4388 12.8156 10.4919 12.7625C10.5575 12.6969 10.5669 12.6625 10.5544 12.5687C10.5419 12.5094 10.5169 12.4406 10.495 12.4187C10.4732 12.3969 9.84191 12.0281 9.09816 11.5969C8.19191 11.075 7.71066 10.8125 7.65129 10.8125C7.59816 10.8125 7.52941 10.8438 7.48566 10.8906Z"
fill="#434E5C"
/>
<path
d="M7.45209 11.8591C7.35834 11.9498 7.34896 12.1185 7.43021 12.2123C7.51459 12.3123 10.1583 13.8248 10.2708 13.8373C10.4833 13.8623 10.6083 13.5904 10.4615 13.4248C10.4021 13.3623 8.14896 12.0185 7.78646 11.831C7.64896 11.7591 7.53959 11.7685 7.45209 11.8591Z"
fill="#434E5C"
/>
<path
d="M9.71782 0.0685797C9.63032 0.165454 9.63657 0.327954 9.73345 0.421704L9.80845 0.499829H11.9522H14.0928V3.38108V6.26233L13.5678 5.74045C13.1053 5.28108 13.0303 5.21858 12.9397 5.21858C12.8053 5.21858 12.6866 5.33733 12.6866 5.47483C12.6866 5.56545 12.7678 5.65608 13.4459 6.33733C13.8616 6.75608 14.2334 7.11233 14.2741 7.12795C14.3241 7.1467 14.3772 7.14045 14.4459 7.11233C14.5022 7.08733 14.8741 6.74045 15.2741 6.33733C15.9834 5.6217 15.9991 5.60295 15.9991 5.47795C15.9991 5.37483 15.9834 5.3342 15.9178 5.2842C15.7397 5.14358 15.6897 5.17483 15.1334 5.72483L14.6241 6.23108L14.6178 3.18108C14.6084 0.23108 14.6053 0.127954 14.5491 0.0654545C14.4897 -0.000170708 14.4897 -0.000170708 12.1366 -0.000170708H9.78345L9.71782 0.0685797Z"
fill="#434E5C"
/>
</g>
</svg>
);
};
export default ScheduleOrderIcon;

6
src/pages/orders/OrderDetails.module.css
View File

@@ -298,3 +298,9 @@
margin-bottom: 16px;
box-shadow: none;
}
.profileImage {
border-radius: 50%;
width: 50px;
height: 50px;
}

20
src/pages/orders/OrdersList.tsx
View File

@@ -1,4 +1,4 @@
import { Button, Card, Divider } from "antd";
import { Button, Card, Divider, Image } from "antd";
import EmptyOrdersIcon from "components/Icons/EmptyOrdersIcon";
import RateIcon from "components/Icons/RateIcon";
import ReOrderIcon from "components/Icons/ReOrderIcon";
@@ -85,6 +85,8 @@ export default function OrdersList() {
};
};
console.log(orders);
return (
<>
{orders.length === 0 ? (
@@ -124,15 +126,13 @@ export default function OrdersList() {
gap: "1rem",
}}
>
<Button
type="text"
shape="circle"
style={{
backgroundColor: "rgba(255, 183, 0, 0.08)",
}}
>
{order.restaurant_name[0]}
</Button>
<Image
src={order.restaurant_icon}
className={styles.profileImage}
width={50}
height={50}
preview={false}
/>
<div
style={{ display: "flex", flexDirection: "column", gap: 8 }}
>

6
src/pages/orders/orders.module.css
View File

@@ -81,3 +81,9 @@
margin-bottom: 16px;
box-shadow: none;
}
.profileImage {
border-radius: 50%;
width: 50px;
height: 50px;
}

9
src/pages/restaurant/RestaurantServices.tsx
View File

@@ -16,6 +16,7 @@ import { Link, useParams } from "react-router-dom";
import { useGetRestaurantDetailsQuery } from "redux/api/others";
import { useAppDispatch, useAppSelector } from "redux/hooks";
import styles from "./restaurant.module.css";
import ScheduleOrderIcon from "components/Icons/ScheduleOrderIcon";
export default function RestaurantServices() {
const { t } = useTranslation();
@@ -149,7 +150,7 @@ export default function RestaurantServices() {
title: t("common.scheduledOrder"),
description: t("home.services.scheduledOrder"),
icon: (
<ScheduleFilled
<ScheduleOrderIcon
className={styles.serviceIcon + " " + styles.scheduledOrderIcon}
/>
),
@@ -220,9 +221,11 @@ export default function RestaurantServices() {
<ProTitle
level={5}
style={{
margin: 0,
fontWeight: 500,
fontSize: 14,
fontWeight: 600,
lineHeight: "140%",
letterSpacing: "0%",
verticalAlign: "middle",
}}
>
{s?.title}

15
src/pages/restaurant/page.tsx
View File

@@ -39,10 +39,9 @@ export default function RestaurantPage() {
const dispatch = useAppDispatch();
const { t } = useTranslation();
const param = useParams();
const { isMobile } = useBreakPoint();
const [searchParams] = useSearchParams();
const { pathname } = useLocation();
const { orderType, items: cartItems } = useAppSelector(
const { orderType } = useAppSelector(
(state) => state.order,
);
const { isRTL } = useAppSelector((state) => state.locale);
@@ -54,10 +53,10 @@ export default function RestaurantPage() {
);
const [isOrderDetailsOpen, setIsOrderDetailsOpen] = useState(false);
const { containerRef, handleTouchEnd, handleTouchStart } = useSwipeUp({
swipeAction: () => setIsOrderDetailsOpen(true),
isEnabled: isMobile && cartItems.length > 0,
});
// const { containerRef, handleTouchEnd, handleTouchStart } = useSwipeUp({
// swipeAction: () => setIsOrderDetailsOpen(true),
// isEnabled: isMobile && cartItems.length > 0,
// });
// Automatically load restaurant taxes when restaurant data is available
useRestaurant(restaurant);
@@ -107,7 +106,7 @@ export default function RestaurantPage() {
</div>
<RestaurantServices />
<div
{/* <div
ref={containerRef}
onTouchStart={handleTouchStart}
onTouchEnd={handleTouchEnd}
@@ -115,7 +114,7 @@ export default function RestaurantPage() {
<div className={styles.promotionContainer}>
<Ads1 />
</div>
</div>
</div> */}
<div className={styles.socialIconsContainer}>
<Link to={`https://www.instagram.com/${restaurant?.instagram}`}>
<InstagramIcon className={styles.socialIcon} />

11
src/pages/restaurant/restaurant.module.css
View File

@@ -50,7 +50,10 @@
row-gap: 10px;
transition: all 0.3s ease;
border-radius: 50px;
background-color: rgba(255, 183, 0, 0.12);
border: 1px solid #f5f5f6;
/* background-color: rgba(255, 183, 0, 0.12); */
box-shadow: 0px 70px 20px 0px #c9c9c900;
}
.logo {
@@ -103,12 +106,12 @@
gap: 20px;
width: 100%;
z-index: 10;
margin-top: 8px;
margin-top: 19px;
}
.socialIcon {
width: 24px;
height: 24px;
width: 32px;
height: 32px;
transition: all 0.3s ease;
}