From 7e2c18ca6c0f49416a47968d615f960454ea614a Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Mon, 2 Oct 2023 16:09:05 +0330 Subject: [PATCH 1/3] CFE-6 Fixed any bugs --- .gitignore | 1 + mocks/handler.js | 4 +++- src/components/login-expert/LoginExpertComponent.jsx | 6 +++--- src/core/data/apiRoutes.js | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3dfb407..a69bd26 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ cypress/videos cypress/screenshots .next .env.local +.env.test .env .idea package-lock.json \ No newline at end of file diff --git a/mocks/handler.js b/mocks/handler.js index 49e0f99..3a8f75d 100644 --- a/mocks/handler.js +++ b/mocks/handler.js @@ -3,6 +3,8 @@ import {rest} from "msw"; export const handler = [rest.get(GET_USER_ROUTE, (req, res, ctx) => { return res(ctx.json({ - id: 10 + data: { + id: 10 + } })) })] \ No newline at end of file diff --git a/src/components/login-expert/LoginExpertComponent.jsx b/src/components/login-expert/LoginExpertComponent.jsx index 9be301b..d2a2d13 100644 --- a/src/components/login-expert/LoginExpertComponent.jsx +++ b/src/components/login-expert/LoginExpertComponent.jsx @@ -10,7 +10,7 @@ import useRequest from "@/lib/app/hooks/useRequest"; import useUser from "@/lib/app/hooks/useUser"; import {useTranslations} from "next-intl"; -const LoginExpertComponent = () =>{ +const LoginExpertComponent = () => { const t = useTranslations(); const requestServer = useRequest() const {setToken} = useUser(); // pass token to set token @@ -24,7 +24,7 @@ const LoginExpertComponent = () =>{ notification: {show: false} } }).then((response) => { - setToken(response.data.token) + setToken(response.data.data.token) }).catch(() => { props.setSubmitting(false) }) @@ -38,7 +38,7 @@ const LoginExpertComponent = () =>{ password: Yup.string().required(t("LoginPage.password_error_message_required")), }); - return( + return ( Date: Mon, 2 Oct 2023 16:13:04 +0330 Subject: [PATCH 2/3] CFE-6 Fixed env file --- .gitignore | 3 +-- jest.setup.js | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a69bd26..662e667 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,7 @@ node_modules cypress/videos cypress/screenshots .next -.env.local -.env.test +.env* .env .idea package-lock.json \ No newline at end of file diff --git a/jest.setup.js b/jest.setup.js index 7d55f67..fadd766 100644 --- a/jest.setup.js +++ b/jest.setup.js @@ -2,8 +2,6 @@ import '@testing-library/jest-dom' import {server} from "./mocks/server"; import mockRouter from 'next-router-mock' -require('dotenv').config({path: './.env.local'}); - jest.mock('next/router', () => jest.requireActual('next-router-mock')) beforeAll(() => { From edc89c9e86246eaffc75e9e4787a6f526c9270f0 Mon Sep 17 00:00:00 2001 From: AmirHossein Mahmoodi Date: Mon, 2 Oct 2023 16:14:10 +0330 Subject: [PATCH 3/3] CFE-6 init call widget and change directory dashboard component --- .../dashboard/change-password/index.jsx | 2 +- .../dashboard/edit-profile/index.jsx | 2 +- src/components/dashboard/first/index.jsx | 2 +- .../Dashboard/Breadcrumbs}/BreadcrumbItem.jsx | 0 .../layouts/Dashboard/Breadcrumbs}/index.jsx | 0 .../Dashboard/CallWidget/CallWidgetButton.jsx | 13 ++++++++++ .../CallWidget/CallWidgetDialog/index.jsx | 24 +++++++++++++++++++ .../layouts/Dashboard/CallWidget/index.jsx | 15 ++++++++++++ .../layouts/Dashboard/Header}/ProfileData.jsx | 0 .../layouts/Dashboard/Header}/ProfileMenu.jsx | 0 .../Dashboard/Header}/ProfileOptionLogOut.jsx | 0 .../Dashboard/Header}/ProfileOptions.jsx | 0 .../layouts/Dashboard/Header}/index.jsx | 0 .../Dashboard/Sidebar}/SidebarDrawer.jsx | 2 +- .../Dashboard/Sidebar}/SidebarList.jsx | 1 - .../Dashboard/Sidebar}/SidebarListItem.jsx | 0 .../Dashboard/Sidebar}/SidebarListSubItem.jsx | 0 .../layouts/Dashboard/Sidebar}/index.jsx | 0 .../layouts/Dashboard}/index.jsx | 18 +++++++------- src/core/components/DialogTransition.jsx | 6 +++++ src/core/components/StyledFab.jsx | 11 +++++++++ src/layouts/DashboardLayout.jsx | 14 +++++++++++ 22 files changed, 96 insertions(+), 14 deletions(-) rename src/{layouts/dashboardLayouts/breadcrumbs => components/layouts/Dashboard/Breadcrumbs}/BreadcrumbItem.jsx (100%) rename src/{layouts/dashboardLayouts/breadcrumbs => components/layouts/Dashboard/Breadcrumbs}/index.jsx (100%) create mode 100644 src/components/layouts/Dashboard/CallWidget/CallWidgetButton.jsx create mode 100644 src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/index.jsx create mode 100644 src/components/layouts/Dashboard/CallWidget/index.jsx rename src/{layouts/dashboardLayouts/header => components/layouts/Dashboard/Header}/ProfileData.jsx (100%) rename src/{layouts/dashboardLayouts/header => components/layouts/Dashboard/Header}/ProfileMenu.jsx (100%) rename src/{layouts/dashboardLayouts/header => components/layouts/Dashboard/Header}/ProfileOptionLogOut.jsx (100%) rename src/{layouts/dashboardLayouts/header => components/layouts/Dashboard/Header}/ProfileOptions.jsx (100%) rename src/{layouts/dashboardLayouts/header => components/layouts/Dashboard/Header}/index.jsx (100%) rename src/{layouts/dashboardLayouts/sidebar => components/layouts/Dashboard/Sidebar}/SidebarDrawer.jsx (93%) rename src/{layouts/dashboardLayouts/sidebar => components/layouts/Dashboard/Sidebar}/SidebarList.jsx (98%) rename src/{layouts/dashboardLayouts/sidebar => components/layouts/Dashboard/Sidebar}/SidebarListItem.jsx (100%) rename src/{layouts/dashboardLayouts/sidebar => components/layouts/Dashboard/Sidebar}/SidebarListSubItem.jsx (100%) rename src/{layouts/dashboardLayouts/sidebar => components/layouts/Dashboard/Sidebar}/index.jsx (100%) rename src/{layouts/dashboardLayouts => components/layouts/Dashboard}/index.jsx (78%) create mode 100644 src/core/components/DialogTransition.jsx create mode 100644 src/core/components/StyledFab.jsx create mode 100644 src/layouts/DashboardLayout.jsx diff --git a/src/components/dashboard/change-password/index.jsx b/src/components/dashboard/change-password/index.jsx index ae74de6..a69a969 100644 --- a/src/components/dashboard/change-password/index.jsx +++ b/src/components/dashboard/change-password/index.jsx @@ -1,5 +1,5 @@ import CenterLayout from "@/layouts/CenterLayout"; -import DashboardLayouts from "@/layouts/dashboardLayouts"; +import DashboardLayouts from "@/layouts/DashboardLayout"; import {Button, Container, Paper, Stack, Typography,} from "@mui/material"; import {Formik} from "formik"; import * as Yup from "yup"; diff --git a/src/components/dashboard/edit-profile/index.jsx b/src/components/dashboard/edit-profile/index.jsx index 3018aa3..394a7b0 100644 --- a/src/components/dashboard/edit-profile/index.jsx +++ b/src/components/dashboard/edit-profile/index.jsx @@ -1,6 +1,6 @@ import StyledForm from "@/core/components/StyledForm"; import CenterLayout from "@/layouts/CenterLayout"; -import DashboardLayouts from "@/layouts/dashboardLayouts"; +import DashboardLayouts from "@/layouts/DashboardLayout"; import useUser from "@/lib/app/hooks/useUser"; import {Box, Container, Grid, Paper, Stack, TextField, Typography,} from "@mui/material"; import * as Yup from "yup"; diff --git a/src/components/dashboard/first/index.jsx b/src/components/dashboard/first/index.jsx index ee4f80a..1785a67 100644 --- a/src/components/dashboard/first/index.jsx +++ b/src/components/dashboard/first/index.jsx @@ -1,4 +1,4 @@ -import DashboardLayouts from "@/layouts/dashboardLayouts"; +import DashboardLayouts from "@/layouts/DashboardLayout"; const DashboardFirstComponent = () => { return ; diff --git a/src/layouts/dashboardLayouts/breadcrumbs/BreadcrumbItem.jsx b/src/components/layouts/Dashboard/Breadcrumbs/BreadcrumbItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/breadcrumbs/BreadcrumbItem.jsx rename to src/components/layouts/Dashboard/Breadcrumbs/BreadcrumbItem.jsx diff --git a/src/layouts/dashboardLayouts/breadcrumbs/index.jsx b/src/components/layouts/Dashboard/Breadcrumbs/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/breadcrumbs/index.jsx rename to src/components/layouts/Dashboard/Breadcrumbs/index.jsx diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetButton.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetButton.jsx new file mode 100644 index 0000000..416e5c8 --- /dev/null +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetButton.jsx @@ -0,0 +1,13 @@ +import PermPhoneMsgIcon from '@mui/icons-material/PermPhoneMsg'; +import StyledFab from "@/core/components/StyledFab"; + +const CallWidgetButton = ({setOpen}) => { + return ( + setOpen(true)}> + + + ) +} + +export default CallWidgetButton \ No newline at end of file diff --git a/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/index.jsx b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/index.jsx new file mode 100644 index 0000000..77ed57d --- /dev/null +++ b/src/components/layouts/Dashboard/CallWidget/CallWidgetDialog/index.jsx @@ -0,0 +1,24 @@ +import {Dialog} from "@mui/material"; +import {DialogTransition} from "@/core/components/DialogTransition"; + +const CallWidgetDialog = ({open, setOpen}) => { + + const handleClose = () => { + setOpen(false); + }; + + return ( + <> + + + + + ) +} + +export default CallWidgetDialog \ No newline at end of file diff --git a/src/components/layouts/Dashboard/CallWidget/index.jsx b/src/components/layouts/Dashboard/CallWidget/index.jsx new file mode 100644 index 0000000..4d871b2 --- /dev/null +++ b/src/components/layouts/Dashboard/CallWidget/index.jsx @@ -0,0 +1,15 @@ +import CallWidgetButton from "@/components/layouts/Dashboard/CallWidget/CallWidgetButton"; +import CallWidgetDialog from "@/components/layouts/Dashboard/CallWidget/CallWidgetDialog"; +import {useState} from "react"; + +const CallWidget = () => { + const [open, setOpen] = useState(false) + return ( + <> + + + + ) +} + +export default CallWidget \ No newline at end of file diff --git a/src/layouts/dashboardLayouts/header/ProfileData.jsx b/src/components/layouts/Dashboard/Header/ProfileData.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileData.jsx rename to src/components/layouts/Dashboard/Header/ProfileData.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileMenu.jsx b/src/components/layouts/Dashboard/Header/ProfileMenu.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileMenu.jsx rename to src/components/layouts/Dashboard/Header/ProfileMenu.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileOptionLogOut.jsx b/src/components/layouts/Dashboard/Header/ProfileOptionLogOut.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileOptionLogOut.jsx rename to src/components/layouts/Dashboard/Header/ProfileOptionLogOut.jsx diff --git a/src/layouts/dashboardLayouts/header/ProfileOptions.jsx b/src/components/layouts/Dashboard/Header/ProfileOptions.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/ProfileOptions.jsx rename to src/components/layouts/Dashboard/Header/ProfileOptions.jsx diff --git a/src/layouts/dashboardLayouts/header/index.jsx b/src/components/layouts/Dashboard/Header/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/header/index.jsx rename to src/components/layouts/Dashboard/Header/index.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarDrawer.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarDrawer.jsx similarity index 93% rename from src/layouts/dashboardLayouts/sidebar/SidebarDrawer.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarDrawer.jsx index f155dce..33348a5 100644 --- a/src/layouts/dashboardLayouts/sidebar/SidebarDrawer.jsx +++ b/src/components/layouts/Dashboard/Sidebar/SidebarDrawer.jsx @@ -14,7 +14,7 @@ const SidebarDrawer = ({handleDrawerToggle}) => { {t("app_short_name")} - {user.name} | {user.position} + {user.full_name} | {user.position} diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarList.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarList.jsx similarity index 98% rename from src/layouts/dashboardLayouts/sidebar/SidebarList.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarList.jsx index 12d268d..040b455 100644 --- a/src/layouts/dashboardLayouts/sidebar/SidebarList.jsx +++ b/src/components/layouts/Dashboard/Sidebar/SidebarList.jsx @@ -18,7 +18,6 @@ function reducer(state, action) { case "SELECTED": return state.map((itemsArr) => itemsArr.map((item) => { - console.log(item) if (item.type === "page") { if (action.route === item.route) return {...item, selected: true} diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarListItem.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarListItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarListItem.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarListItem.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/SidebarListSubItem.jsx b/src/components/layouts/Dashboard/Sidebar/SidebarListSubItem.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/SidebarListSubItem.jsx rename to src/components/layouts/Dashboard/Sidebar/SidebarListSubItem.jsx diff --git a/src/layouts/dashboardLayouts/sidebar/index.jsx b/src/components/layouts/Dashboard/Sidebar/index.jsx similarity index 100% rename from src/layouts/dashboardLayouts/sidebar/index.jsx rename to src/components/layouts/Dashboard/Sidebar/index.jsx diff --git a/src/layouts/dashboardLayouts/index.jsx b/src/components/layouts/Dashboard/index.jsx similarity index 78% rename from src/layouts/dashboardLayouts/index.jsx rename to src/components/layouts/Dashboard/index.jsx index fae51d2..3ee24c6 100644 --- a/src/layouts/dashboardLayouts/index.jsx +++ b/src/components/layouts/Dashboard/index.jsx @@ -1,13 +1,13 @@ -import {useState} from "react"; -import FullPageLayout from "../FullPageLayout"; -import Header from "./header"; -import Sidebar from "./sidebar"; +import Header from "src/components/layouts/Dashboard/Header"; +import Sidebar from "src/components/layouts/Dashboard/Sidebar"; +import FullPageLayout from "@/layouts/FullPageLayout"; import {Toolbar} from "@mui/material"; -import BreadCrumbs from "./breadcrumbs"; +import BreadCrumbs from "src/components/layouts/Dashboard/Breadcrumbs"; +import {useState} from "react"; const drawerWidth = 240; -const DashboardLayouts = (props) => { +const Dashboard = (props) => { const {window} = props; const [mobileOpen, setMobileOpen] = useState(false); const container = @@ -39,7 +39,7 @@ const DashboardLayouts = (props) => { - ); -}; + ) +} -export default DashboardLayouts; +export default Dashboard \ No newline at end of file diff --git a/src/core/components/DialogTransition.jsx b/src/core/components/DialogTransition.jsx new file mode 100644 index 0000000..d94765f --- /dev/null +++ b/src/core/components/DialogTransition.jsx @@ -0,0 +1,6 @@ +import {forwardRef} from "react"; +import {Slide} from "@mui/material"; + +export const DialogTransition = forwardRef(function DialogTransition(props, ref) { + return ; +}); diff --git a/src/core/components/StyledFab.jsx b/src/core/components/StyledFab.jsx new file mode 100644 index 0000000..dd935cc --- /dev/null +++ b/src/core/components/StyledFab.jsx @@ -0,0 +1,11 @@ +import {Fab, styled} from "@mui/material"; + +const StyledFab = styled(Fab)` + position: absolute; + bottom: 16px; + /* @noflip */ + left: 16px; + z-index: 1500; +`; + +export default StyledFab; diff --git a/src/layouts/DashboardLayout.jsx b/src/layouts/DashboardLayout.jsx new file mode 100644 index 0000000..40b722d --- /dev/null +++ b/src/layouts/DashboardLayout.jsx @@ -0,0 +1,14 @@ +import CallWidget from "src/components/layouts/Dashboard/CallWidget"; +import Dashboard from "src/components/layouts/Dashboard"; + +const DashboardLayouts = (props) => { + + return ( + <> + + + + ); +}; + +export default DashboardLayouts;