Final Changes

dkumar-22 · May 18, 2022 · 5c748a1 · 5c748a1
1 parent b6822fb
commit 5c748a1
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Vaxtrail Web App
 
+### Deployed Link: https://superlative-marigold-19de0c.netlify.app/
+
 ## Introduction
 
 Vaxtrail is an online vaccine booking or distribution system, helping users to tackle the current pandemic. It’s a completely online system which would promote digitization and even promote social distancing as slots for vaccination would be available at the nearest hospital <b>(within 2 kilometres of radius)</b> everyday thus reducing/ minimizing the risk of overcrowding.  

diff --git a/backend/routes/hospitals.js b/backend/routes/hospitals.js
@@ -1,5 +1,6 @@
 const router = require("express").Router();
 let Location = require("../models/hospital.model");
+const axios = require("axios");
 
 Location = Location.Location;
 
@@ -65,6 +66,21 @@ router.route("/govt").get((req, res) => {
   });
 });
 
+router.route("/news").all((req, res) => {
+  axios
+    .get(
+      "https://newsapi.org/v2/everything?apiKey=f6f396807a8248ed98cec28d06fe6bd7&q=coronavirus&language=en&pageSize=20"
+    )
+    .then(function (response) {
+      // handle success
+      res.send(response.data);
+    })
+    .catch(function (error) {
+      // handle error
+      console.log(error);
+    });
+});
+
 router.route("/pvt").get((req, res) => {
   Location.find({ type: "pvt" }).then((data) => {
     res.send(data);

diff --git a/src/News.js b/src/News.js
@@ -6,12 +6,25 @@ function News() {
   const [news, setNews] = useState([]);
   useEffect(() => {
     async function getNews() {
+      // await axios
+      //   .get(
+      //     "https://newsapi.org/v2/everything?apiKey=f6f396807a8248ed98cec28d06fe6bd7&q=coronavirus&language=en&pageSize=20"
+      //   )
+      //   .then(function (response) {
+      //     // handle success
+      //     setNews(response.data.articles);
+      //   })
+      //   .catch(function (error) {
+      //     // handle error
+      //     console.log(error);
+      //   });
       await axios
         .get(
-          "https://newsapi.org/v2/everything?apiKey=f6f396807a8248ed98cec28d06fe6bd7&q=coronavirus&language=en&pageSize=20"
+          "http://localhost:5000/hospitals/news"
         )
         .then(function (response) {
           // handle success
+          console.log(response);
           setNews(response.data.articles);
         })
         .catch(function (error) {
@@ -21,7 +34,6 @@ function News() {
     }
     getNews();
   }, []);
-  // console.log(news);
   return (
     <div className="news-clm">
       <h1 className="stats-heading">LATEST COVID-19 NEWS</h1>

diff --git a/src/Topbar.js b/src/Topbar.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { Link } from "react-router-dom";
 import { useDataLayerValue } from "./DataLayer";
-import Cookies from 'js-cookie';
+import Cookies from "js-cookie";
 const linkstyle = {
   textDecoration: "none",
 };
@@ -15,8 +15,8 @@ function Topbar() {
         type: "SET_LOGGED",
         logged: false,
       });
-      Cookies.remove('loggedcookie');
-      Cookies.remove('name');
+      Cookies.remove("loggedcookie");
+      Cookies.remove("name");
     } else console.log("Can't Logout");
   }
   return (
@@ -42,29 +42,41 @@ function Topbar() {
             <p className="tab-options">REGISTRATIONS</p>
           </Link>
         )}
-       {!logged && <Link to="/status" style={linkstyle}>
-          <p className="tab-options">STATUS</p>
-        </Link>}
+        {!logged && (
+          <Link to="/status" style={linkstyle}>
+            <p className="tab-options">STATUS</p>
+          </Link>
+        )}
 
-        {!logged && <Link to="/hospitals" style={linkstyle}>
-          <p className="tab-options">HOSPITALS</p>
-        </Link>}
+        {!logged && (
+          <Link to="/hospitals" style={linkstyle}>
+            <p className="tab-options">HOSPITALS</p>
+          </Link>
+        )}
         <Link to="/vaccines" style={linkstyle}>
           <p className="tab-options">VACCINES</p>
         </Link>
+        {!logged && (
+          <>
+            <Link to="/login" style={linkstyle}>
+              <p className="tab-options">LOGIN</p>
+            </Link>
+            <Link to="/admin/register" style={linkstyle}>
+              <p className="tab-options">REGISTER</p>
+            </Link>
+          </>
+        )}
         {logged && <p className="tab-options">||</p>}
         {/* {logged ? (
           <Link to="/" style={linkstyle} onClick={handleLogout}>
               <p className="tab-options">{username.toUpperCase()}</p>
           </Link>
         ) : (
-          <Link to="/login" style={linkstyle}>
-            <p className="tab-options">LOGIN</p>
-          </Link>
+          
         )} */}
         {logged && (
           <Link to="/" style={linkstyle} onClick={handleLogout}>
-              <p className="tab-options">{username.toUpperCase()}</p>
+            <p className="tab-options">{username.toUpperCase()}</p>
           </Link>
         )}
       </div>