db updated

Avinash905 · Apr 27, 2023 · c540f24 · c540f24
1 parent f26d810
commit c540f24
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 34 deletions.
diff --git a/client/build/asset-manifest.json b/client/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.0ad436e8.css",
-    "main.js": "/static/js/main.83ef42fb.js",
+    "main.js": "/static/js/main.bd9eb2f7.js",
     "static/media/heroimg.jpg": "/static/media/heroimg.8bbd2437f7c9d842026c.jpg",
     "static/media/aboutimg.jpg": "/static/media/aboutimg.af2db4b9f307d04f8745.jpg",
     "index.html": "/index.html",
     "main.0ad436e8.css.map": "/static/css/main.0ad436e8.css.map",
-    "main.83ef42fb.js.map": "/static/js/main.83ef42fb.js.map"
+    "main.bd9eb2f7.js.map": "/static/js/main.bd9eb2f7.js.map"
   },
   "entrypoints": [
     "static/css/main.0ad436e8.css",
-    "static/js/main.83ef42fb.js"
+    "static/js/main.bd9eb2f7.js"
   ]
 }
diff --git a/client/build/index.html b/client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HealthBooker</title><script defer="defer" src="/static/js/main.83ef42fb.js"></script><link href="/static/css/main.0ad436e8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HealthBooker</title><script defer="defer" src="/static/js/main.bd9eb2f7.js"></script><link href="/static/css/main.0ad436e8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/client/build/static/js/main.83ef42fb.js.map b/client/build/static/js/main.83ef42fb.js.map
diff --git a/client/build/static/js/main.83ef42fb.js → client/build/static/js/main.bd9eb2f7.js b/client/build/static/js/main.83ef42fb.js → client/build/static/js/main.bd9eb2f7.js
diff --git a/...ld/static/js/main.83ef42fb.js.LICENSE.txt → ...ld/static/js/main.bd9eb2f7.js.LICENSE.txt b/...ld/static/js/main.83ef42fb.js.LICENSE.txt → ...ld/static/js/main.bd9eb2f7.js.LICENSE.txt
diff --git a/client/build/static/js/main.bd9eb2f7.js.map b/client/build/static/js/main.bd9eb2f7.js.map
diff --git a/client/src/components/AdminDoctors.jsx b/client/src/components/AdminDoctors.jsx
@@ -55,7 +55,6 @@ const AdminDoctors = () => {
     getAllDoctors();
   }, []);
 
-  console.log(doctors);
   return (
     <>
       {loading ? (

diff --git a/client/src/components/Users.jsx b/client/src/components/Users.jsx
@@ -20,6 +20,7 @@ const Users = () => {
       dispatch(setLoading(true));
       const temp = await fetchData(`/user/getallusers`);
       setUsers(temp);
+      console.log("🚀 ~ file: Users.jsx:23 ~ getAllUsers ~ temp:", temp);
       dispatch(setLoading(false));
     } catch (error) {}
   };

diff --git a/client/src/middleware/route.js b/client/src/middleware/route.js
@@ -29,14 +29,9 @@ export const Public = ({ children }) => {
 };
 
 export const Admin = ({ children }) => {
-  const { userId } = jwtDecode(localStorage.getItem("token"));
+  const user = jwtDecode(localStorage.getItem("token"));
 
-  const getUser = async (e) => {
-    const temp = await fetchData(`/user/getuser/${userId}`);
-    return temp.isAdmin;
-  };
-
-  if (getUser()) {
+  if (user.isAdmin) {
     return children;
   }
   return (

diff --git a/db/conn.js b/db/conn.js
@@ -1,12 +1,19 @@
+const { MongoClient } = require("mongodb");
 const mongoose = require("mongoose");
-require("dotenv").config();
 mongoose.set("strictQuery", false);
+require("dotenv").config();
 
-const mongodbconn = mongoose
-  .connect(process.env.MONGO_URI)
-  .then(() => {})
+const client = mongoose
+  .connect(process.env.MONGO_URI, {
+    useNewUrlParser: true,
+  })
+  .then(() => {
+    console.log("DB connected");
+  })
   .catch((error) => {
+    console.log("Error: ", error);
+
     return error;
   });
 
-module.exports = mongodbconn;
+module.exports = client;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.0",
+    "mongodb": "^5.3.0",
     "mongoose": "^6.9.0"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HealthBooker</title><script defer="defer" src="/static/js/main.83ef42fb.js"></script><link href="/static/css/main.0ad436e8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>HealthBooker</title><script defer="defer" src="/static/js/main.bd9eb2f7.js"></script><link href="/static/css/main.0ad436e8.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>