health packages is done

client/src/layouts/dashboard/config-navigation.jsx

@@ -20,6 +20,11 @@ const navConfig = [
     path: '/packages',
     icon: icon('ic_cart')
   },
+  {
+    title: 'My package',
+    path: '/viewPackage',
+    icon: icon('ic_cart')
+  },
   {
     title: 'blog',
     path: '/blog',

client/src/pages/viewPackage.jsx

@@ -0,0 +1,17 @@
+import { Helmet } from 'react-helmet-async';
+
+import { MyPackageView } from 'src/sections/myPackage';
+
+// ----------------------------------------------------------------------
+
+export default function ViewPackagePage() {
+  return (
+    <>
+      <Helmet>
+        <title> User </title>
+      </Helmet>
+
+      <MyPackageView />
+    </>
+  );
+}

client/src/routes/sections.jsx

@@ -19,7 +19,7 @@ export const ForgotPage = lazy(() => import('src/pages/forgot-password'));
 export const ResetPage = lazy(() => import('src/pages/reset-password'));
 export const PackagePage = lazy(() => import('src/pages/packages'));
 export const AddFamilyPage = lazy(() => import('src/pages/addFamily'));
-
+export const ViewPackagePage = lazy(() => import('src/pages/viewPackage'));
 export const DoctorDocumentUploadPage = lazy(() => import('src/pages/doctor-document-upload'));
 export const RequestsListPage = lazy(() => import('src/pages/requests-list'));
 export const MedicalHistoryPage = lazy(() => import('src/pages/medical-history'));
@@ -51,7 +51,8 @@ export default function Router() {
         { path: 'health-record', element: <HealthRecordPage /> },
         { path: 'doctors', element: <DoctorsPage /> },
         { path: 'packages', element: <PackagePage /> },
-        { path: 'addFamily', element: <AddFamilyPage /> }
+        { path: 'addFamily', element: <AddFamilyPage /> },
+        { path: 'viewPackage', element: <ViewPackagePage /> }
       ]
     },
     {

client/src/sections/myPackage/index.js

@@ -0,0 +1 @@
+export {default as MyPackageView} from './my-package-view'

client/src/sections/myPackage/my-package-view.jsx

@@ -0,0 +1,79 @@
+import React, { useState, useEffect } from 'react';
+import { Helmet } from 'react-helmet-async';
+import { axiosInstance } from 'src/utils/axiosInstance';
+import Stack from '@mui/material/Stack';
+import Typography from '@mui/material/Typography';
+import Container from '@mui/material/Container';
+import Grid from '@mui/material/Grid';
+import { styled } from '@mui/material/styles';
+import Divider from '@mui/material/Divider';
+import LoadingButton from '@mui/lab/LoadingButton';
+import { useQuery, useMutation } from 'react-query';
+import { useNavigate } from 'react-router-dom';
+
+export default function MyPackageView() {
+  const navigate = useNavigate();
+  const [userPackage, setUserPackage] = useState({});
+
+  const { isLoading: isLoadingPackage } = useQuery(
+    'myPackages',
+    () =>
+      axiosInstance.get('/me/package').then((res) => {
+        console.log(res.data);
+        setUserPackage(res.data.userPackage);
+      }),
+    {
+      refetchOnMount: false,
+      refetchOnWindowFocus: false
+    }
+  );
+
+  const { isLoading, mutate: unsubscribe } = useMutation(() => axiosInstance.post('me/package', { cancel: true }), {
+    onSuccess: () => {
+      navigate('/packages');
+    }
+  });
+
+  if (isLoadingPackage) return 'Loading...';
+  console.log(userPackage);
+
+  const StyledPackageContainer = styled(Grid)(({ theme }) => ({
+    backgroundColor: theme.palette.background.paper,
+    padding: theme.spacing(2),
+    textAlign: 'center',
+    color: theme.palette.text.secondary
+  }));
+
+  return (
+    <Container>
+      <Typography variant="h4" sx={{ mb: 3 }}>
+        Packages
+      </Typography>
+
+      <Grid container spacing={3} direction="row" justifyContent="center" alignItems="center" sx={{ mb: 3, mt: 5 }}>
+        <StyledPackageContainer key={userPackage._id} spacing={5}>
+          <Typography variant="h6" sx={{ mt: -2, mb: 3, textAlign: 'center' }}>
+            {userPackage.name}
+          </Typography>
+          <Typography sx={{ mb: 2 }}>Price: {userPackage.price}</Typography>
+          <Typography sx={{ mb: 2 }}>Session Discount: {userPackage.sessionDiscount}</Typography>
+          <Typography sx={{ mb: 2 }}>Medicine Discount: {userPackage.medicineDiscount}</Typography>
+          <Typography sx={{ mb: 2 }}>Family Discount: {userPackage.familyDiscount}</Typography>
+
+          <LoadingButton
+            onClick={unsubscribe}
+            loading={isLoading}
+            loadingIndicator="Loading…"
+            fullWidth
+            size="large"
+            type="submit"
+            variant="contained"
+            color="inherit"
+          >
+            Cancel
+          </LoadingButton>
+        </StyledPackageContainer>
+      </Grid>
+    </Container>
+  );
+}

client/src/sections/packages/view/package-view.jsx

@@ -1,6 +1,6 @@
-import { useMutation, useQuery } from "react-query";
-import { useState } from "react";
-import { axiosInstance } from "src/utils/axiosInstance";
+import { useMutation, useQuery } from 'react-query';
+import { useState } from 'react';
+import { axiosInstance } from 'src/utils/axiosInstance';
 import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
@@ -9,69 +9,67 @@ import { styled } from '@mui/material/styles';
 import Divider from '@mui/material/Divider';
 import LoadingButton from '@mui/lab/LoadingButton';
 
+import { useRouter } from 'src/routes/hooks';
+
 const StyledPackageContainer = styled(Grid)(({ theme }) => ({
   backgroundColor: theme.palette.mode === 'dark' ? theme.palette.grey[700] : theme.palette.grey[200],
   padding: theme.spacing(6),
   marginBottom: theme.spacing(6),
-  borderRadius: theme.shape.borderRadius,
+  borderRadius: theme.shape.borderRadius
 }));
 
-const PackageView = () => {
-
-  const { isLoading, error, data: userPackages } = useQuery('packages', () =>
-    axiosInstance.get('/packages').then((res) => res.data.result), {
-    refetchOnMount: false,
-    refetchOnWindowFocus: false,
-  });
-
-  const [subscribeMessage, setSubscribeMessage] = useState('');
-
+export default function PackageView() {
+  const router = useRouter();
 
-  const subscribe = async(packageID) => {
-    const res = await axiosInstance.post('/me/package',{packageID:packageID});
-    if(res.data.message === 'Unauthorized')
-      setSubscribeMessage('Please login first');
-    else
-    {
-      setSubscribeMessage(res.data.message);
-    }
-  }
-
-  const useSubscribe = () =>
-  {
-    return useMutation(subscribe);
-  }
-
-  const{mutate,isLoading:isLoadingSubscribe} = useSubscribe();
+  const {
+    isLoading: isLoadingPackages,
+    error,
+    data: userPackages
+  } = useQuery('packages', () => axiosInstance.get('/packages').then((res) => res.data.result), {
+    refetchOnWindowFocus: false
+  });
 
-  const handleClick = (packageID) => {
-    return mutate(packageID);
-  }
+  const { isLoading, mutate: subscribe } = useMutation((selectedPackage) => {
+    axiosInstance.post('/me/package', { packageID: selectedPackage._id }).then((res) => router.push('/viewPackage'));
 
-  if (isLoading) return 'Loading...';
+    axiosInstance
+      .post(`/payment/session/oneTimePayment`, {
+        products: [{ name: selectedPackage.name, price: selectedPackage.price, quantity: 1 }]
+      })
+      .then((res) => {
+        window.location.replace(res.data.url);
+      })
+      .catch((err) => console.log(err));
+  });
 
+  if (isLoadingPackages) return 'Loading...';
   if (error) return 'An error has occurred' + error.message;
 
-
-
   return (
     <Container>
       <Typography variant="h4" sx={{ mb: 3 }}>
         Packages
       </Typography>
-      {subscribeMessage && (<Typography variant="body1" sx={{ mt: 2 }}>{subscribeMessage}</Typography>)}
-      {!userPackages &&  (<Typography variant="body1" sx={{ mt: 2 }}>There are currently no packages</Typography>)}
-      <Grid container spacing={3} direction="row" justifyContent="center" alignItems="center" sx={{ mb: 3, mt:5 }}>
+
+      {!userPackages && (
+        <Typography variant="body1" sx={{ mt: 2 }}>
+          There are currently no packages
+        </Typography>
+      )}
+      <Grid container spacing={3} direction="row" justifyContent="center" alignItems="center" sx={{ mb: 3, mt: 5 }}>
         {userPackages.map((userPackage) => (
           <StyledPackageContainer key={userPackage._id} spacing={5}>
-            <Typography variant='h6' sx={{ mt: -2, mb: 3 , textAlign: 'center' }}>{userPackage.name}</Typography>
+            <Typography variant="h6" sx={{ mt: -2, mb: 3, textAlign: 'center' }}>
+              {userPackage.name}
+            </Typography>
             <Typography sx={{ mb: 2 }}>Price: {userPackage.price}</Typography>
             <Typography sx={{ mb: 2 }}>Session Discount: {userPackage.sessionDiscount}</Typography>
             <Typography sx={{ mb: 2 }}>Medicine Discount: {userPackage.medicineDiscount}</Typography>
             <Typography sx={{ mb: 2 }}>Family Discount: {userPackage.familyDiscount}</Typography>
+
             <LoadingButton
-              onClick={() => handleClick(userPackage._id)}
-              loading={isLoadingSubscribe}
+              onClick={() => subscribe(userPackage)}
+              loading={isLoading}
               loadingIndicator="Loading…"
               fullWidth
               size="large"
@@ -86,6 +84,4 @@ const PackageView = () => {
       </Grid>
     </Container>
   );
-};
-
-export default PackageView;
+}

server/src/services/doctor.service.ts

@@ -1,7 +1,6 @@
 const { v4: uuidv4 } = require('uuid');
 import { HttpError } from '../utils';
 
-
 import StatusCodes from 'http-status-codes';
 import { User, Contract, Appointment, IPatient, IDoctor, Doctor, Request, Patient } from '../models';
 
@@ -149,5 +148,4 @@ const viewAvailableAppointments = async (doctorID: string) => {
   };
 };
 
-export { getDoctors, getMyPatients, viewAvailableAppointments, };
-
+export { getDoctors, getMyPatients, viewAvailableAppointments };

server/src/services/user.service.ts

@@ -9,6 +9,7 @@ const updateInfo = async (id: string, info: any) => {
 
   const updatedUser = await User.findByIdAndUpdate(id, info, { new: true });
   if (!updatedUser) throw new HttpError(StatusCodes.NOT_FOUND, 'the user does not exist');
+
   return {
     status: StatusCodes.OK,
     messsage: 'the user updated successfully',