From 3b1dbe36e5071a692910b31544e7cddd56e4f59a Mon Sep 17 00:00:00 2001 From: Abhinandan Date: Tue, 23 Apr 2024 01:40:05 +0530 Subject: [PATCH 01/22] closed registration --- src/Components/LandingPage/landingPage.jsx | 21 ++++++++++----------- src/Components/Navbar/navbar.jsx | 11 ++++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Components/LandingPage/landingPage.jsx b/src/Components/LandingPage/landingPage.jsx index 1188e9c..5c2b141 100644 --- a/src/Components/LandingPage/landingPage.jsx +++ b/src/Components/LandingPage/landingPage.jsx @@ -203,18 +203,17 @@ function LandingPage() { useEffect(() => { if (!processBool) { - // dispatch(RegOpenThunk()) - // .then((res) => { - // console.log(res); - // if (res?.payload?.status === 400) { + dispatch(RegOpenThunk()) + .then((res) => { + console.log(res); + if (res?.payload?.status === 400) { dispatch(setProcess()); if (!processBool) { setProces(true); } } - } - // }) - // }} + }) + }} , []); const [timer, setTimer] = useState(10); @@ -603,16 +602,16 @@ function LandingPage() { > handleProcess()} />
- - {/* */} + - Registrations will start soon. - */} + Registrations are closed now. + {/* diff --git a/src/Components/Navbar/navbar.jsx b/src/Components/Navbar/navbar.jsx index 45aa847..7b40aec 100644 --- a/src/Components/Navbar/navbar.jsx +++ b/src/Components/Navbar/navbar.jsx @@ -268,11 +268,12 @@ function Navbar(props) { if (res.payload.status === 200) { setDialogg(true); setLogin(true); - dispatch(dialog6()); } if (res.payload.status === 400) { setDialogg(true); - setProcessStop(true); + setLogin(true); + dispatch(dialog6()); + } if (res.payload.status === 429) { toast.error( @@ -852,21 +853,21 @@ function Navbar(props) { paddingBottom: "8px", }} > - Registrations will start soon. + Registrations have closed soon. {/* Click here to view the results of S */} - + */}
From 40375c79ba880556a2c7386fe2f9b0375e39d3f2 Mon Sep 17 00:00:00 2001 From: Abhinandan Date: Tue, 23 Apr 2024 01:46:09 +0530 Subject: [PATCH 02/22] fixed bugs --- src/Components/Navbar/navbar.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/Navbar/navbar.jsx b/src/Components/Navbar/navbar.jsx index 7b40aec..bbfcc28 100644 --- a/src/Components/Navbar/navbar.jsx +++ b/src/Components/Navbar/navbar.jsx @@ -271,6 +271,7 @@ function Navbar(props) { } if (res.payload.status === 400) { setDialogg(true); + setProcessStop(false); setLogin(true); dispatch(dialog6()); From 371ddcf315d8c649031ac6f0f0013e68ea8e10ae Mon Sep 17 00:00:00 2001 From: Abhinandan Date: Tue, 23 Apr 2024 17:36:39 +0530 Subject: [PATCH 03/22] updated changes in landing page --- src/Components/LandingPage/landingPage.css | 1 + src/Components/LandingPage/landingPage.jsx | 176 +++++++++++++++++++-- src/Components/Navbar/navbar.jsx | 12 +- 3 files changed, 174 insertions(+), 15 deletions(-) diff --git a/src/Components/LandingPage/landingPage.css b/src/Components/LandingPage/landingPage.css index 142970d..c7e4b77 100644 --- a/src/Components/LandingPage/landingPage.css +++ b/src/Components/LandingPage/landingPage.css @@ -130,6 +130,7 @@ body { color: #252525; margin-right: 1.5vw; cursor: pointer; + display: none; } /* ABOUT US */ diff --git a/src/Components/LandingPage/landingPage.jsx b/src/Components/LandingPage/landingPage.jsx index 5c2b141..85616fa 100644 --- a/src/Components/LandingPage/landingPage.jsx +++ b/src/Components/LandingPage/landingPage.jsx @@ -16,6 +16,7 @@ import { Typography, } from "@mui/material"; import { dialog0, dialog16, dialog17, dialog18, dialog19, dialog20 } from "../../Redux/step"; +import {dialog6, dialog7, dialog8, dialog9, dialog10, dialog11, dialog12, dialog13, dialog14} from "../../Redux/step"; import Register from "../Register/Register"; import Member from "../Register/member"; import Team from "../Register/team"; @@ -49,6 +50,16 @@ import imgs3 from "../Assets/image-3.png" import imgs4 from "../Assets/image-4.jpg" import imgs5 from "../Assets/image-5.jpg" import imgs6 from "../Assets/image-6.jpg" +import Login1 from "../Login/login1"; +import Login from "../Login/CA/login"; +import LoginTeam from "../Login/TEAM/loginTeam"; +import OtpTeam from "../Login/TEAM/otpTeam"; +import Otp from "../Login/CA/otp"; +import Forgot from "../Login/CA/fgtPwd"; +import ForgotTeam from "../Login/TEAM/fgtTeam"; +import Reset from "../Login/CA/reset"; +import ResetTeam from "../Login/TEAM/resetTeam"; + const style = { position: 'absolute', @@ -79,7 +90,7 @@ function LandingPage() { const handleOpen = () => setOpen(true); const handleClose = () => setOpen(false); - +const [stop,handleStop]=useState(false); const settings = { speed: 500, @@ -114,6 +125,71 @@ function LandingPage() { window.scroll(0, 0); }, []); + useEffect(() => { + if (step.step === 0) { + setStepDialog({ + one: false, + two: false, + three: false, + four: false, + five: false, + six: false, + seven: false, + eight: false, + nine: false, + ten: false, + eleven: false, + twelve: false, + thirteen: false, + fourteen: false, + logout: false, + }); + } + if (step.step === 1 && dialogg) { + setStepDialog({ one: true }); + } + if (step.step === 2 && dialogg) { + setStepDialog({ two: true }); + } + if (step.step === 3 && dialogg) { + setStepDialog({ three: true }); + } + if (step.step === 4 && dialogg) { + setStepDialog({ four: true }); + } + if (step.step === 5 && dialogg) { + setStepDialog({ five: true }); + } + if (step.step === 6) { + setStepDialog({ six: true }); + } + if (step.step === 7) { + setStepDialog({ seven: true }); + } + if (step.step === 8) { + setStepDialog({ eight: true }); + } + if (step.step === 9) { + setStepDialog({ nine: true }); + } + if (step.step === 10 ) { + setStepDialog({ ten: true }); + } + if (step.step === 11 ) { + setStepDialog({ eleven: true }); + } + if (step.step === 12 ) { + setStepDialog({ twelve: true }); + } + if (step.step === 13 ) { + setStepDialog({ thirteen: true }); + } + if (step.step === 14 ) { + setStepDialog({ fourteen: true }); + } + + }, [step, dialogg]); + useEffect(() => { if (step.step == 0) { setStepDialog({ @@ -154,7 +230,7 @@ function LandingPage() { } if (title === "") { document.getElementById("toDash").style.display = "none"; - document.getElementById("toReg").style.display = "inline"; + document.getElementById("toReg").style.display = "none"; } }, [title]); @@ -201,6 +277,8 @@ function LandingPage() { setProces(false); } + + useEffect(() => { if (!processBool) { dispatch(RegOpenThunk()) @@ -514,7 +592,7 @@ function LandingPage() { }, }} > - + */} + {!stop&& + <> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +}
- handleProcess()} /> + { + handleStop(true) + handleProcess() }}/>
{/* */} Click here to view the results of S */} - {/* */} + Login +
diff --git a/src/Components/Navbar/navbar.jsx b/src/Components/Navbar/navbar.jsx index bbfcc28..0fa6159 100644 --- a/src/Components/Navbar/navbar.jsx +++ b/src/Components/Navbar/navbar.jsx @@ -854,21 +854,21 @@ function Navbar(props) { paddingBottom: "8px", }} > - Registrations have closed soon. + Registrations have concluded.
+ We appreciate your interest. {/* Click here to view the results of S */} - {/* */} + Login + From bc2c1f8110bab7527b5a880161fcac70c6d84a59 Mon Sep 17 00:00:00 2001 From: Abhinandan Date: Fri, 26 Apr 2024 14:39:28 +0530 Subject: [PATCH 04/22] updated the updates --- src/Components/updates/update.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Components/updates/update.jsx b/src/Components/updates/update.jsx index 73605c3..fb6c442 100644 --- a/src/Components/updates/update.jsx +++ b/src/Components/updates/update.jsx @@ -14,8 +14,9 @@ function Update() {

Updates

+ - + {/* */} {/*
diff --git a/src/Components/results/Result.jsx b/src/Components/results/Result.jsx index 152370b..32ef021 100644 --- a/src/Components/results/Result.jsx +++ b/src/Components/results/Result.jsx @@ -58,92 +58,74 @@ function Result() { }, [reducer]); const [timer, setTimer] = useState(10); - // useEffect(() => { - // if (reducer.loading) { - // const time = - // timer > 0 && - // setInterval(() => { - // setTimer(timer - 1); - // }, 1000); - // return () => clearInterval(time); - // } - // }, [timer, reducer.loading]); + useEffect(() => { + if (reducer.loading) { + const time = + timer > 0 && + setInterval(() => { + setTimer(timer - 1); + }, 1000); + return () => clearInterval(time); + } + }, [timer, reducer.loading]); - // useEffect(() => { - // if (timer > 0 && reducer.loading) { - // setLoading(true); - // document.body.style.opacity = 0.5; - // } else { - // setLoading(false); - // document.body.style.opacity = 1; - // } - // }, [reducer.loading, timer]); + useEffect(() => { + if (timer > 0 && reducer.loading) { + setLoading(true); + document.body.style.opacity = 0.5; + } else { + setLoading(false); + document.body.style.opacity = 1; + } + }, [reducer.loading, timer]); return ( <>
-
Scrolls Winners-2023
+
Round-1 (Synopsis Submission) Results - To be declared soon
-{/* + {loading ? ( - ) : null} */} + ) : null} ); } diff --git a/src/Components/results/table.jsx b/src/Components/results/table.jsx index 52b0144..9ae2556 100644 --- a/src/Components/results/table.jsx +++ b/src/Components/results/table.jsx @@ -7,7 +7,7 @@ function TableComp(props) {

{props.name}

-
+ {/*
1st Position - Team {props.team1} 🥇
@@ -17,9 +17,9 @@ function TableComp(props) {
3rd Position - Team {props.team3} 🥉
-
+
*/} {/*
*/} - {/*

Shortlisted Teams

+

Shortlisted Teams

@@ -28,7 +28,7 @@ function TableComp(props) { - + @@ -43,10 +43,10 @@ function TableComp(props) { } @@ -66,7 +66,7 @@ function TableComp(props) { - + @@ -79,10 +79,10 @@ function TableComp(props) { @@ -92,7 +92,7 @@ function TableComp(props) {
Team Name College Name Domain (Topic)Member's NameLeader's Name

  • {d.leader_name}

    • -

  • {d.member_2_name}

    • + {/*

  • {d.member_2_name}

    • {(d.member_3_name != '' && d.member_3_name != null && d.member_3_name != undefined) ?

  • {d.member_3_name}

    • - : null} + : null} */}
Team Name College Name Domain (Topic)Member's NameLeader's Name
{d.domain} ({d.topic})
  • {d.leader_name}
    • -
  • {d.member_2_name}
    • + {/*
  • {d.member_2_name}
    • {(d.member_3_name != '' && d.member_3_name != null && d.member_3_name != undefined) ?
  • {d.member_3_name}
    • - : null} + : null} */}
: null - } */} + }
diff --git a/src/Components/rules/Rules.jsx b/src/Components/rules/Rules.jsx index 1908989..441316e 100644 --- a/src/Components/rules/Rules.jsx +++ b/src/Components/rules/Rules.jsx @@ -2,6 +2,7 @@ import Navbar from "../Navbar/navbar" import "../FAQs/faq.css" import Footer from "../footer/footer" import { useEffect } from "react" +import { Link } from "react-router-dom" function Rules() { @@ -26,7 +27,11 @@ function Rules() {

Paper Format

- 1. + {"-"} + TEMPLATE FOR TECHNICAL PAPER +
+
+ 1.

The paper is to be typed in single space, double column format using Times New Roman font and font size 12.

@@ -44,7 +49,6 @@ function Rules() { 4.

The first page to include Title, Name(s) of authors, their college name, telephone numbers as well as email addresses. This information to be included with extended abstract also.

-