Merge pull request #2 from VandyHacks/about

Merge About
VandyHacks · Apr 3, 2022 · 612df84 · 612df84
2 parents b39e8bf + ef32196
commit 612df84
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 27 deletions.
diff --git a/components/Navbar.js b/components/Navbar.js
@@ -7,7 +7,7 @@ const Navbar = () => {
     <div className="bg-[#28315a] sticky flex justify-end shadow-sm ">
       <div className="inline-block mr-auto mt-3 ml-2 w-[40px] h-[40px]">
         <Link href="/">
-          <Image alt="Logo" src="/logo.png" width={100} height={100} />
+          <Image alt="Logo" src="/logos/logo.png" width={100} height={100} />
         </Link>
       </div>
       <div className="text-white m-[20px] hover:underline" id="about">

diff --git a/pages/about.js b/pages/about.js
@@ -1,15 +1,48 @@
 import React from "react";
 import Navbar from "../components/Navbar";
 import Footer from "../components/Footer";
+import Image from "next/image";
 
 const about = () => {
-  return (
-    <div>
-      <Navbar />
-      <h1>About page</h1>
-      <Footer />
-    </div>
-  );
+	return (
+		<div>
+			<Navbar />
+
+			<div className="flex flex-col justify-center md:flex-row-reverse bg-[#b0cee3]">
+				<div className="h-full w-[20rem] mx-auto">
+					<Image
+						className="mx-auto"
+						alt="About Us"
+						src="/about_egg.svg"
+						height={400}
+						width={400}
+					/>
+				</div>
+				<div className="w-[80%] mx-auto">
+					<div className="text-center text-5xl py-10 bg-no-repeat bg-bottom bg-[url(/yellow_title.svg)]">
+						Our Story
+					</div>
+					<div
+						className="pt-10"
+						// style={{width: "65%", lineHeight: "170%", padding: "20px"}}
+						// width: 65%; line-height: 170%; padding: 20px; background-color:rgba(40, 49, 90, 0.1); border-radius: 25px;
+					>
+						Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+						Sed pharetra nulla ex, nec blandit sapien laoreet a.
+						Mauris a tellus egestas lacus vulputate venenatis in et
+						elit. Class aptent taciti sociosqu ad litora torquent
+						per conubia nostra, per inceptos himenaeos. Cras
+						pharetra vitae nisl vel varius. Pellentesque dapibus
+						mollis nisi, vel egestas tortor aliquet id. Nunc a
+						commodo elit. Etiam semper tellus ligula, eget
+						sollicitudin neque egestas vitae.
+					</div>
+				</div>
+			</div>
+
+			<Footer />
+		</div>
+	);
 };
 
 export default about;
diff --git a/pages/index.js b/pages/index.js
@@ -12,7 +12,11 @@ const Home = () => {
       <Navbar />
 
       {/* Logo */}
-      <div className="h-[100vh] bg-[url('../images/landing_section_one.svg')] text-blue-600"></div>
+      <div className="h-[100vh] -mt-12 md:mt-0 bg-[url('/svgs/landing_section_one.svg')]">
+        <div className="mx-auto h-[200px] w-[250px] pt-64 md:w-[342px] md:h-[285px] md:pt-32">
+          <Image src="/logos/big_logo.png" width={342} height={285} />
+        </div>
+      </div>
 
       <Footer />
     </div>

diff --git a/images/about_egg.svg → public/about_egg.svg b/images/about_egg.svg → public/about_egg.svg
diff --git a/public/landing_section_one.svg b/public/landing_section_one.svg
diff --git a/images/big_logo.png → public/logos/big_logo.png b/images/big_logo.png → public/logos/big_logo.png
diff --git a/public/logo.png → public/logos/logo.png b/public/logo.png → public/logos/logo.png
diff --git a/images/gray_circle.png → public/members/gray_circle.png b/images/gray_circle.png → public/members/gray_circle.png
diff --git a/images/members_info.json → public/members/members_info.json b/images/members_info.json → public/members/members_info.json
diff --git a/images/alumni_companies.png → public/misc/alumni_companies.png b/images/alumni_companies.png → public/misc/alumni_companies.png
diff --git a/images/board_back.png → public/misc/board_back.png b/images/board_back.png → public/misc/board_back.png
diff --git a/images/board_pic.png → public/misc/board_pic.png b/images/board_pic.png → public/misc/board_pic.png
diff --git a/images/code.jpg → public/misc/code.jpg b/images/code.jpg → public/misc/code.jpg
diff --git a/images/coffee.jpg → public/misc/coffee.jpg b/images/coffee.jpg → public/misc/coffee.jpg
diff --git a/images/friends.jpg → public/misc/friends.jpg b/images/friends.jpg → public/misc/friends.jpg
diff --git a/images/laptop_code.jpg → public/misc/laptop_code.jpg b/images/laptop_code.jpg → public/misc/laptop_code.jpg
diff --git a/images/person_icon.png → public/misc/person_icon.png b/images/person_icon.png → public/misc/person_icon.png
diff --git a/images/smile_people.png → public/misc/smile_people.png b/images/smile_people.png → public/misc/smile_people.png
diff --git a/images/v66_1069.png → public/misc/v66_1069.png b/images/v66_1069.png → public/misc/v66_1069.png
diff --git a/images/v66_1072.png → public/misc/v66_1072.png b/images/v66_1072.png → public/misc/v66_1072.png
diff --git a/public/svgs/about_egg.svg b/public/svgs/about_egg.svg
diff --git a/images/blue_dashed_stroke.svg → public/svgs/blue_dashed_stroke.svg b/images/blue_dashed_stroke.svg → public/svgs/blue_dashed_stroke.svg
diff --git a/images/blue_on_white_bottom.svg → public/svgs/blue_on_white_bottom.svg b/images/blue_on_white_bottom.svg → public/svgs/blue_on_white_bottom.svg
diff --git a/images/blue_on_white_curve.svg → public/svgs/blue_on_white_curve.svg b/images/blue_on_white_curve.svg → public/svgs/blue_on_white_curve.svg
diff --git a/images/blue_title.svg → public/svgs/blue_title.svg b/images/blue_title.svg → public/svgs/blue_title.svg
diff --git a/images/footer_squiggle.svg → public/svgs/footer_squiggle.svg b/images/footer_squiggle.svg → public/svgs/footer_squiggle.svg
diff --git a/images/happening_now.svg → public/svgs/happening_now.svg b/images/happening_now.svg → public/svgs/happening_now.svg
diff --git a/images/landing_section_one.svg → public/svgs/landing_section_one.svg b/images/landing_section_one.svg → public/svgs/landing_section_one.svg
diff --git a/images/landing_section_three_bottom.svg → public/svgs/landing_section_three_bottom.svg b/images/landing_section_three_bottom.svg → public/svgs/landing_section_three_bottom.svg
diff --git a/images/landing_section_three_top.svg → public/svgs/landing_section_three_top.svg b/images/landing_section_three_top.svg → public/svgs/landing_section_three_top.svg
diff --git a/images/top_bar_header.svg → public/svgs/top_bar_header.svg b/images/top_bar_header.svg → public/svgs/top_bar_header.svg
diff --git a/images/yellow_line.svg → public/svgs/yellow_line.svg b/images/yellow_line.svg → public/svgs/yellow_line.svg
diff --git a/images/yellow_title.svg → public/svgs/yellow_title.svg b/images/yellow_title.svg → public/svgs/yellow_title.svg
diff --git a/public/yellow_title.svg b/public/yellow_title.svg