Skip to content

Commit

Permalink
Merge pull request #3 from itzzGaurav7/main
Browse files Browse the repository at this point in the history
Added Rules Section and fixed conflicts ..
  • Loading branch information
parteekcoder authored Jan 11, 2024
2 parents c2b1d0c + 712f7e5 commit fd90cdf
Show file tree
Hide file tree
Showing 10 changed files with 1,071 additions and 508 deletions.
1,359 changes: 889 additions & 470 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"swiper": "^8.4.5"
},
"devDependencies": {
"autoprefixer": "^10.4.13",
"autoprefixer": "^10.4.16",
"eslint": "8.30.0",
"eslint-config-next": "13.0.7",
"postcss": "^8.4.20",
"tailwindcss": "^3.2.4"
"postcss": "^8.4.33",
"tailwindcss": "^3.4.1"
},
"homepage": "https://hackmol.tech/"
}
8 changes: 8 additions & 0 deletions public/elements/rec1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions public/elements/rec2.svg
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 public/elements/rec3.svg
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 public/elements/rec4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions src/components/Rules/Rules.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import React from "react";
import RulesPoints from "./RulesPoints";
import rec1 from "../../../public/elements/rec1.svg";
import rec2 from "../../../public/elements/rec2.svg";
import rec3 from "../../../public/elements/rec3.svg";
import rec4 from "../../../public/elements/rec4.svg";

function Rules() {
const rules = [
{
color: "#FF8EFF",
rule: "Each team would comprise of 1 to 4 members",
align: "right",
svg_url: rec1.src,
},
{
color: "#006CEF",
rule: "Team members could be from different institutions as well",
align: "right",
svg_url: rec2.src,
},
{
color: "#00F26D",
rule: "The registration begins on 15th Jan,2023 and ends on 5th Feb,2023",
align: "left",
svg_url: rec3.src,
},
{
color: "#FECB4A",
rule: "After registration, you have to submit your idea via PPT before 10th Feb 2023",
align: "left",
svg_url: rec4.src,
},
];

return (
<div
id="rules"
className="border-none w-full bg-white flex justify-center flex-col md:flex-row overflow-auto "
>
<div className="rulesLeft white flex flex-col md:flex-row ">
<div className="md:w-full py-10 md:py-20 ">
<div className=" px-8 flex flex-col justify-center items-center ">
<div className="rules__title text-4xl mb-6 font-Space-Grotesk">
<svg
width="234"
height="42"
viewBox="0 0 234 42"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M0 42V0H36V6H42V24H30V30H36V36H42V42H24V36H18V30H12V42H0ZM12 24H24V18H30V6H12V24ZM54 42V36H48V0H60V36H78V0H90V36H84V42H54ZM102 42V0H114V36H138V42H102ZM144 42V0H186V6H156V18H180V24H156V36H186V42H144ZM198 42V36H192V30H204V36H222V24H198V18H192V6H198V0H228V6H234V12H222V6H204V18H228V24H234V36H228V42H198Z"
fill="#1F1F1F"
/>
</svg>
</div>
<div className="w-3/4 rules__desc mb-10 text-black font-Plus-Jakarta text-center">
Lorem ipsum dolor sit amet consectetur, adipisicing elit. Repellat
facilis vero sed consequatur porro aut ducimus culpa. Quaerat
animi molestiae incidunt quisquam quae dignissimos, sequi ullam
ratione veniam, laboriosam ab.
</div>
<div className="md:w-3/4 space-y-2">
{rules.map((ele) => (
<RulesPoints
Desc={ele.rule}
color={ele.color}
alignment={ele.align}
icon={ele.svg_url}
/>
))}
</div>
</div>
</div>
</div>
</div>
);
}

export default Rules;
37 changes: 37 additions & 0 deletions src/components/Rules/RulesPoints.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from "react";

function RulesPoint({ Desc, color, alignment, icon }) {
const getAlign = () => {
return alignment === "left" ? "flex-row-reverse" : "";
};

return (
<div className={`flex ${getAlign()} items-center `}>
<div
className={`hidden sm:block z-30`}
style={{
marginLeft: alignment === "left" ? "-3rem" : "0",
marginRight: alignment === "right" ? "-3rem" : "0",
}}
>
<img src={icon} alt="img" />
</div>
<div
className={`bg-white w-full h-full p-2 border-5 flex justify-center font-bold text-center`}
style={{
borderColor: color,
borderWidth: "0.25rem",
borderStyle: "solid",
}}
>
<div className={`font-medium text-xl px-8`}>
{Desc} Lorem ipsum dolor sit amet consectetur adipisicing elit.
Commodi sequi recusandae ullam molestias sed, vero enim neque esse,
aperiam hic.
</div>
</div>
</div>
);
}

export default RulesPoint;
15 changes: 6 additions & 9 deletions src/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@

// import Schedule from '../components/Timeline/Schedule'
// import Script from 'next/script'

import PrizeSection from '../components/PrizeSection'
import Rules from "../components/Rules/Rules";
import PrizeSection from "../components/PrizeSection";

export default function Home() {

return (
<div className=''>

hi
<PrizeSection/>
<div>
<PrizeSection />
<Rules />
</div>
)
);
}
51 changes: 25 additions & 26 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,40 @@ module.exports = {
theme: {
extend: {
colors: {
'blue': ' #296CF2',
'yellow': '#FFEB01',
'purple': '#5C40EC',
'white': '#FFFFFF',
'orange': '#FF6F0F',
'green':'#94E95D',
'black':'#000000',
'lightblue':'#5C40EC',
'pastelBlue': '#90A8ED'
blue: " #296CF2",
yellow: "#FFEB01",
purple: "#5C40EC",
white: "#FFFFFF",
orange: "#FF6F0F",
green: "#94E95D",
black: "#000000",
lightblue: "#5C40EC",
pastelBlue: "#90A8ED",
},
fontFamily: {
'Space-Grotesk': ['Space Grotesk', 'sans-serif'],
'Plus-Jakarta': ['Plus Jakarta Sans', 'sans-serif'],
'Red-Hat-Display': ['Red Hat Display', 'sans-serif'],
"Space-Grotesk": ["Space Grotesk", "sans-serif"],
"Plus-Jakarta": ["Plus Jakarta Sans", "sans-serif"],
"Red-Hat-Display": ["Red Hat Display", "sans-serif"],
},
boxShadow:{
'2xl':'3px 3px black',
'3xl':'5px 5px black',
'5xl':'10px 10px 0px 0px white',
'4xl':'8px 8px black',
'bordered-blue':' 8px 8px 0 -2px #296cf2, 8px 8px black',
'bordered-black':' 8px 8px 0 -2px black, 8px 8px white',
boxShadow: {
"2xl": "3px 3px black",
"3xl": "5px 5px black",
"5xl": "10px 10px 0px 0px white",
"4xl": "8px 8px black",
"bordered-blue": " 8px 8px 0 -2px #296cf2, 8px 8px black",
"bordered-black": " 8px 8px 0 -2px black, 8px 8px white",

'bordered-orange':' 8px 8px 0 -2px #FF6F0F, 8px 8px black',
'bordered-yellow':' 0px 0px 0 5px #FFEB01',
"bordered-orange": " 8px 8px 0 -2px #FF6F0F, 8px 8px black",
"bordered-yellow": " 0px 0px 0 5px #FFEB01",

'bordered-orange': ' 8px 8px 0 -2px #FF6F0F, 8px 8px black',
'bordered-yellow': ' 0px 0px 0 5px #FFEB01',
'hack': '0px 0px 0 8px #D0A4FF'
"bordered-orange": " 8px 8px 0 -2px #FF6F0F, 8px 8px black",
"bordered-yellow": " 0px 0px 0 5px #FFEB01",
hack: "0px 0px 0 8px #D0A4FF",
},
// backgroundImage: {
// 'tshirt': "url('./public/t-shirt_mockup_red_bg.jpg')",
// }
},
},
plugins: [],
}

};

0 comments on commit fd90cdf

Please sign in to comment.