corrected api urls for fetching event details

Author: shriram1803

package-lock.json

@@ -10,6 +10,7 @@
     "@testing-library/user-event": "^12.1.10",
     "axios": "^0.21.0",
     "cors": "^2.8.5",
+    "dotenv": "^16.0.3",
     "hammerjs": "^2.0.8",
     "react": "^17.0.1",
     "react-bootstrap": "^1.4.0",

package.json

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import {
   Container,
   Form,
@@ -45,8 +45,8 @@ function Header({ setSearch }) {
           <Nav>
             {userInfo ? (
               <>
-                <Nav.Link href="/register">Add Member</Nav.Link>
-                <Nav.Link href="/remove">Remove Member</Nav.Link>
+                {userInfo.isAdmin && <Nav.Link href="/register">Add Member</Nav.Link>}
+                {userInfo.isAdmin && <Nav.Link href="/remove">Remove Member</Nav.Link>}
                 <Nav.Link href="/myevents">Home</Nav.Link>
                 <NavDropdown
                   title={`${userInfo.name}`}

src/components/Header.js

@@ -12,10 +12,7 @@ function RegisterScreen({ history }) {
 
   let currentUserName = null;
   const userLogin = useSelector((state) => state.userLogin);
-  if(userLogin.userInfo) {
-    currentUserName = userLogin.userInfo.name;
-  } 
-
+  
   const [email, setEmail] = useState("");
   const [name, setName] = useState("");
   const [position, setPosition] = useState("");
@@ -71,7 +68,7 @@ function RegisterScreen({ history }) {
 
   const submitHandler = (e) => {
     e.preventDefault();
-    if(currentUserName && currentUserName === "admin")
+    if(userInfo && userInfo.isAdmin)
       dispatch(register(name, email, password, position, department, pic, year, linkedin));
     else
       console.log("User is not admin");

src/screens/RegisterScreen/RegisterScreen.js

@@ -72,18 +72,19 @@ function SingleEvent({ match, history }) {
 
   useEffect(() => {
     const fetching = async () => {
-      const { data } = await axios.get(`/api/events/${match.params.id}`);
-
+      const { data } = await axios.get(`https://foss-backend.onrender.com/api/events/${match.params.id}`);
+      
       setTitle(data.title);
       setContent(data.content);
       setCategory(data.category);
       setDate(data.updatedAt);
-      setEventDate(new Date());
+      setEventDate(new Date(data.eventDate.slice(0, 10)));
       setTime(data.time);
       setVenue(data.venue);
       setLink(data.link);
       setMaterials(data.materials);
       setSpeaker(data.speaker);
+      setPic(data.pic);
     };
 
     fetching();

src/screens/SingleNote/SingleEvent.js

@@ -4411,6 +4411,11 @@
   "resolved" "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz"
   "version" "4.2.0"
 
+"dotenv@^16.0.3":
+  "integrity" "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="
+  "resolved" "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"
+  "version" "16.0.3"
+
 "[email protected]":
   "integrity" "sha512-FlWbnhgjtwD+uNLUGHbMykMOYQaTivdHEmYwAKFjn6GKe/CqY0fNae93ZHTd20snh9ZLr8mTzIL9m0APQ1pjQg=="
   "resolved" "https://registry.npmjs.org/dotenv/-/dotenv-6.0.0.tgz"