add dragabble chat button

advanced-computer-lab-2023 · Dec 16, 2023 · 57385bf · 57385bf
1 parent b5a2026
commit 57385bf
Show file tree

Hide file tree

Showing 15 changed files with 10,720 additions and 9,920 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -33,6 +33,8 @@
     "react": "^18.2.0",
     "react-apexcharts": "^1.4.0",
     "react-device-detect": "^2.2.2",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-perfect-scrollbar": "^1.5.8",
     "react-redux": "^8.0.2",

diff --git a/client/src/App.js b/client/src/App.js
@@ -16,7 +16,8 @@ import { LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
 import Loader from 'ui-component/Loader';
 import { authenticationAxios } from './utils/AxiosConfig';
-
+import { DndProvider } from 'react-dnd';
+import { HTML5Backend } from 'react-dnd-html5-backend';
 
 
 // ==============================|| APP ||============================== //
@@ -58,13 +59,15 @@ const App = () => {
 	}, []);
 
 	return (
+		<DndProvider backend={HTML5Backend}>
 			<ThemeProvider theme={themes(customization)}>
 				<CssBaseline />
 				<LocalizationProvider dateAdapter={AdapterDateFns}>
 				{isLoading && <Loader />}
 				{!isLoading && <Routes />}
 				</LocalizationProvider>
 			</ThemeProvider>
+		</DndProvider>
 	);
 };
 

diff --git a/client/src/layout/MainLayout/Sidebar/MenuList/doctor-menu-items/pages.js b/client/src/layout/MainLayout/Sidebar/MenuList/doctor-menu-items/pages.js
@@ -71,14 +71,6 @@ const pages = {
             url: '/doctor/pages/contract',
             target: false,
         },
-        {
-            id: 'chat',
-            title: 'Chat',
-            type: 'item',
-            icon: icons.ChatIcon,
-            url: '/doctor/pages/chat',
-            target: false,
-        },
     ],
 };
 

diff --git a/client/src/layout/MainLayout/Sidebar/MenuList/patient-menu-items/pages.js b/client/src/layout/MainLayout/Sidebar/MenuList/patient-menu-items/pages.js
@@ -90,14 +90,6 @@ const pages = {
             url: '/patient/wallet',
             target: false,
         },
-        {
-            id: 'chat',
-            title: 'Chat',
-            type: 'item',
-            icon: icons.ChatIcon,
-            url: '/patient/pages/chat',
-            target: false,
-        },
     ],
 };
 

diff --git a/client/src/layout/MainLayout/index.js b/client/src/layout/MainLayout/index.js
@@ -16,6 +16,7 @@ import {
 
 import Header from './Header';
 import Sidebar from './Sidebar';
+import Chat from '../../pages/chat/Chat';
 // import Customization from '../Customization';
 
 import { drawerWidth } from 'store/constant';
@@ -66,6 +67,7 @@ const Main = styled('main', { shouldForwardProp: (prop) => prop !== 'open' })(
 // ==============================|| MAIN LAYOUT ||============================== //
 
 const MainLayout = ({ userType }) => {
+    Outlet;
     const theme = useTheme();
     const matchDownMd = useMediaQuery(theme.breakpoints.down('md'));
     const navigate = useNavigate();
@@ -133,11 +135,17 @@ const MainLayout = ({ userType }) => {
                         )}
 
                         {/* main content */}
-                        <Main theme={theme} open={leftDrawerOpened}>
+                        <Main theme={theme} open={leftDrawerOpened} sx={{ position: 'relative' }}>
                             {(!user || user.type != userType) && (
                                 <h1>not autherized!!</h1>
                             )}
-                            {user && user.type == userType && <Outlet />}
+                            {user && user.type == userType &&
+                            <Chat> 
+                                <div>
+                                <Outlet />
+                                </div>
+                            </Chat>
+                            }
                         </Main>
 
                         {/* <Customization /> */}