Skip to content

Commit

Permalink
Merge pull request #106 from acm-ucr/Simon-Cun/LanternImgReplacement
Browse files Browse the repository at this point in the history
Replaced Lantern Img
  • Loading branch information
stanleylew5 authored Feb 2, 2025
2 parents b09cb3d + ba4ce24 commit 8a472a4
Show file tree
Hide file tree
Showing 13 changed files with 79 additions and 19 deletions.
8 changes: 8 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@tanstack/react-query": "~5.53.3",
"icons": "^1.0.0",
"lucide-react": "~0.417.0",
"next": "~14.2.10",
"react": "~18.3.1",
Expand Down
9 changes: 0 additions & 9 deletions public/about/lantern.svg

This file was deleted.

Binary file added public/about/lantern.webp
Binary file not shown.
Binary file added public/board/Group-Photo-CSA.webp
Binary file not shown.
9 changes: 9 additions & 0 deletions public/board/boar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/board/boarshadow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/board/whiteflowers.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions public/home/banner.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: 6 additions & 2 deletions src/app/board/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import GroupPhoto from "@/components/board/GroupPhoto";
const Page = () => {
return <div className="bg-csa-tan-100"></div>;
return (
<div className="bg-csa-tan-100">
<GroupPhoto />
</div>
);
};

export default Page;
2 changes: 1 addition & 1 deletion src/components/Title.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Title: React.FC<TitleNameProps> = ({ text }) => {
>
<path
id="curve"
d="M50,150 Q200,10 370,150"
d="M50,140 Q220,0 360,145"
fill="transparent"
stroke="none"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/about/RightLantern.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Image from "next/image";
import lantern from "@/public/about/lantern.svg";
import lantern from "@/public/about/lantern.webp";

const RightLantern = () => {
return (
<Image
src={lantern}
alt="Chinese Lantern"
className="absolute right-0 top-[25vh] w-2/12"
className="absolute right-0 top-[25vh] w-1/5 scale-x-[-1]"
/>
);
};
Expand Down
29 changes: 29 additions & 0 deletions src/components/board/GroupPhoto.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import Image from "next/image";
import GroupImage from "@/public/board/Group-Photo-CSA.webp";
import WhiteFlower from "@/public/board/whiteflowers.svg";
import Boar from "@/public/board/boar.svg";
/* import BoarShadow from "@/public/board/boarshadow.svg"; */

const GroupPhoto = () => {
return (
<div className="grid grid-cols-2">
<div className="relative flex items-center justify-center">
<Image
src={GroupImage}
alt="Group Image"
className="w-3/4 rounded-[2rem] border-8 border-csa-green-100"
/>
<Image
src={WhiteFlower}
alt="White Flower"
className="absolute bottom-0 left-0 w-1/5"
/>
</div>
<div className="flex -translate-y-[6%] translate-x-[10%] items-center justify-end">
<Image src={Boar} alt="Boar" className="w-11/12" />
</div>
</div>
);
};

export default GroupPhoto;

0 comments on commit 8a472a4

Please sign in to comment.