Skip to content

Commit

Permalink
Merge pull request #48 from innogeeks/test
Browse files Browse the repository at this point in the history
Test
  • Loading branch information
AdityyaX authored Mar 24, 2024
2 parents 7890c26 + 98b1346 commit c6e8295
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 38 deletions.
32 changes: 16 additions & 16 deletions src/Module/General.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -348,45 +348,45 @@ const frequentlyAskedQuestions = [
[
[
{
label: <div className='faqs'>What is a hackathon?</div>,
label: 'What is a hackathon?',
content:
<div>A hackathon is a 24 hour event where "hackers" all over the globe collaborate on creating a functioning software and hardware by the end of the event.</div>
'A hackathon is a 24 hour event where "hackers" all over the globe collaborate on creating a functioning software and hardware by the end of the event.'
},
{
label: <div className='faqs'>Who can attend?</div>,
label:' Who can attend?',
content:
<div className="faqs">InnoHacks is open to all undergraduates from all over India.</div>
'InnoHacks is open to all undergraduates from all over India.'
},
{
label: <div className="faqs">I am a first time hacker, what should I do?</div>,
label: 'I am a first time hacker, what should I do?',
content:
<div className="faqs">No worries, we love to welcome first time hackers and start their hacking journey from a hackathon. We have some awesome workshops and events which will help you get started with hackathons in general.</div>
'No worries, we love to welcome first time hackers and start their hacking journey from a hackathon. We have some awesome workshops and events which will help you get started with hackathons in general.'
},
{
label: <div className="faqs">How does team formation works?</div>,
label: 'How does team formation works?',
content:
<div className="faqs">You can form team with maximum 4 members. If you don't have a team, there will be plenty of opportunities for you to meet hackers and form a team!</div>
"You can form team with maximum 4 members. If you don't have a team, there will be plenty of opportunities for you to meet hackers and form a team!"
}
],
[
{
label: <div className="faqs">How to register myself in the Innohacks 3.0?</div>,
label: 'How to register myself in the Innohacks 3.0?',
content:
<div className="faqs">All you need to do is fill our form mentioned above and join our Discord channel, we will guide you through everything there</div>
'All you need to do is fill our form mentioned above and join our Discord channel, we will guide you through everything there'
},
{
label: <div className="faqs">I have more questions?</div>,
label: 'I have more questions?',
content:
<div className="faqs">Reach us directly at ([email protected]). We would happy to help you.</div>
'Reach us directly at ([email protected]). We would happy to help you.'
},
{
label: <div className="faqs">Will there be a Registration Fee?</div>,
label: 'Will there be a Registration Fee?',
content:
<div className="faqs">No!</div>
'No!'
},
{
label: <div className="faqs">Will there be swags?</div>,
content: <div className="faqs">Yes! Participants will many chances to win InnoHacks 3.0 swags!.</div>
label: 'Will there be swags?',
content: 'Yes! Participants will many chances to win InnoHacks 3.0 swags!.'
}
]
]
Expand Down
5 changes: 0 additions & 5 deletions src/Module/prize.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,4 @@
margin-left: auto;
margin-right: auto;
width: 25%;
}

.faqs{
font-family: repo-light;
font-weight: semibold;
}
1 change: 1 addition & 0 deletions src/components/Accordian/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ margin-top: 10px;
overflow: hidden;
will-change: height;
transition: height 0.4s cubic-bezier(0.65, 0.05, 0.36, 1);
font-family: repo-light ;
}
.panel__content {
margin: 5px 25px 25px;
Expand Down
19 changes: 11 additions & 8 deletions src/components/Landing/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ const Myinfo = () => {
return (
<div className="Myinfo">
<About />
<p> {TOP_SECTION.SHORT_DESCRIPTION}</p>
<p className="topsection"> {TOP_SECTION.SHORT_DESCRIPTION}</p>
<div className="buttom-group">
<div className="join_dis">
<div>
<a
rel="noreferrer"
target="_blank"
Expand All @@ -50,17 +51,19 @@ const Myinfo = () => {
<Btn
ico="fab fa-2x fa-discord"
className="join_disco"
type="&nbsp;&nbsp;Join Discord"
type="&nbsp;&nbsp;&nbsp;Join Discord"
overlay="Now"
style={{ display: "flex", justifyContent: "center" }}
/>
</a>
</div>

<a href="https://forms.gle/LabTKRJEHvyZuXd78" target="_blank">
{" "}
<Btn className="register" type="Register " overlay="Now" />
</a>
</div>
<div className="registerbtn">
<a href="https://forms.gle/LabTKRJEHvyZuXd78" target="_blank">
{" "}
<Btn className="register" type="Register " overlay="Now" style={{ marginLeft: "50px" }}/>
</a>
</div>
</div>
</div>
</div>
);
Expand Down
12 changes: 12 additions & 0 deletions src/components/Landing/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@ button{
background-color: black;
}

.fa-2x{
font-size: 25px;
}

.registerbtn{
margin-left: 25px;
}

.AboutMe h2 {
font-size: 8rem;
font-family: 'Noto Sans', sans-serif;
Expand All @@ -230,6 +238,10 @@ p {
font-weight: 300;
}

.topsection{
margin-top: -30px;
}

.Myinfo {
text-align: left;
margin-left: 10vh;
Expand Down
6 changes: 3 additions & 3 deletions src/components/Team/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ const Member = ({info}: {info: any}) => {
<img src={img} alt="Inno-Hack"></img>
<div className="members-link">
<h3>{name}</h3>
<p>{role}</p>
<a href={linkedin}>
<p className='namess'>{role}</p>
{/* <a href={linkedin}>
<i className="fab fa-2x fa-linkedin"></i>
</a>
</a> */}
</div>
</div>
);
Expand Down
6 changes: 5 additions & 1 deletion src/components/Team/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
border-radius: 50%;
display: block;
margin: 0 auto;
border: 5px solid rgb(255, 194, 252);
/* border: 5px solid rgb(255, 194, 252); */
}
.members-link {
text-align: center;
Expand All @@ -24,6 +24,10 @@
margin: 0 7px;
cursor: pointer;
}
.namess{
font-size: 2.8rem;
font-weight: 500;
}
.joinT {
text-align: center;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Typed/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function MytypedComponent() {
return (
<div className="typing-div">
<h1>
<Typed strings={TOP_SECTION.Typed_effect} typeSpeed={80} loop />
<Typed strings={TOP_SECTION.Typed_effect} typeSpeed={80} loop style={{ fontWeight: "500"}}/>
</h1>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Home/HomePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default function HomePage() {
<Footfall />
</Col>
</Row>
{media && <Birds top="120vh" left="0vh" type="" />}
{/* {media && <Birds top="120vh" left="0vh" type="" />} */}
<h1
data-aos="zoom-in"
data-aos-duration="800"
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Home/about.css
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ margin-top: 15vh;

.imagee{
width: 70vh;
transition: all 300ms ease-in;
animation: upDown 1s infinite alternate ease;
/* transition: all 300ms ease-in;
animation: upDown 1s infinite alternate ease; */
}

@keyframes upDown {
Expand Down
2 changes: 1 addition & 1 deletion src/containers/navbar/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const NAVBAR = ({}) => {


<div className='logo-div'>
<img src="https://template-mail-images.s3.ap-south-1.amazonaws.com/INNOHACKS_3.0_Logo-removebg-preview+(1).png" className="nav-logo" width={240}></img>
<img src="https://template-mail-images.s3.ap-south-1.amazonaws.com/INNOHACKS_3.0_Logo-removebg-preview+(1).png" className="nav-logo" width={190}></img>
</div>

<Wrapper toggle={toggle}>
Expand Down

0 comments on commit c6e8295

Please sign in to comment.