Merge pull request #39 from advanced-computer-lab-2023/task-10,16,17,…

…51_FrontAndBack Task 10,16,17,51 front and back
advanced-computer-lab-2023 · Nov 14, 2023 · c339c60 · c339c60
2 parents 4963b0d + 30dd3fc
commit c339c60
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/client/src/layouts/dashboard/common/account-popover.jsx b/client/src/layouts/dashboard/common/account-popover.jsx
@@ -135,4 +135,4 @@ export default function AccountPopover() {
       </Popover>
     </>
   );
-}
+}
diff --git a/client/src/routes/sections.jsx b/client/src/routes/sections.jsx
@@ -44,7 +44,7 @@ export default function Router() {
         { path: 'products', element: <ProductsPage /> },
         { path: 'blog', element: <BlogPage /> },
         { path: 'doctors', element: <DoctorsPage /> },
-        { path: 'reset-password', element: <ResetPage /> },
+			
         { path: '/upload-document', element: <DoctorDocumentUploadPage /> },
         { path: '/medical-history', element: <MedicalHistoryPage /> },
         { path: 'requests-list', element: <RequestsListPage /> },

diff --git a/client/vite.config.js b/client/vite.config.js
@@ -3,7 +3,6 @@ import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import checker from 'vite-plugin-checker';
 import dns from 'dns';
-import dns from 'dns';
 
 // ----------------------------------------------------------------------
 

diff --git a/server/src/routes/me.route.ts b/server/src/routes/me.route.ts
@@ -15,7 +15,11 @@ import {
   viewWallet,
   getHealthPackage,
   cancelSubscribtion,
-  subscribe
+  subscribe,
+  scheduleFollowUp,
+  addSlots,
+  viewContract,
+  acceptContract
 } from '../services';
 
 const router = express.Router();
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,4 +135,4 @@ export default function AccountPopover() { @@
           </Popover>
         </>
       );
-    }
+    }