Merge pull request #117 from Dharane-Segar/feature/upperpart

Feature/upperpart
ms-club-sliit · Jul 23, 2023 · d8d87cd · d8d87cd
2 parents 2d1cbe4 + dad74bf
commit d8d87cd
Show file tree

Hide file tree

Showing 13 changed files with 8,080 additions and 8,138 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
 		"emailjs": "^4.0.0",
 		"env-cmd": "^10.1.0",
 		"firebase": "^9.8.2",
-		"html-to-image": "^1.9.0",
+		"html-to-image": "^1.11.11",
 		"moment": "^2.29.3",
 		"react": "^18.1.0",
 		"react-dom": "^18.1.0",

diff --git a/public/index.html b/public/index.html
@@ -2,11 +2,11 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" href="assets/mini_hackathon_logo.webp" />
+		<link rel="icon" href="assets/mini_hackathon_logo_2023.webp" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="MS Club Mini Hackathon 2022" />
-		<title>Mini Hackathon 2022</title>
+		<meta name="description" content="MS Club Mini Hackathon 2023" />
+		<title>Mini Hackathon 2023</title>
 	</head>
 	<body>
 		<div id="root"></div>

diff --git a/src/assets/logo/mini_hackathon_logo_2023.png b/src/assets/logo/mini_hackathon_logo_2023.png
diff --git a/src/components/Navbar/index.jsx b/src/components/Navbar/index.jsx
@@ -44,7 +44,7 @@ const Header = () => {
 				<div className="flex justify-between items-center border-0 py-3 md:justify-start md:space-x-10">
 					<div className="flex justify-start lg:w-0 lg:flex-1">
 						<div className="text-xl font-medium text-black hover:text-gray-900 list-none">
-							MiNi HACKATHON 2022
+							MiNi HACKATHON 2023
 						</div>
 					</div>
 					<div className="-mr-2 -my-2 md:hidden">
@@ -107,7 +107,7 @@ const Header = () => {
 						</li>
 						<li className="text-base font-normal text-gray-500 hover:text-gray-900 mt-1 list-none cursor-pointer">
 							<a
-								href="https://bit.ly/minihack22Guideline"
+								href="https://bit.ly/minihackathon23Guideline"
 								target="_blank"
 								rel="noopener noreferrer"
 							>
@@ -125,7 +125,7 @@ const Header = () => {
 						</li>
 						<li className="ml-8 cursor-pointer inline-flex items-center justify-center px-4 py-1 border-0 rounded font-normal text-white hover:text-black bg-black hover:bg-gray-200 transition duration-0 hover:duration-500">
 							<a
-								href="https://teams.microsoft.com/l/team/19%3akzG-B3fHJkpNjqLclXuXUvsQD0Nb3juJl9jpnOW002w1%40thread.tacv2/conversations?groupId=c1f24bbf-380c-453c-9a1e-c6b3b2c3077f&tenantId=44e3cf94-19c9-4e32-96c3-14f5bf01391a"
+								href="https://teams.microsoft.com/l/team/19%3abbyMtHm95TuODG6QRHhhrYFg3-H5B9GckzKF4ofQNCQ1%40thread.tacv2/conversations?groupId=6c5080c9-4b76-4820-a884-c105c960a193&tenantId=44e3cf94-19c9-4e32-96c3-14f5bf01391a"
 								target="_blank"
 								rel="noopener noreferrer"
 							>

diff --git a/src/components/TeamCard/index.jsx b/src/components/TeamCard/index.jsx
@@ -17,7 +17,7 @@ const TeamCard = (props) => {
 							</div>
 							<div className="col-start-9 col-span-2">
 								<button className="w-24 whitespace-nowrap rounded-full border-2 px-3 py-1 text-base md:text-gray-800">
-									{props.round + "st Round"}
+								 {props.round + "st Round"}
 								</button>
 							</div>
 						</div>

diff --git a/src/components/TeamTicket/index.jsx b/src/components/TeamTicket/index.jsx
@@ -139,7 +139,7 @@ const TeamTicket = (props, this_ref) => {
 									/>
 									<div className="ticket-team-round mb-[28px]">1st Round</div>
 									<div className="ticket-team-date mb-[6px]">
-										Sunday, August 7, 2022
+										Saturday, August 12, 2023
 									</div>
 									<div className="ticket-team-time mb-[16px]">
 										10AM IST Online

diff --git a/src/components/TimelineCard/index.jsx b/src/components/TimelineCard/index.jsx
@@ -29,7 +29,7 @@ const TimelineComponent = (props) => (
 					📣 Book your tickets now
 				</a>
 			)} */}
-			{props.data.id === 3 && (
+			{/* {props.data.id === 3 && (
 				<a
 					href="/team/register"
 					target="_blank"
@@ -38,7 +38,7 @@ const TimelineComponent = (props) => (
 				>
 					✍🏼 Register your team
 				</a>
-			)}
+			)} */}
 		</div>
 	</VerticalTimelineElement>
 );

diff --git a/src/data/Timeline.json b/src/data/Timeline.json
@@ -3,25 +3,25 @@
 		{
 			"id": 1,
 			"title": "Registration Open for Awareness Session",
-			"dateTime": "25th Of July - 6.00 pm",
+			"dateTime": "24th Of July - 10.00 am",
 			"description": "Being aware of the competition will help you create a remarkable project adhering to the rules and guidelines of the competition. The best way to do so is by attending the awareness session. Now you can get registered for the awareness session."
 		},
 		{
 			"id": 2,
 			"title": "Awareness Session",
-			"dateTime": "30th Of July - 10.00 am",
+			"dateTime": "29th Of July - 10.00 am",
 			"description": "Following the rules and guidelines is mandatory during the competition. Join us with the awareness session to be aware of the competition guidelines and see what our organizers have to say about the event."
 		},
 		{
 			"id": 3,
 			"title": "Team Registration Open",
-			"dateTime": "30th Of July - 12.30 pm",
+			"dateTime": "30th Of July - 10.00 am",
 			"description": "Registrations for round one start. Get your team registered on time by submitting an entry. Make sure that your team consist of 3 to 4 members. Keep in mind that a good team will help you win championships."
 		},
 		{
 			"id": 4,
 			"title": "Registration Closes",
-			"dateTime": "13th Of August - 6.30 pm",
+			"dateTime": "12th Of August - 10.00 am",
 			"description": "Team registration closes on this day. Please note that NO registration is accepted after the registrations are closed. Be sure to get registered before the deadline ends."
 		},
 		{
@@ -33,7 +33,7 @@
 		{
 			"id": 6,
 			"title": "Final Round",
-			"dateTime": "28th Of August - 08.30 am",
+			"dateTime": "30th Of August - 10.00 am",
 			"description": "All teams advancing to round 3 are invited to the physical event at the Sri Lanka Institute of Information Technology Campus, Malabe, to present the project in front of an expert panel. Winners will be selected accordingly."
 		}
 	]

diff --git a/src/views/Eligibility/index.jsx b/src/views/Eligibility/index.jsx
@@ -34,7 +34,7 @@ const Eligibility = () => {
 				<div className="flex justify-center">
 					<button className="mt-4 w-48 h-10 rounded bg-black text-white hover:bg-gray-300 hover:text-black transition duration-0 hover:duration-500">
 						<a
-							href="https://bit.ly/minihack22Guideline"
+							href="http://bit.ly/minihackathon23Guideline"
 							target="_blank"
 							rel="noopener noreferrer"
 						>

diff --git a/src/views/Header/index.jsx b/src/views/Header/index.jsx
@@ -1,34 +1,46 @@
 import React from "react";
 import CountdownTimer from "./CountdownTimer";
-import Logo from "../../assets/logo/mini_hackathon_logo.webp";
+import Logo from "../../assets/logo/mini_hackathon_logo_2023.png";
 
 const Countdown = () => {
 	const isAwarenessSession = false;
-	let myDate = "08-08-2022";
+	let myDate = "30-08-2023";
 	myDate = myDate.split("-");
 	let newDate = new Date(myDate[2], myDate[1] - 1, myDate[0]);
 	let month = newDate.toLocaleString("en-us", { month: "long" });
 	// let date = newDate.getDate();
 
 	return (
-		<div className="flex justify-center flex-col md:flex-row px-3.5 mt-10">
-			<div className="flex justify-center items-center md:p-10">
+		<div className="flex justify-center flex-col md:flex-row px-3.5 mt-10 ">
+			<div className="flex justify-center items-center md:p-10 ">
 				<img
 					src={Logo}
 					alt="Mini Hackathon Logo"
 					className="min-w-0 max-w-lg md:max-w-lg"
 				/>
 			</div>
 
-			<div className="justify-center items-center mt-0 md:mt-0 md:p-10">
+			<div className="justify-center items-center mt-0 md:mt-0 md:p-10 ml-20">
 				<div>
 					<CountdownTimer
-						countdownTimestampMs={1660395600000}
+						countdownTimestampMs={1693333800000}
 						month={month}
-						date={13}
+						date={30}
 					/>
 				</div>
-				<div className="text-center mt-5">
+
+				<div className="text-center mt-7">
+
+						<a
+							href=""
+							target="_blank"
+							rel="noopener noreferrer"
+							className=" bg-black text-white border border-black hover:bg-gray-100 hover:text-black rounded lg:text-lg pl-4 pr-4 pt-1 pb-1 transition duration-0 hover:duration-500"
+						>
+							  Awareness Session
+						</a>
+						</div>
+				{ /*<div className="text-center mt-7">
 					{isAwarenessSession ? (
 						<a
 							href="/awareness-session/register"
@@ -48,7 +60,7 @@ const Countdown = () => {
 							✍🏼 Register your team
 						</a>
 					)}
-				</div>
+					</div> */}
 			</div>
 		</div>
 	);

diff --git a/src/views/TeamView/index.jsx b/src/views/TeamView/index.jsx
@@ -57,7 +57,7 @@ const TeamView = () => {
 		<div id="teams">
 			<div className="lg:px-20">
 				<h1 className="text-4xl md:text-5xl text-center mb-5 mt-10 font-bold">
-					Teams
+					Top 10 Finalists
 				</h1>
 				<div className="flex justify-center mb-6 ml-8 mr-8 md:px-20">
 					<SearchIcon className="w-6 h-6 text-gray-600 relative top-3 left-10" />