From 89d292427bf1671ae6082a656c0d661e5000db16 Mon Sep 17 00:00:00 2001 From: Jacob <110055706+frog187man@users.noreply.github.com> Date: Sat, 18 Jan 2025 20:50:10 -0800 Subject: [PATCH 1/5] Added the description component with a placeholder background color --- public/assets/chartimage.png | Bin 0 -> 718 bytes src/app/page.tsx | 10 +++++-- src/components/home/description.tsx | 44 ++++++++++++++++++++++++++++ tailwind.config.ts | 2 +- 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 public/assets/chartimage.png create mode 100644 src/components/home/description.tsx diff --git a/public/assets/chartimage.png b/public/assets/chartimage.png new file mode 100644 index 0000000000000000000000000000000000000000..befabcff3caf00742f36b3b9734d439fc863d288 GIT binary patch literal 718 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#&H|6fVg?3oVGw3ym^DX&fq|*P z)5S5QV$R!{-g#FXL|mhJez+znziBQ#;FZ8OlYvR`<3x_^6ADSnIttBv%mM}+JjD}Q z*?qlNoc=Mb_U*3pJGHCteLP(pn!cG+u|>d%L$PIpPlI~#`-Pl8oKyT&tTw5O$let0 z>U+cK>R!fqp!5Ojhu%UPt*8y54U;D}DgPEY!2IROi|yP6;y)rCzZ~8#mL>Us0mpY|00+$62ZzHfe^;*8VZxs8k_yPtbH`Ous_Kitkdea9#x`s_(bV7A`-)Y2y$ z-}`sgSf=T{f4a5wDqCL3c7q2^|CeXzZU5(dLG!W3ywko-Zl4zHyd#sL!awh{?ztz% zjZeN8U*A-AGQM&7-T0$-zUoANiu}HlEBV!r11r;R&##&G_rna&qWxv+1%K_o1%G?= zo8!)!E&nEb{`tID`he_%N_*qu0ZS*Bf3xi96+U45V9v*o*H2u#-|havTd?HEx>z+EsoKi?cLiw)e55Dly_!W zbk*4w_=g|Zowp_AR{xVliK { return ( -
- +
+
); }; diff --git a/src/components/home/description.tsx b/src/components/home/description.tsx new file mode 100644 index 0000000..32a4dbe --- /dev/null +++ b/src/components/home/description.tsx @@ -0,0 +1,44 @@ +import Image from "next/image"; +import React from "react"; + +interface DescriptionProps { + title: string; + description: string; + image: string; +} + +const Description = ({ title, description, image }: DescriptionProps) => { + return ( +
+
+ {title} +
+
+ {description} +
+
+ description-image +
+
+
+
+ ); +}; + +export default Description; diff --git a/tailwind.config.ts b/tailwind.config.ts index 611ca1f..ea6863b 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -7,7 +7,7 @@ module.exports = { jost: ["var(--jost-font)"], roboto: ["var(--roboto-font)"], questrial: ["var(--questrial-font)"], - hanken: ["var(--hanken_grotesk-font)"], + hanken: ["var(--hanken-grotesk-font)"], }, }, }, From e44ea4ec957cd0c066e6a0324cfa227c481cfb96 Mon Sep 17 00:00:00 2001 From: ACM UCR Date: Sun, 19 Jan 2025 05:01:48 +0000 Subject: [PATCH 2/5] convert images to webp --- public/assets/chartimage.png | Bin 718 -> 0 bytes public/assets/chartimage.webp | Bin 0 -> 486 bytes src/app/page.tsx | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 public/assets/chartimage.png create mode 100644 public/assets/chartimage.webp diff --git a/public/assets/chartimage.png b/public/assets/chartimage.png deleted file mode 100644 index befabcff3caf00742f36b3b9734d439fc863d288..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 718 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#&H|6fVg?3oVGw3ym^DX&fq|*P z)5S5QV$R!{-g#FXL|mhJez+znziBQ#;FZ8OlYvR`<3x_^6ADSnIttBv%mM}+JjD}Q z*?qlNoc=Mb_U*3pJGHCteLP(pn!cG+u|>d%L$PIpPlI~#`-Pl8oKyT&tTw5O$let0 z>U+cK>R!fqp!5Ojhu%UPt*8y54U;D}DgPEY!2IROi|yP6;y)rCzZ~8#mL>Us0mpY|00+$62ZzHfe^;*8VZxs8k_yPtbH`Ous_Kitkdea9#x`s_(bV7A`-)Y2y$ z-}`sgSf=T{f4a5wDqCL3c7q2^|CeXzZU5(dLG!W3ywko-Zl4zHyd#sL!awh{?ztz% zjZeN8U*A-AGQM&7-T0$-zUoANiu}HlEBV!r11r;R&##&G_rna&qWxv+1%K_o1%G?= zo8!)!E&nEb{`tID`he_%N_*qu0ZS*Bf3xi96+U45V9v*o*H2u#-|havTd?HEx>z+EsoKi?cLiw)e55Dly_!W zbk*4w_=g|Zowp_AR{xVliKMNk&HA0RRA3MM6+kP&il$0000G00014003D406|PpNH_ri00DrUZEqq+ zyBh{KGJR|vn@T1(X6B>@P9s}Dm>G_vkTn|V59bgO4BWPDB*!;`t{b`g1O36N7Z~mZ z1~?cv7&sU#n#QjmE>F^sXNEHi4OX#ovwFXge*W<4EGzhA?`;k)&fKEXsuHF2|CNAqaDs$|jg(Rkpz( ztFsaI*~6Y@@}_O-h9&J*sc=17GRu;(g+RsY(U9^}URKGW_;6gv=7Y`CG(8csXtYjT zzj8hj$dTgu7Ert%9Wkg!M-2W`IB3@YQ^uwqy|AfAFKp@&2hIBbMe-j+1XfTuAb z0B{KaodGIZ09pV(eJ+wmq@tmrH~z=~kPnGz1}Fd=aQy)O0r&y>0Z;l&1T+&pKEy)p z7~2;U5WAb*6TLj!#RZr@SSTKEoVMulzN|w*vN$kopaA~*cX125D|J-6`=}TH|3?lv c__)~hP9b|At$X&fA!2=tq);pA@AN {
); From e81ba3994e446ee97788d764540f5f0aa9c02b4a Mon Sep 17 00:00:00 2001 From: Jacob <110055706+frog187man@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:23:55 -0800 Subject: [PATCH 3/5] fixed issues with description component --- src/app/page.tsx | 3 +-- src/components/home/description.tsx | 15 ++++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index fd47028..739ab7c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -2,11 +2,10 @@ import Description from "@/components/home/description"; const Home = () => { return ( -
+
); diff --git a/src/components/home/description.tsx b/src/components/home/description.tsx index 32a4dbe..49feb5c 100644 --- a/src/components/home/description.tsx +++ b/src/components/home/description.tsx @@ -1,28 +1,25 @@ import Image from "next/image"; -import React from "react"; +import Chart from "@/public/assets/chartimage.webp"; interface DescriptionProps { title: string; description: string; - image: string; } -const Description = ({ title, description, image }: DescriptionProps) => { +const Description = ({ title, description }: DescriptionProps) => { return ( -
+
{title}
{description}
-
+
description-image
Date: Fri, 24 Jan 2025 11:10:38 -0800 Subject: [PATCH 4/5] fixed formatting --- package-lock.json | 9 ++++----- package.json | 2 +- src/app/page.tsx | 2 +- tailwind.config.ts | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c341c4..35be809 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "acm-ucr-static-website", "version": "0.1.0", "dependencies": { - "@icons-pack/react-simple-icons": "^8.0.0", + "@icons-pack/react-simple-icons": "^8.0.1", "@tanstack/react-query": "~5.53.3", "lucide-react": "~0.417.0", "next": "~14.2.10", @@ -222,10 +222,9 @@ } }, "node_modules/@icons-pack/react-simple-icons": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@icons-pack/react-simple-icons/-/react-simple-icons-8.0.0.tgz", - "integrity": "sha512-bqCd5BCxVKaYbO5JjeKIpVFm8WnoEBnsiRrXhnFki8uNI1iThD6olWuNF9KnLxTCNxcOQsE3/spIvW5qyh8ooQ==", - "license": "MIT", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@icons-pack/react-simple-icons/-/react-simple-icons-8.0.1.tgz", + "integrity": "sha512-lCdPSp+EFJKDabwQ16pQsTJKViwGa8naoYAnL0IpxQvl7E1CeQ7Z84BbJWhIustrrdNIZwcyuKg+ClPi7BXFWw==", "peerDependencies": { "react": "^16.13 || ^17 || ^18" } diff --git a/package.json b/package.json index e3f4ab3..143123d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "prepare": "husky install" }, "dependencies": { - "@icons-pack/react-simple-icons": "^8.0.0", + "@icons-pack/react-simple-icons": "^8.0.1", "@tanstack/react-query": "~5.53.3", "lucide-react": "~0.417.0", "next": "~14.2.10", diff --git a/src/app/page.tsx b/src/app/page.tsx index 5f4b31e..7da5d5d 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -13,4 +13,4 @@ const Home = () => { ); }; -export default Home; \ No newline at end of file +export default Home; diff --git a/tailwind.config.ts b/tailwind.config.ts index f35891c..9fa26d8 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -13,4 +13,4 @@ module.exports = { }, }, plugins: [], -}; \ No newline at end of file +}; From af902ac5d7959a2208ee2da2574b46d76095701a Mon Sep 17 00:00:00 2001 From: Jacob <110055706+frog187man@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:51:30 -0800 Subject: [PATCH 5/5] responsified description component to match figma --- src/components/home/description.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/home/description.tsx b/src/components/home/description.tsx index 49feb5c..5cd6b8d 100644 --- a/src/components/home/description.tsx +++ b/src/components/home/description.tsx @@ -8,28 +8,28 @@ interface DescriptionProps { const Description = ({ title, description }: DescriptionProps) => { return ( -
-
+
+
{title}
-
+
{description}
description-image