Solved a conflict

client/src/app.jsx

@@ -0,0 +1,18 @@
+import 'src/global.css';
+
+import { useScrollToTop } from 'src/hooks/use-scroll-to-top';
+
+import Router from 'src/routes/sections';
+import ThemeProvider from 'src/theme';
+
+// ---------------------------------------------------------------------
+
+export default function App() {
+  useScrollToTop();
+
+  return (
+    <ThemeProvider>
+      <Router />
+    </ThemeProvider>
+  );
+}

client/src/layouts/dashboard/header.jsx

@@ -16,10 +16,6 @@ import Iconify from 'src/components/iconify';
 import Searchbar from './common/searchbar';
 import { NAV, HEADER } from './config-layout';
 import AccountPopover from './common/account-popover';
-<<<<<<< HEAD
-=======
-import LanguagePopover from './common/language-popover';
->>>>>>> 0aeb3943ef69fe58dc7187993cf947cd6a1468d4
 import NotificationsPopover from './common/notifications-popover';
 
 // ----------------------------------------------------------------------
@@ -42,10 +38,6 @@ export default function Header({ onOpenNav }) {
       <Box sx={{ flexGrow: 1 }} />
 
       <Stack direction="row" alignItems="center" spacing={1}>
-<<<<<<< HEAD
-=======
-        <LanguagePopover />
->>>>>>> 0aeb3943ef69fe58dc7187993cf947cd6a1468d4
         <NotificationsPopover />
         <AccountPopover />
       </Stack>
@@ -59,21 +51,21 @@ export default function Header({ onOpenNav }) {
         height: HEADER.H_MOBILE,
         zIndex: theme.zIndex.appBar + 1,
         ...bgBlur({
-          color: theme.palette.background.default,
+          color: theme.palette.background.default
         }),
         transition: theme.transitions.create(['height'], {
-          duration: theme.transitions.duration.shorter,
+          duration: theme.transitions.duration.shorter
         }),
         ...(lgUp && {
           width: `calc(100% - ${NAV.WIDTH + 1}px)`,
-          height: HEADER.H_DESKTOP,
-        }),
+          height: HEADER.H_DESKTOP
+        })
       }}
     >
       <Toolbar
         sx={{
           height: 1,
-          px: { lg: 5 },
+          px: { lg: 5 }
         }}
       >
         {renderContent}
@@ -83,5 +75,5 @@ export default function Header({ onOpenNav }) {
 }
 
 Header.propTypes = {
-  onOpenNav: PropTypes.func,
+  onOpenNav: PropTypes.func
 };

client/src/layouts/dashboard/nav.jsx

@@ -4,10 +4,7 @@ import PropTypes from 'prop-types';
 import Box from '@mui/material/Box';
 import Stack from '@mui/material/Stack';
 import Drawer from '@mui/material/Drawer';
-<<<<<<< HEAD
-=======
 import Button from '@mui/material/Button';
->>>>>>> 0aeb3943ef69fe58dc7187993cf947cd6a1468d4
 import Avatar from '@mui/material/Avatar';
 import { alpha } from '@mui/material/styles';
 import Typography from '@mui/material/Typography';
@@ -50,7 +47,7 @@ export default function Nav({ openNav, onCloseNav }) {
         display: 'flex',
         borderRadius: 1.5,
         alignItems: 'center',
-        bgcolor: (theme) => alpha(theme.palette.grey[500], 0.12),
+        bgcolor: (theme) => alpha(theme.palette.grey[500], 0.12)
       }}
     >
       <Avatar src={account.photoURL} alt="photoURL" />
@@ -73,47 +70,15 @@ export default function Nav({ openNav, onCloseNav }) {
     </Stack>
   );
 
-<<<<<<< HEAD
-=======
-  const renderUpgrade = (
-    <Box sx={{ px: 2.5, pb: 3, mt: 10 }}>
-      <Stack alignItems="center" spacing={3} sx={{ pt: 5, borderRadius: 2, position: 'relative' }}>
-        <Box
-          component="img"
-          src="/assets/illustrations/illustration_avatar.png"
-          sx={{ width: 100, position: 'absolute', top: -50 }}
-        />
-
-        <Box sx={{ textAlign: 'center' }}>
-          <Typography variant="h6">Get more?</Typography>
-
-          <Typography variant="body2" sx={{ color: 'text.secondary', mt: 1 }}>
-            From only $69
-          </Typography>
-        </Box>
-
-        <Button
-          href="https://material-ui.com/store/items/minimal-dashboard/"
-          target="_blank"
-          variant="contained"
-          color="inherit"
-        >
-          Upgrade to Pro
-        </Button>
-      </Stack>
-    </Box>
-  );
-
->>>>>>> 0aeb3943ef69fe58dc7187993cf947cd6a1468d4
   const renderContent = (
     <Scrollbar
       sx={{
         height: 1,
         '& .simplebar-content': {
           height: 1,
           display: 'flex',
-          flexDirection: 'column',
-        },
+          flexDirection: 'column'
+        }
       }}
     >
       <Logo sx={{ mt: 3, ml: 4 }} />
@@ -123,19 +88,14 @@ export default function Nav({ openNav, onCloseNav }) {
       {renderMenu}
 
       <Box sx={{ flexGrow: 1 }} />
-<<<<<<< HEAD
-=======
-
-      {renderUpgrade}
->>>>>>> 0aeb3943ef69fe58dc7187993cf947cd6a1468d4
     </Scrollbar>
   );
 
   return (
     <Box
       sx={{
         flexShrink: { lg: 0 },
-        width: { lg: NAV.WIDTH },
+        width: { lg: NAV.WIDTH }
       }}
     >
       {upLg ? (
@@ -144,7 +104,7 @@ export default function Nav({ openNav, onCloseNav }) {
             height: 1,
             position: 'fixed',
             width: NAV.WIDTH,
-            borderRight: (theme) => `dashed 1px ${theme.palette.divider}`,
+            borderRight: (theme) => `dashed 1px ${theme.palette.divider}`
           }}
         >
           {renderContent}
@@ -155,8 +115,8 @@ export default function Nav({ openNav, onCloseNav }) {
           onClose={onCloseNav}
           PaperProps={{
             sx: {
-              width: NAV.WIDTH,
-            },
+              width: NAV.WIDTH
+            }
           }}
         >
           {renderContent}
@@ -168,7 +128,7 @@ export default function Nav({ openNav, onCloseNav }) {
 
 Nav.propTypes = {
   openNav: PropTypes.bool,
-  onCloseNav: PropTypes.func,
+  onCloseNav: PropTypes.func
 };
 
 // ----------------------------------------------------------------------
@@ -194,9 +154,9 @@ function NavItem({ item }) {
           fontWeight: 'fontWeightSemiBold',
           bgcolor: (theme) => alpha(theme.palette.primary.main, 0.08),
           '&:hover': {
-            bgcolor: (theme) => alpha(theme.palette.primary.main, 0.16),
-          },
-        }),
+            bgcolor: (theme) => alpha(theme.palette.primary.main, 0.16)
+          }
+        })
       }}
     >
       <Box component="span" sx={{ width: 24, height: 24, mr: 2 }}>
@@ -209,5 +169,5 @@ function NavItem({ item }) {
 }
 
 NavItem.propTypes = {
-  item: PropTypes.object,
+  item: PropTypes.object
 };

client/src/pages/login.jsx

@@ -0,0 +1,17 @@
+import { Helmet } from 'react-helmet-async';
+
+import { LoginView } from 'src/sections/login';
+
+// ----------------------------------------------------------------------
+
+export default function LoginPage() {
+  return (
+    <>
+      <Helmet>
+        <title> Login </title>
+      </Helmet>
+
+      <LoginView />
+    </>
+  );
+}

client/src/sections/doctors/doctor-card.jsx

@@ -40,11 +40,11 @@ export default function DoctorCard({ doctor }) {
           </Typography>
         </Stack>
 
-        <Stack direction={'row'} spacing={2} alignItems="center" justifyContent="center">
+        {/* <Stack direction={'row'} spacing={2} alignItems="center" justifyContent="center">
           {slots.map((slot) => (
             <DoctorSlot key={slot.id} slot={slot} />
           ))}
-        </Stack>
+        </Stack> */}
       </Stack>
     </Card>
   );

client/src/sections/doctors/view/doctors-view.jsx

@@ -10,17 +10,15 @@ export default function DoctorsView() {
       <Typography variant="h4" sx={{ mb: 1 }}>
         Doctors
       </Typography>
-
       <Stack direction="row" alignItems="center" flexWrap="wrap-reverse" justifyContent="flex-end" sx={{ mb: 5 }}>
         <Stack direction="row" spacing={1} flexShrink={0} sx={{ my: 1 }}>
           Search
         </Stack>
       </Stack>
-
       <DoctorCard />
-      {/* <Grid container spacing={3}>
-        {products.map((product) => (
-          <Grid key={product.id} xs={12} sm={6} md={3}> */}
+      {/* <Grid container spacing={3}> */}
+      {/* {products.map((product) => ( */}
+      {/* <Grid key={product.id} xs={12} sm={6} md={3}> */}
       {/* <ProductCard product={product} /> */}
       {/* </Grid> */}
       {/* ))} */}