diff --git a/frontend/src/Components/Dailyprob.js b/frontend/src/Components/Dailyprob.js
index cc9e62e..1142a69 100644
--- a/frontend/src/Components/Dailyprob.js
+++ b/frontend/src/Components/Dailyprob.js
@@ -58,7 +58,8 @@ function Dailyprob() {
}
})}
-
+
+
);
}
diff --git a/frontend/src/Components/Navbar.js b/frontend/src/Components/Navbar.js
index 87aec11..8bda53f 100644
--- a/frontend/src/Components/Navbar.js
+++ b/frontend/src/Components/Navbar.js
@@ -39,19 +39,21 @@ function Navbar() {
Home (current)
{token ? (
-
- Contests (current)
-
+ <>
+
+ Contests (current)
+
+
+ Schedule (current)
+
+ >
) : (
<>>
)
}
Our Teams(current)
-
-
- Schedule (current)
-
+
{ width < "992" && !token ? (
<>
@@ -66,7 +68,7 @@ function Navbar() {
)
}
{ width < "992" && token ? (
- <>
+ <>
Your Profile (current)
@@ -94,7 +96,7 @@ function Navbar() {
)
}
{ width >= "992" && token ? (
- <>
+ <>
diff --git a/frontend/src/Components/Style.css b/frontend/src/Components/Style.css
index b112902..a03e89b 100644
--- a/frontend/src/Components/Style.css
+++ b/frontend/src/Components/Style.css
@@ -647,7 +647,7 @@ table{
@media(max-width:768px){
.pointsHead{
font-size: 23px;
- }
+ }
.details{
font-size: 20px;
}
diff --git a/frontend/src/Components/Style2.css b/frontend/src/Components/Style2.css
index 8f7b628..ac32bca 100644
--- a/frontend/src/Components/Style2.css
+++ b/frontend/src/Components/Style2.css
@@ -21,7 +21,7 @@
padding-bottom: 13%;
}
.loginend{
- height:42px;
+ height:250px;
background-color: #182b5c;
}
.navi{
diff --git a/frontend/src/Components/Timeline.js b/frontend/src/Components/Timeline.js
index 338afb6..8f5d9b5 100644
--- a/frontend/src/Components/Timeline.js
+++ b/frontend/src/Components/Timeline.js
@@ -2,20 +2,35 @@ import React from 'react'
import {Link} from 'react-router-dom'
import axios from 'axios'
-function Schedule() {
+function useWindowSize() {
+ const [size, setSize] = React.useState([window.innerHeight, window.innerWidth]);
+ React.useEffect(() =>{
+ const handleResize = () => {
+ setSize([window.innerHeight, window.innerWidth]);
+ }
+ window.addEventListener("resize", handleResize);
+ },[])
+ return size;
+}
+
+function Schedule() {
+ const [height,width] = useWindowSize();
const [state, setState] = React.useState(false);
+ const [loading, setLoading] = React.useState(false);
React.useEffect(() => {
(async () => {
const res1 = await axios.get("https://p-club-iiti-cp.herokuapp.com/profile", {
headers: { token: localStorage.getItem("token") },
});
- setState(res1.data)
+ setState(res1.data);
+ setLoading(true);
})();
},[]);
return (
+ {loading ? (
Schedule Of The Course
@@ -30,15 +45,15 @@ function Schedule() {
- Topic - C++ Basics I
- Tutor - Jaskaran Singh
- - Venue - Maitreya Hall
- - Time - 4:30pm
+ - Venue - Gargi Seminar Hall
+ - Time - 10:15-11:45am
) : (
- Topic - Binary Search + Interactive Problems
- Tutor - Nishkarsh Luthra
- - Venue - Maitreya Hall
- - Time - 4:30pm
+ - Venue - POD 1-D 105
+ - Time - 10:15-11:45am
)}
@@ -51,6 +66,11 @@ function Schedule() {
+ ): (
+
+
Loading...
+
+ )}
)
}
diff --git a/frontend/src/Components/Yourprofile.js b/frontend/src/Components/Yourprofile.js
index 33984bc..cd0fc1d 100644
--- a/frontend/src/Components/Yourprofile.js
+++ b/frontend/src/Components/Yourprofile.js
@@ -326,12 +326,13 @@ function Yourprofile() {
const date = new Date(note.date);
return (
-
{note.name}
-
+
{moment(date).format("DD-MM-YYYY")}
);