diff --git a/public/template.docx b/public/template.docx new file mode 100644 index 0000000..c8b4a27 Binary files /dev/null and b/public/template.docx differ diff --git a/src/Components/Assets/timeline.svg b/src/Components/Assets/timeline.svg index 79fbf80..13c60dd 100644 --- a/src/Components/Assets/timeline.svg +++ b/src/Components/Assets/timeline.svg @@ -23,7 +23,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/src/Components/Assets/timelinePhone.svg b/src/Components/Assets/timelinePhone.svg index 07ee621..b4fb599 100644 --- a/src/Components/Assets/timelinePhone.svg +++ b/src/Components/Assets/timelinePhone.svg @@ -32,13 +32,13 @@ - + - + diff --git a/src/Components/FAQs/faq.css b/src/Components/FAQs/faq.css index d0c58f9..82cc925 100644 --- a/src/Components/FAQs/faq.css +++ b/src/Components/FAQs/faq.css @@ -71,6 +71,8 @@ margin-top: 0; } + + @media(max-width:2500px) and (min-width:1500px) { .question { font-size: 1.6rem; @@ -79,6 +81,9 @@ .answer { font-size: 1.4rem; } + .snoo{ + font-size: 1.4rem; + } .FAQ { /* margin-bottom: 280px; */ 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 1188e9c..974c343 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"; @@ -32,7 +33,7 @@ import Navbar from "../Navbar/navbar"; // import mobTimeline from "../Assets/mob_timeline.svg" import timelineNew from "../Assets/timeline.svg"; import timelinePhone from "../Assets/timelinePhone.svg"; -import { NavLink, useNavigate } from "react-router-dom"; +import { Link, NavLink, useNavigate } from "react-router-dom"; import { RegOpenThunk } from "../../Redux/registerSlice"; import { Spinner } from "react-bootstrap"; import Footer from "../footer/footer"; @@ -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,20 +277,21 @@ function LandingPage() { setProces(false); } + + 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); @@ -515,7 +592,7 @@ function LandingPage() { }, }} > - + */} + {!stop&& + <> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +}
- handleProcess()} /> + { + handleStop(true) + handleProcess() }}/>
- - {/* */} + - Registrations will start soon. - */} + The curtains close on SCROLLS'24. Thanks for joining the show! + {/* Click here to view the results of S */} - {/* */} + + Results + +
diff --git a/src/Components/Navbar/Navbar.css b/src/Components/Navbar/Navbar.css index f445763..956d096 100644 --- a/src/Components/Navbar/Navbar.css +++ b/src/Components/Navbar/Navbar.css @@ -633,6 +633,9 @@ margin-left: 1vw; gap: 1.7vw; } + #navUpdate{ + font-size: 0.88rem; + } #navMore2 { /* margin-left: -5vw; */ diff --git a/src/Components/Navbar/navbar.jsx b/src/Components/Navbar/navbar.jsx index 45aa847..9637e64 100644 --- a/src/Components/Navbar/navbar.jsx +++ b/src/Components/Navbar/navbar.jsx @@ -267,12 +267,16 @@ function Navbar(props) { .then((res) => { if (res.payload.status === 200) { setDialogg(true); + setProcessStop(false); setLogin(true); - dispatch(dialog6()); + dispatch(dialog6()); } if (res.payload.status === 400) { setDialogg(true); - setProcessStop(true); + setProcessStop(false); + setLogin(true); + dispatch(dialog6()); + } if (res.payload.status === 429) { toast.error( @@ -337,7 +341,12 @@ function Navbar(props) { )} +
+
+
.
  • Updates
    • +
    +
  • How To Register
    • @@ -458,8 +467,10 @@ function Navbar(props) { } - {" "} -

    Updates

    +
    + Updates +
    .
    +
    {" "} @@ -575,10 +586,10 @@ function Navbar(props) { - {" "} -

    Dashboard

    @@ -852,7 +863,8 @@ function Navbar(props) { paddingBottom: "8px", }} > - Registrations will start soon. + Registrations have concluded.
    + We appreciate your interest. {/* */} diff --git a/src/Components/results/Result.jsx b/src/Components/results/Result.jsx index 152370b..653c68c 100644 --- a/src/Components/results/Result.jsx +++ b/src/Components/results/Result.jsx @@ -8,6 +8,11 @@ import { useEffect } from "react"; import { ResultThunk } from "../../Redux/resultSlice"; import { Spinner } from "react-bootstrap"; +const filterTeamsByDomain = (teams, domain) => { + if(teams) + return teams.filter(team => team.domain === domain); +} + function Result() { const dispatch = useDispatch(); const reducer = useSelector((s) => s.result); @@ -23,127 +28,163 @@ function Result() { const [selected, setSelected] = useState(team); const [wait, setWait] = useState(team); const [loading, setLoading] = useState(false); +const [teams,setTeams] = useState([]); +useEffect(() => { + dispatch(ResultThunk()); +} +, [dispatch]); useEffect(() => { - dispatch(ResultThunk()); + setTeams(prev=>[...prev,...[{ + team_id: "Unstop", + name: "AG_OG", + domain: "Management Science", + topic: "Advance Aerial Survillance Integrating AI and Drone Tech for Enchance Women Security", + leader_name: "Gauransh Goel", + },{ + team_id: "Unstop", + name: "Akgecianxisro", + domain: "Management Science", + topic: "Predicting Infant Mortality Rates in India: A Random Forest Approach", + leader_name: "Shreeya Prasad", + }, + { + team_id: "Unstop", + name: "Team Trifecta", + domain: "Civil Engineering", + topic: "Intelligent Transport system", + leader_name: "Ayush Pathak", + } + ]]) }, []); - useEffect(() => { - if ( - reducer.selectedTeam != "" && - reducer.selectedTeam != null && - reducer.selectedTeam != undefined - ) { - setSelected({ - ...selected, - MS_team: reducer.selectedTeam.msg.MS_team, - CS_team: reducer.selectedTeam.msg.CS_team, - EN_team: reducer.selectedTeam.msg.EN_team, - EC_team: reducer.selectedTeam.msg.EC_team, - CE_team: reducer.selectedTeam.msg.CE_team, - ME_team: reducer.selectedTeam.msg.ME_team, - }); - } - if ( - reducer.waitlistedTeam != "" && - reducer.waitlistedTeam != null && - reducer.waitlistedTeam != undefined - ) { - setWait({ - ...wait, - MS_team: reducer.waitlistedTeam.MS_team, - CS_team: reducer.waitlistedTeam.CS_team, - EC_team: reducer.waitlistedTeam.EC_team, - }); - } - }, [reducer]); + if(teams.length<4) + setTeams(prev=>[...prev,...reducer.selectedTeam]); + }, [reducer.selectedTeam]); - const [timer, setTimer] = useState(10); + const CS_team = filterTeamsByDomain(teams, "Computer Science and Information Technology"); + const ME_team = filterTeamsByDomain(teams, "Mechanical Engineering"); + const MS_team = filterTeamsByDomain(teams, "Management Science"); + const EN_team = filterTeamsByDomain(teams,"Electrical and Electronics Engineering"); + const EC_team = filterTeamsByDomain(teams,"Electronics and Communication Engineering"); + const CE_team = filterTeamsByDomain(teams,"Civil Engineering"); + console.log(EN_team); // useEffect(() => { - // if (reducer.loading) { - // const time = - // timer > 0 && - // setInterval(() => { - // setTimer(timer - 1); - // }, 1000); - // return () => clearInterval(time); + // if ( + // reducer.selectedTeam != "" && + // reducer.selectedTeam != null && + // reducer.selectedTeam != undefined + // ) { + // setSelected({ + // ...selected, + // MS_team: reducer.selectedTeam.msg.MS_team, + // CS_team: reducer.selectedTeam.msg.CS_team, + // EN_team: reducer.selectedTeam.msg.EN_team, + // EC_team: reducer.selectedTeam.msg.EC_team, + // CE_team: reducer.selectedTeam.msg.CE_team, + // ME_team: reducer.selectedTeam.msg.ME_team, + // }); // } - // }, [timer, reducer.loading]); + // // if ( + // // reducer.waitlistedTeam != "" && + // // reducer.waitlistedTeam != null && + // // reducer.waitlistedTeam != undefined + // // ) { + // // setWait({ + // // ...wait, + // // MS_team: reducer.waitlistedTeam.MS_team, + // // CS_team: reducer.waitlistedTeam.CS_team, + // // EC_team: reducer.waitlistedTeam.EC_team, + // // }); + // // } + // }, [reducer]); - // 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]); + 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 (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
    +
    Results