Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/hack4bengal/s3 into andresh…
Browse files Browse the repository at this point in the history
…a__dev
  • Loading branch information
Andresha56 committed Jun 2, 2024
2 parents 0966ff8 + 81f0e29 commit 9aef074
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/assets/data/HeaderContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ const HeaderData = {
backWordMobile: "Experts",
backWordSize_mobile: "78px",
backWordSpacing_mobile: "0.2rem",
frontWord: "Mentors/Judges",
frontWordMobile: "Mentors/Judges",
frontWord: "Mentors/ Judges",
frontWordMobile: "Mentors/ Judges",
},
testimonials: {
backWord: "Stories",
backWordSize_mobile: "78px",
backWordSpacing_mobile: "0.5rem",
frontWord: "Testimonial",
frontWord: "Testimonials",
},
faq: {
backWord: "FAQ",
Expand Down
17 changes: 10 additions & 7 deletions src/assets/data/SponsorsContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// import foss from "../images/SponsorImages/foss.webp";
// import gdg from "../images/SponsorImages/gdg.webp";
import circle from "../images/SponsorImages/circle.svg";
import ef from "../images/SponsorImages/ef.svg";
import devcon from "../images/SponsorImages/devcon.png";
import filecoin from "../images/SponsorImages/filecoin.png";
import github from "../images/SponsorImages/github.png";
import graph from "../images/SponsorImages/graph.png";
Expand All @@ -20,7 +20,7 @@ import graph from "../images/SponsorImages/graph.png";
// import shardeum from "../images/SponsorImages/shardeum.webp";
// import snu from "../images/SponsorImages/snu.webp";
// import solana from "../images/SponsorImages/solana.webp";
import xyz from "../images/SponsorImages/xyz.webp";
import xyz from "../images/SponsorImages/xyz.png";
// import zeeve from "../images/SponsorImages/zeeve.webp";

const sponsors = {
Expand All @@ -47,11 +47,7 @@ const sponsors = {
img: graph,
link: "https://thegraph.com/",
},
{
name: "Ethereum Foundation",
img: ef,
link: "https://ethereum.foundation/",
},

// {
// name: "Filecoin Virtual Machine",
// img: fvm,
Expand All @@ -63,6 +59,13 @@ const sponsors = {
// link: "https://www.flow.com",
// },
],
Silver: [
{
name: "Road To DevCon",
img: devcon,
link: "https://devcon.org/en/",
},
],
Domain: [
{
name: "xyz",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/data/TeamContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const teamMember = {
{
img: utkarsh,
name: "Utkarsh",
title: "2nd Year Undergrad",
title: "Marketing team @H4B",
linkedIn:
"https://www.linkedin.com/in/utkarsh-jaiswal-6170b5258?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
twitter: "https://x.com/utkxrsh_jaiswal/",
Expand Down
Binary file added src/assets/images/SponsorImages/devcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/SponsorImages/xyz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/private/faq/FAQ.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Faq = () => {
"Nothing, participation in Hack4Bengal 3.0 is absolutely FREE!!🎉 We'll have meals, snacks, and beverages onsite at the hackathon, in addition to swags, prizes, fun mini-events and more.",
},
{
question: "What is the maximum/minimum team size?",
question: "What is the maximum/ minimum team size?",
answer:
"We encourage you to make a team of minimum 2 and maximum 4 members. If you are a Solo Hacker and do not have a team, you can still register and we will help you find a team on our Discord Server.",
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/private/landing/Landing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Landing = () => {
Join Discord
</Button>
<Button type="outline" isDisabled={true}>
Pre-register
Register Now
</Button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/private/marquee/Marquee.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Marquee() {

const paragraphs = [];
for (let i = 0; i < numParagraphs; i++) {
paragraphs.push(<p key={i}> 3.0 Registrations Opening soon</p>);
paragraphs.push(<p key={i}> Hack4Bengal 3.0 Registrations are Live</p>);
}

return (
Expand Down
13 changes: 12 additions & 1 deletion src/components/private/sponsors/Sponsors.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Sponsors = () => {
<Header {...HeaderData.sponsors} />

<div className="sponsors__container platinum_container">
<h1>Platinum Sponsors</h1>
<h1>Platinum Sponsor</h1>
<div className="sponsors__flexbox">
{sponsors["Platinum"].map((item, index) => {
return (
Expand All @@ -31,6 +31,17 @@ const Sponsors = () => {
</div>
</div>

<div className="sponsors__container domain_container">
<h1>Silver Sponsor</h1>
<div className="sponsors__flexbox">
{sponsors["Silver"].map((item, index) => {
return (
<SingleSponsors key={index} sponsor={item} type="silver" />
);
})}
</div>
</div>

<div className="sponsors__container domain_container">
<h1>Domain Partners</h1>
<div className="sponsors__flexbox">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import "./SingleSponsors.scss";

const SingleSponsors = ({ sponsor, type }) => {
const style = sponsor?.name === "xyz" ? { minWidth: "100px" } : {};
const style = {};

return (
<a href={sponsor?.link} target="_blank" rel="noopener noreferrer">
Expand Down

0 comments on commit 9aef074

Please sign in to comment.