diff --git a/.env b/.env index e4e1a63..ab44efd 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ NODE_ENV="development" -NEXT_PUBLIC_SERVER_URL=http://192.168.88.251:32769 -NEXT_PUBLIC_PUBLIC_URL=http://192.168.88.251:32769 -NEXT_PUBLIC_API_URL=http://192.168.88.251:32769/api +# NEXT_PUBLIC_SERVER_URL=http://192.168.88.251:32769 +# NEXT_PUBLIC_PUBLIC_URL=http://192.168.88.251:32769 +# NEXT_PUBLIC_API_URL=http://192.168.88.251:32769/api # SECURE_LOCAL_STORAGE_HASH_KEY=f1da2b2c7a4c446934267fea631102ec389b5b99 # NEXT_PUBLIC_API_URL_IMAGE=https://192.168.88.12:49154/Files/ReportImages @@ -14,8 +14,8 @@ NEXT_PUBLIC_API_URL=http://192.168.88.251:32769/api -# NEXT_PUBLIC_SERVER_URL=https://api.brizco.io -# NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.io -# NEXT_PUBLIC_API_URL=https://api.brizco.io/api +NEXT_PUBLIC_SERVER_URL=https://api.brizco.io +NEXT_PUBLIC_PUBLIC_URL=https://api.brizco.io +NEXT_PUBLIC_API_URL=https://api.brizco.io/api # NEXT_PUBLIC_API_URL_IMAGE=https://api.macsonline.ir/Files/ReportImages # NEXT_PUBLIC_API_URL_BackUp=https://api.macsonline.ir/Files/BackUps \ No newline at end of file diff --git a/components/NavBar/NavBAr.jsx b/components/NavBar/NavBAr.jsx index 8457e7d..c0f8f0d 100644 --- a/components/NavBar/NavBAr.jsx +++ b/components/NavBar/NavBAr.jsx @@ -29,117 +29,119 @@ const NavBAr = (props) => { }, [permissions]); return ( -
- {/*
+
+
+ {/*
*/} -
- {HasPermission("ViewDashboard", permissions) && ( - - <> - {usePath.includes("/home") ? ( -
- - - -
- ) : ( -
- - - -
- )} - - - )} - {HasPermission("ViewShiftPlans", permissions) && ( - - <> - {usePath.includes("/shifts") ? ( -
- - - - -
- ) : ( -
- - - - -
- )} - - - )} -
+ {HasPermission("ViewDashboard", permissions) && ( + + <> + {usePath.includes("/home") ? ( +
+ + + +
+ ) : ( +
+ + + +
+ )} + + + )} + {HasPermission("ViewShiftPlans", permissions) && ( + + <> + {usePath.includes("/shifts") ? ( +
+ + + + +
+ ) : ( +
+ + + + +
+ )} + + + )} + + {/*
{ openBigPlus(); @@ -160,65 +162,66 @@ const NavBAr = (props) => { />
+
*/} + + {HasPermission("ViewComplexSettings", permissions) && ( + + <> + {usePath.includes("/employees") ? ( +
+ + + +
+ ) : ( +
+ + + +
+ )} + + + )} + + {HasPermission("ViewActivities", permissions) && ( + + <> + {usePath.includes("/tasks") ? ( +
+
+ +
+
+ ) : ( +
+
+ +
+
+ )} + + + )}
- - {HasPermission("ViewComplexSettings", permissions) && ( - - <> - {usePath.includes("/employees") ? ( -
- - - -
- ) : ( -
- - - -
- )} - - - )} - - {HasPermission("ViewActivities", permissions) && ( - - <> - {usePath.includes("/tasks") ? ( -
-
- -
-
- ) : ( -
-
- -
-
- )} - - - )}
); diff --git a/src/app/home/page.jsx b/src/app/home/page.jsx index 1231c78..8ff57b0 100644 --- a/src/app/home/page.jsx +++ b/src/app/home/page.jsx @@ -14,32 +14,18 @@ import { Chart as ChartJS, ArcElement, Tooltip, Legend } from "chart.js"; import { Doughnut, Pie } from "react-chartjs-2"; import BottomSheetChangeRole from "plugins/BottomSheet/BottomSheetChangeRole"; import HasPermission from "plugins/HasPermission/page"; +import Avatar from "boring-avatars"; ChartJS.register(ArcElement, Tooltip, Legend); export const data = { datasets: [ { - label: ["پوزیشن"], - data: [60, 38, 95, 60, 20, 30], - backgroundColor: [ - "rgba(46, 161, 134, 0.8)", - "rgba(52, 115, 101, 0.41)", - "rgba(80, 143, 114, 0.61)", - "rgba(75, 155, 138, 0.61)", - "rgba(85, 155, 138, 0.91)", - "rgba(12, 75, 61, 0.51)", - ], - borderColor: [ - "rgba(255, 99, 132, 1)", - "rgba(54, 162, 235, 1)", - "rgba(255, 206, 86, 1)", - "rgba(75, 192, 192, 1)", - "rgba(153, 102, 255, 1)", - "rgba(255, 159, 64, 1)", - ], - borderWidth: 1, - borderColor: " #356859", + label: ["", " "], + data: [350, 200], + backgroundColor: ["rgba(203, 203, 203, 0.38)", "rgba(222, 193, 72, 1)"], + borderColor: ["transparent"], + cutout: 35, }, ], }; @@ -79,66 +65,264 @@ const Home = (props) => { />
-
-
-

مسیر فرایند شروع

+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
-

- شما - - درصد از فرایند شروع را انجام داده اید -

-
-
-
-
-
- -
-

ادامه فرایند

-
- {" "} - - - +
+

+ + در شیفت عصر +

+
- -
-
+
+

شنبه 20 فروردین 1403

+
-
-
-

پوزیشن

+
+
+
+

+ + % +

+
+
+
+
+ +
+
+ +
+

+ مجموعه شما امروز + + فعالیت فعال دارد +

+
-
-
-

سکشن

-
-
-
-

روتین

-
-
-
-

یوزر

-
-
-
-

شبفت

+ +
+

+ بستن شیفت +

-
- +
+
+
+ + + +
+ +
+

+ کل شیفت های مجموعه{" "} +

+
+
+
+
+ + + +
+ +
+

+ کل تسک های مجموعه{" "} +

+
+
{" "} +
+

+ افزودن تسک{" "} +

+
+
+ +
+
+

+ شیفت بندی هفته{" "} +

+
+
+
+ +

گزارش های مجموعه

+ +
+
+
+ + + + + +
+
+

شیفت های بسته شده

+

+ خروجی اکسل +

+
+
+
+ +
+
+
+ + + + + +
+
+

تسک های مجموعه

+

+ خروجی اکسل +

+
+
+
+ +
+
+
+ + + + + +
+
+

کارمند های مجموعه

+

+ خروجی اکسل +

+
diff --git a/src/app/layout.jsx b/src/app/layout.jsx index a691935..04488cb 100644 --- a/src/app/layout.jsx +++ b/src/app/layout.jsx @@ -1763,7 +1763,7 @@ export default function RootLayout({ children }) { {openTimePicker && } - {BigPlusOpen ? ( + {/* {BigPlusOpen ? (
) : ( "" - )} + )} */} diff --git a/src/app/shifts/page.jsx b/src/app/shifts/page.jsx index 6b67856..c76a789 100644 --- a/src/app/shifts/page.jsx +++ b/src/app/shifts/page.jsx @@ -85,40 +85,18 @@ const Shifts = (props) => { }} /> - {HasPermission("ManageShiftPlans", permissions) && ( - <> -
- -
-

شیفت هفته

- -
-
-
-
- - -
-

- {" "} - شیفت بعدی - هفته بعد -

-
-
-
{" "} -
- -
- - )}
+ {HasPermission("ManageShiftPlans", permissions) && ( + <> + +
+

+ شیفت بندی هفته{" "} +

+
+ + + )} {shiftplans.length <= 0 ? (
diff --git a/style/globals.css b/style/globals.css index dc4687f..3ec05d1 100644 --- a/style/globals.css +++ b/style/globals.css @@ -459,3 +459,14 @@ body { background-size: cover; background-image: url(../public/images/bg.png); } + +.bg-dahs-chart { + background-image: radial-gradient( + circle, + #b16a62, + #b8645a, + #be5e52, + #c45749, + #c95040 + ); +}