From c0141456f7874648ffae85394ed72c8115b04ff1 Mon Sep 17 00:00:00 2001 From: Quin Gill <152361186+qhgill@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:04:15 -0700 Subject: [PATCH 1/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b35e3ee..f83dfe6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![Next.js](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white) ![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white) ![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white) -![Figma](https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white) +![Figma](https://www.figma.com/design/1cHysMjmD4gsDNpxdckci2/UCR-HEARTS-JASMINE-TRINH-(own)?node-id=0-1&t=xpygIvPHLzmLtlXD-1)
![ESLint](https://img.shields.io/badge/ESLint-4B3263?style=for-the-badge&logo=eslint&logoColor=white) ![Prettier](https://img.shields.io/badge/prettier-1A2C34?style=for-the-badge&logo=prettier&logoColor=F7BA3E) @@ -11,7 +11,7 @@ ## Figma -[ACM UCR Website Template Figma Design File](https://www.figma.com/) +[UCR Hearts Figma Design File](https://www.figma.com/design/1cHysMjmD4gsDNpxdckci2/UCR-HEARTS-JASMINE-TRINH-(own)?node-id=0-1&t=xpygIvPHLzmLtlXD-1) ## Node.js From 150c7b0346e6238fadf08afe8b8b86829e3d45af Mon Sep 17 00:00:00 2001 From: Quin Gill <152361186+qhgill@users.noreply.github.com> Date: Sat, 21 Sep 2024 13:05:43 -0700 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f83dfe6..8a7225e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![Next.js](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white) ![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white) ![TailwindCSS](https://img.shields.io/badge/tailwindcss-%2338B2AC.svg?style=for-the-badge&logo=tailwind-css&logoColor=white) -![Figma](https://www.figma.com/design/1cHysMjmD4gsDNpxdckci2/UCR-HEARTS-JASMINE-TRINH-(own)?node-id=0-1&t=xpygIvPHLzmLtlXD-1) +![Figma](https://img.shields.io/badge/figma-%23F24E1E.svg?style=for-the-badge&logo=figma&logoColor=white)
![ESLint](https://img.shields.io/badge/ESLint-4B3263?style=for-the-badge&logo=eslint&logoColor=white) ![Prettier](https://img.shields.io/badge/prettier-1A2C34?style=for-the-badge&logo=prettier&logoColor=F7BA3E) From 2dab96a942a5b3298934cd18d9e4269684bbd8d1 Mon Sep 17 00:00:00 2001 From: Shing Hung <123037099+ysh0305@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:25:41 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a7225e..2b90f83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ACM UCR Website Template +# UCR HEARTS Website Template ![Next.js](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white) ![TypeScript](https://img.shields.io/badge/typescript-%23007ACC.svg?style=for-the-badge&logo=typescript&logoColor=white) From 8f37d6c6b5dc336f9e3159c663c0955014382b47 Mon Sep 17 00:00:00 2001 From: Shing Hung Date: Sat, 21 Sep 2024 14:40:53 -0700 Subject: [PATCH 4/5] setup --- src/app/about/page.tsx | 19 +++++++++++++++++++ src/app/boards/page.tsx | 12 ++++++++++++ src/app/committee/page.tsx | 9 +++++++++ src/app/events/page.tsx | 9 +++++++++ src/app/gallery/page.tsx | 9 +++++++++ src/app/layout.tsx | 14 ++++++++++---- src/app/page.tsx | 10 ++++++++-- src/components/Footer.tsx | 5 +++++ src/components/Navigation.tsx | 5 +++++ src/components/Title.tsx | 5 +++++ src/components/about/AboutTitle.tsx | 5 +++++ src/components/about/Description.tsx | 5 +++++ src/components/about/Experience.tsx | 5 +++++ src/components/about/Mentorship.tsx | 5 +++++ src/components/about/ToDo.tsx | 5 +++++ src/components/about/ToDos.tsx | 11 +++++++++++ src/components/boards/Board.tsx | 5 +++++ src/components/boards/BoardMembers.tsx | 11 +++++++++++ src/components/home/Join.tsx | 5 +++++ src/components/home/Landing.tsx | 5 +++++ src/components/home/Review.tsx | 5 +++++ src/components/home/Reviews.tsx | 11 +++++++++++ 22 files changed, 169 insertions(+), 6 deletions(-) create mode 100644 src/app/about/page.tsx create mode 100644 src/app/boards/page.tsx create mode 100644 src/app/committee/page.tsx create mode 100644 src/app/events/page.tsx create mode 100644 src/app/gallery/page.tsx create mode 100644 src/components/Footer.tsx create mode 100644 src/components/Navigation.tsx create mode 100644 src/components/Title.tsx create mode 100644 src/components/about/AboutTitle.tsx create mode 100644 src/components/about/Description.tsx create mode 100644 src/components/about/Experience.tsx create mode 100644 src/components/about/Mentorship.tsx create mode 100644 src/components/about/ToDo.tsx create mode 100644 src/components/about/ToDos.tsx create mode 100644 src/components/boards/Board.tsx create mode 100644 src/components/boards/BoardMembers.tsx create mode 100644 src/components/home/Join.tsx create mode 100644 src/components/home/Landing.tsx create mode 100644 src/components/home/Review.tsx create mode 100644 src/components/home/Reviews.tsx diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx new file mode 100644 index 0000000..bcfb465 --- /dev/null +++ b/src/app/about/page.tsx @@ -0,0 +1,19 @@ +import AboutTitle from "@/components/about/AboutTitle"; +import Experience from "@/components/about/Experience"; +import ToDos from "@/components/about/ToDos"; +import Description from "@/components/about/Description"; +import Mentorship from "@/components/about/Mentorship"; + +const About = () => { + return ( +
+ + + + + +
+ ); +}; + +export default About; diff --git a/src/app/boards/page.tsx b/src/app/boards/page.tsx new file mode 100644 index 0000000..058c3ca --- /dev/null +++ b/src/app/boards/page.tsx @@ -0,0 +1,12 @@ +import Title from "@/components/Title"; +import BoardMembers from "@/components/boards/BoardMembers"; +const Boards = () => { + return ( +
+ + <BoardMembers /> + </div> + ); +}; + +export default Boards; diff --git a/src/app/committee/page.tsx b/src/app/committee/page.tsx new file mode 100644 index 0000000..ba8f2da --- /dev/null +++ b/src/app/committee/page.tsx @@ -0,0 +1,9 @@ +const Committee = () => { + return ( + <div className="flex w-screen flex-col items-center"> + <p>Committee</p> + </div> + ); +}; + +export default Committee; diff --git a/src/app/events/page.tsx b/src/app/events/page.tsx new file mode 100644 index 0000000..aa985b2 --- /dev/null +++ b/src/app/events/page.tsx @@ -0,0 +1,9 @@ +const Events = () => { + return ( + <div className="flex w-screen flex-col items-center"> + <p>Events</p> + </div> + ); +}; + +export default Events; diff --git a/src/app/gallery/page.tsx b/src/app/gallery/page.tsx new file mode 100644 index 0000000..b66a8ec --- /dev/null +++ b/src/app/gallery/page.tsx @@ -0,0 +1,9 @@ +const Gallery = () => { + return ( + <div className="flex w-screen flex-col items-center"> + <p>Gallery</p> + </div> + ); +}; + +export default Gallery; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 89f4c4e..458e6e7 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,12 +1,16 @@ import "./globals.css"; import { Inter } from "next/font/google"; import { ReactQueryClientProvider } from "@/utils/react-query"; +import Navigation from "@/components/Navigation"; +import Footer from "@/components/Footer"; -const inter = Inter({ subsets: ["latin"] }); +const inter = Inter({ + subsets: ["latin"], +}); export const metadata = { - title: "Create Next App", - description: "Generated by create next app", + title: "UCR HEARTS Website", + description: "The official health club at UCR.", }; type LayoutProps = { @@ -16,8 +20,10 @@ type LayoutProps = { export default function RootLayout({ children }: LayoutProps) { return ( <html lang="en"> - <body className={inter.className}> + <body className={`min-h-screen ${inter.className} `}> + <Navigation /> <ReactQueryClientProvider>{children}</ReactQueryClientProvider> + <Footer /> </body> </html> ); diff --git a/src/app/page.tsx b/src/app/page.tsx index db7393c..1902507 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,7 +1,13 @@ +import Landing from "@/components/Title"; +import Join from "@/components/home/Join"; +import Reviews from "@/components/home/Reviews"; + const Home = () => { return ( - <div className="flex h-screen w-screen items-center justify-center"> - Hello World + <div className="flex w-screen flex-col items-center"> + <Landing /> + <Join /> + <Reviews /> </div> ); }; diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx new file mode 100644 index 0000000..bffa65c --- /dev/null +++ b/src/components/Footer.tsx @@ -0,0 +1,5 @@ +const Footer = () => { + return <div className="absolute bottom-0 w-screen">Footer</div>; +}; + +export default Footer; diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx new file mode 100644 index 0000000..db6b18d --- /dev/null +++ b/src/components/Navigation.tsx @@ -0,0 +1,5 @@ +const Navigation = () => { + return <div className="fixed w-screen">Navigation</div>; +}; + +export default Navigation; diff --git a/src/components/Title.tsx b/src/components/Title.tsx new file mode 100644 index 0000000..235367c --- /dev/null +++ b/src/components/Title.tsx @@ -0,0 +1,5 @@ +const Title = () => { + return <div className="">Title</div>; +}; + +export default Title; diff --git a/src/components/about/AboutTitle.tsx b/src/components/about/AboutTitle.tsx new file mode 100644 index 0000000..8c97bf4 --- /dev/null +++ b/src/components/about/AboutTitle.tsx @@ -0,0 +1,5 @@ +const AboutTitle = () => { + return <div className="">AboutTitle</div>; +}; + +export default AboutTitle; diff --git a/src/components/about/Description.tsx b/src/components/about/Description.tsx new file mode 100644 index 0000000..46c51de --- /dev/null +++ b/src/components/about/Description.tsx @@ -0,0 +1,5 @@ +const Description = () => { + return <div className="">Description</div>; +}; + +export default Description; diff --git a/src/components/about/Experience.tsx b/src/components/about/Experience.tsx new file mode 100644 index 0000000..d083db4 --- /dev/null +++ b/src/components/about/Experience.tsx @@ -0,0 +1,5 @@ +const Experience = () => { + return <div className="">Experience</div>; +}; + +export default Experience; diff --git a/src/components/about/Mentorship.tsx b/src/components/about/Mentorship.tsx new file mode 100644 index 0000000..9f5d0cf --- /dev/null +++ b/src/components/about/Mentorship.tsx @@ -0,0 +1,5 @@ +const Mentorship = () => { + return <div className="">Mentorship</div>; +}; + +export default Mentorship; diff --git a/src/components/about/ToDo.tsx b/src/components/about/ToDo.tsx new file mode 100644 index 0000000..a0f5a28 --- /dev/null +++ b/src/components/about/ToDo.tsx @@ -0,0 +1,5 @@ +const ToDo = () => { + return <div className="">ToDo</div>; +}; + +export default ToDo; diff --git a/src/components/about/ToDos.tsx b/src/components/about/ToDos.tsx new file mode 100644 index 0000000..3b910f9 --- /dev/null +++ b/src/components/about/ToDos.tsx @@ -0,0 +1,11 @@ +import ToDo from "./ToDo"; + +const ToDos = () => { + return ( + <div className=""> + <ToDo /> + </div> + ); +}; + +export default ToDos; diff --git a/src/components/boards/Board.tsx b/src/components/boards/Board.tsx new file mode 100644 index 0000000..6946c04 --- /dev/null +++ b/src/components/boards/Board.tsx @@ -0,0 +1,5 @@ +const Board = () => { + return <div className="">Board</div>; +}; + +export default Board; diff --git a/src/components/boards/BoardMembers.tsx b/src/components/boards/BoardMembers.tsx new file mode 100644 index 0000000..645b7c3 --- /dev/null +++ b/src/components/boards/BoardMembers.tsx @@ -0,0 +1,11 @@ +import Board from "./Board"; + +const BoardMembers = () => { + return ( + <div className=""> + <Board /> + </div> + ); +}; + +export default BoardMembers; diff --git a/src/components/home/Join.tsx b/src/components/home/Join.tsx new file mode 100644 index 0000000..3c46637 --- /dev/null +++ b/src/components/home/Join.tsx @@ -0,0 +1,5 @@ +const Join = () => { + return <div className="">Join</div>; +}; + +export default Join; diff --git a/src/components/home/Landing.tsx b/src/components/home/Landing.tsx new file mode 100644 index 0000000..189efe7 --- /dev/null +++ b/src/components/home/Landing.tsx @@ -0,0 +1,5 @@ +const Landing = () => { + return <div className="">Landing</div>; +}; + +export default Landing; diff --git a/src/components/home/Review.tsx b/src/components/home/Review.tsx new file mode 100644 index 0000000..0577f2d --- /dev/null +++ b/src/components/home/Review.tsx @@ -0,0 +1,5 @@ +const Review = () => { + return <div className="">Review</div>; +}; + +export default Review; diff --git a/src/components/home/Reviews.tsx b/src/components/home/Reviews.tsx new file mode 100644 index 0000000..0df5ec9 --- /dev/null +++ b/src/components/home/Reviews.tsx @@ -0,0 +1,11 @@ +import Review from "./Review"; + +const Reviews = () => { + return ( + <div className=""> + <Review /> + </div> + ); +}; + +export default Reviews; From df69b8cca2df2da0252087615ed23551e399559a Mon Sep 17 00:00:00 2001 From: Shing Hung <yhung022@ucr.edu> Date: Sat, 21 Sep 2024 14:43:54 -0700 Subject: [PATCH 5/5] format --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b90f83..f135dc6 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## Figma -[UCR Hearts Figma Design File](https://www.figma.com/design/1cHysMjmD4gsDNpxdckci2/UCR-HEARTS-JASMINE-TRINH-(own)?node-id=0-1&t=xpygIvPHLzmLtlXD-1) +[UCR Hearts Figma Design File](<https://www.figma.com/design/1cHysMjmD4gsDNpxdckci2/UCR-HEARTS-JASMINE-TRINH-(own)?node-id=0-1&t=xpygIvPHLzmLtlXD-1>) ## Node.js