Skip to content

Commit

Permalink
Merge pull request #86 from acm-ucr/Hannah/landingPageRedo
Browse files Browse the repository at this point in the history
Hannah/landing page redo
  • Loading branch information
rfairooz authored Mar 15, 2024
2 parents 2431b62 + 7124760 commit 3f42a9e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Footer = () => {
return (
<div className="grid grid-cols-2 gap-8 text-white bg-black w-full pt-24 pb-4">
<div className="flex justify-start ">
<Image src={logo} />
<Image src={logo} alt="logo" />
</div>
<div className="grid grid-cols-3 divide-x-4 divide-white justify-center items-center ">
<div className="font-montserrat h-5/6 grid col-span-2 justify-center items-center ">
Expand Down
22 changes: 8 additions & 14 deletions src/components/about/Landing.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
import React from "react";
import Sky from "@/public/assets/about/sky.png";
import Image from "next/image";
import rocket from "@/public/assets/about/rocket.svg";
import comets from "@/public/assets/about/comets.svg";
import { FaChevronDown } from "react-icons/fa";
const Landing = () => {
return (
<div className="h-screen w-screen bg-black ">
<Image src={Sky} alt="sky" className="bg-transparent absolute" />
<Image src={rocket} className="absolute right-0 z-0" />
<div
className="w-10/12 h-1/2 bg-white justify-start flex items-center"
style={{
clipPath: "polygon(0 0, 100% -20%, 70% 100%, 0% 100%)",
}}
>
<div className="h-screen w-screen bg-black">
<Image src={Sky} alt="sky" className="bg-black top-0.5 absolute" />
<div className="w-screen h-1/2 bg-white flex justify-center items-center mt-10 relative">
<Image src={comets} className="" />
<div classname="flex flex-col ">
<div classname="flex flex-col items-center ">
<div className="text-3xl text-black font-extralight font-montserrat my-3">
Welcome to:
</div>
Expand All @@ -29,14 +22,15 @@ const Landing = () => {
Aerospace Engineering at UCR
</div>
</div>
<Image src={comets} className="rotate-90" />
</div>
<div className=" absolute flex justify-center items-center w-5/12 left-60 mt-20 flex-col">
<div className="text-center w-9/12 font-montserrat text-xl font-black text-white">
<div className=" absolute flex justify-center items-center w-screen mt-32 flex-col">
<div className="text-center w-4/12 font-montserrat text-xl font-black text-white">
promoting and advancing the study and practice of aerospace
engineering by providing an outlet for members to explore, develop and
enhance their technical skills.
</div>
<FaChevronDown className=" mt-10 text-5xl text-white" />
<FaChevronDown className="mt-10 text-5xl text-white" />
</div>
</div>
);
Expand Down
16 changes: 9 additions & 7 deletions src/components/donate/Contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,28 @@ import React from "react";
const Contact = () => {
return (
<div className=" text-center">
<div className="text-6xl font-urbanist font-bold ">Contact Us</div>
<div className=" font-sans text-xl">
<div className="mb-10">[email protected] </div>
<div className="mt-3 md:mt-5 text-3xl md:text-5xl font-urbanist font-black ">
Contact Us
</div>
<div className=" font-sans text-xs lg:text-lg md:text-sm">
<div className="mb-4">[email protected] </div>

<div className="font-extrabold">Javen Dosanjh</div>

<div>President/Chief Engineer</div>
<div>[email protected]</div>
<div> [email protected]</div>
<div>(916)-840-8409</div>

<div className="font-bold mt-10">Jordy Hendra</div>
<div className="font-extrabold mt-4">Jordy Hendra</div>

<div>Vice President</div>
<div>[email protected]</div>

<div className="mt-10">Winston Chung Hall, 446</div>
<div className="mt-4">Winston Chung Hall, 446</div>

<div>N Campus Dr, Riverside</div>

<div>CA 92507</div>
<div className="mb-4 md:mb-5">CA 92507</div>
</div>
</div>
);
Expand Down

0 comments on commit 3f42a9e

Please sign in to comment.