Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #86

Merged
merged 20 commits into from
Oct 3, 2023
Merged

Dev #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/data/eventsData.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const events = [
title: "Speaker Session",
date: "8th October",
img: event1,
link: "",
link: "https://docs.google.com/forms/d/e/1FAIpQLSes9na9VNj7XOFOUYNh_8sQFDA-gmEA0wK2fAPiUT635yvy_A/viewform",
},
{
title: "Coming Soon!",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/data/faqData.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const faqs = [
{
question: "What could be the size of the team?",
answer:
"You can make teams of 3-6 members.",
"You can make teams of 2-4 members.",
},
{
question: "Why should I participate in CodeUtsava 7.0?",
Expand All @@ -37,7 +37,7 @@ const faqs = [
{
question: "How will the teams be judged?",
answer:
"The teams will be judged based on Viability, Technical Complexity, Presentation Skills and most importantly, Creativity.",
"The teams will be judged based on Viability, Technical Complexity, Presentation Skills, Guidelines and most importantly, Creativity.",
},
{
question: "What is the Code of Conduct?",
Expand Down
Binary file modified src/assets/images/event1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/images/witch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions src/components/scrollToTop/ScrollToTop.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
.progress-bar {

cursor: pointer;
position: fixed;
bottom: 0.75rem;
right: 2rem;
z-index: 100;
background-color: rgb(37, 37, 37);
width: 3rem;
height: 3rem;
place-items: center;
text-align: center;
border-radius: 50%;
transition: display .5s ease-in-out;
--percentage-done: 100%;


}


@media screen and (min-width: 325px) {
.progress-bar {
transform: scale(0.8);
}
}

@media screen and (min-width: 425px) {
.progress-bar {
transform: scale(1);
}
}

.scrolldis {
display: none;
}

.progress-status {
position: relative;
left: 5%;
top: 12%;

}

.progress-status img {
height: 2rem;
width: 2rem;
transform: rotate(68deg);
}

.progress-value {
content: "";
/* background: conic-gradient(#f6901e 10%, transparent 0 100%); */
position: absolute;
z-index: -1;
height: 2.8rem;
width: 2.8rem;
border-radius: 50%;

}
39 changes: 39 additions & 0 deletions src/components/scrollToTop/ScrollToTop.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React, { useState } from 'react'
import "./ScrollToTop.css"


const ScrollToTopnew = () => {
const [show, setShow] = useState(false);

const scrolltop=()=>{
window.scrollTo({ top: 0, behavior: "smooth" });
}

var b = document.body;
b.onscroll=()=>{
var h = document.documentElement,
st = 'scrollTop',
sh = 'scrollHeight';
const percentageScrolled= Math.round((h[st]||b[st]) / ((h[sh]||b[sh]) - h.clientHeight) * 100);

if(percentageScrolled >1)setShow(true);
else setShow(false);
let pgv=document.querySelector(".progress-value");
pgv.style.background=`conic-gradient(#f6901e ${percentageScrolled}%, transparent 0 100%)`
}


return (

<div className={`progress-bar ${show?"":" scrolldis"}`} onClick={scrolltop}>
<div className="progress-value" ></div>
<div className="progress-status">
<img src={require('../../assets/images/witch.svg').default} alt="" />
</div>
</div>


)
}

export default ScrollToTopnew
16 changes: 16 additions & 0 deletions src/components/statistics/Statistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,22 @@ const Statistics = () => {
DEVELOPERS
</p>
</div>
<div className="codeutsava__section-statistics-format-card">
<p className="codeutsava__section-statistics-format-card-description">
<span style={{ color: "var(--secondary-c)" }}>
{counterOn && (
<CountUp
start={100}
end={1000}
duration={1.5}
delay={0}
/>
)}
+
</span>{" "}
VISITORS
</p>
</div>
</div>
</div>
</ScrollTrigger>
Expand Down
3 changes: 3 additions & 0 deletions src/pages/faqs/FAQs.css
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,7 @@
font-size: 1.2rem;
}
}
.codeutsava__section7-left-bottom-content-contact-us-route{
color: var(--secondary-c);
}

5 changes: 3 additions & 2 deletions src/pages/faqs/FAQs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import AccordianQA from '../../components/faq/QuestionAccordian'
import Footer from "../../components/footer/Footer";
import NavbarTeam from "../../components/navbarTeam/NavbarTeam";
import IntroAudio from "../../components/introAudio/IntroAudio";
import { Link } from "react-router-dom";

import { useState } from "react";

Expand Down Expand Up @@ -60,9 +61,9 @@ const FAQs = () => {
<img src={frank} className="codeutsava__section7-left-img"></img>
<div className="codeutsava__section7-left-bottom-container">
<div className="codeutsava__section7-left-bottom-content">
<p>
<p>
Not able to find your question?
<br /> <br /> Dont worry , fill out the contact us at the end of
<br /> <br /> Dont worry , fill out the <Link to="/contactus"><span className="codeutsava__section7-left-bottom-content-contact-us-route"> Contact Us </span></Link>at the end of
this page. <br />
<br /> We're excited to chat with you, so expect a response
within 24 hours.
Expand Down
2 changes: 2 additions & 0 deletions src/pages/home/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import Section13 from "./sections/section13/Section13";
import Section14 from "./sections/section14/Section14";
import sponsers from "../../assets/data/sponsersData";
import Statistics from "../../components/statistics/Statistics";
import ScrollToTopnew from "../../components/scrollToTop/ScrollToTop";

const HomePage = () => {
return (
Expand Down Expand Up @@ -48,6 +49,7 @@ const HomePage = () => {
<Section10 />
</div>
<div className="intro_audio_new_design"><IntroAudio/></div>
<ScrollToTopnew/>
<div className="codeutsava__footer-container">
<Footer />
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/pages/home/sections/section1/Section1.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@
.codeutsava__section1-image img{
height: 300px;
padding: 4px;
width: auto;

}


.codeutsava__section1-button-container {
display: flex;
justify-content: center;
Expand Down
Loading