Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev #2

Merged
merged 6 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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

Expand Down
19 changes: 19 additions & 0 deletions src/app/about/page.tsx
Original file line number Diff line number Diff line change
@@ -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 (
<div className="flex w-screen flex-col items-center">
<AboutTitle />
<Experience />
<ToDos />
<Description />
<Mentorship />
</div>
);
};

export default About;
12 changes: 12 additions & 0 deletions src/app/boards/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import Title from "@/components/Title";
import BoardMembers from "@/components/boards/BoardMembers";
const Boards = () => {
return (
<div className="flex w-screen flex-col items-center">
<Title />
<BoardMembers />
</div>
);
};

export default Boards;
9 changes: 9 additions & 0 deletions src/app/committee/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Committee = () => {
return (
<div className="flex w-screen flex-col items-center">
<p>Committee</p>
</div>
);
};

export default Committee;
9 changes: 9 additions & 0 deletions src/app/events/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Events = () => {
return (
<div className="flex w-screen flex-col items-center">
<p>Events</p>
</div>
);
};

export default Events;
9 changes: 9 additions & 0 deletions src/app/gallery/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Gallery = () => {
return (
<div className="flex w-screen flex-col items-center">
<p>Gallery</p>
</div>
);
};

export default Gallery;
14 changes: 10 additions & 4 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -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 = {
Expand All @@ -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>
);
Expand Down
10 changes: 8 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -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>
);
};
Expand Down
5 changes: 5 additions & 0 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Footer = () => {
return <div className="absolute bottom-0 w-screen">Footer</div>;
};

export default Footer;
5 changes: 5 additions & 0 deletions src/components/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Navigation = () => {
return <div className="fixed w-screen">Navigation</div>;
};

export default Navigation;
5 changes: 5 additions & 0 deletions src/components/Title.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Title = () => {
return <div className="">Title</div>;
};

export default Title;
5 changes: 5 additions & 0 deletions src/components/about/AboutTitle.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const AboutTitle = () => {
return <div className="">AboutTitle</div>;
};

export default AboutTitle;
5 changes: 5 additions & 0 deletions src/components/about/Description.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Description = () => {
return <div className="">Description</div>;
};

export default Description;
5 changes: 5 additions & 0 deletions src/components/about/Experience.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Experience = () => {
return <div className="">Experience</div>;
};

export default Experience;
5 changes: 5 additions & 0 deletions src/components/about/Mentorship.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Mentorship = () => {
return <div className="">Mentorship</div>;
};

export default Mentorship;
5 changes: 5 additions & 0 deletions src/components/about/ToDo.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const ToDo = () => {
return <div className="">ToDo</div>;
};

export default ToDo;
11 changes: 11 additions & 0 deletions src/components/about/ToDos.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import ToDo from "./ToDo";

const ToDos = () => {
return (
<div className="">
<ToDo />
</div>
);
};

export default ToDos;
5 changes: 5 additions & 0 deletions src/components/boards/Board.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Board = () => {
return <div className="">Board</div>;
};

export default Board;
11 changes: 11 additions & 0 deletions src/components/boards/BoardMembers.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Board from "./Board";

const BoardMembers = () => {
return (
<div className="">
<Board />
</div>
);
};

export default BoardMembers;
5 changes: 5 additions & 0 deletions src/components/home/Join.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Join = () => {
return <div className="">Join</div>;
};

export default Join;
5 changes: 5 additions & 0 deletions src/components/home/Landing.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Landing = () => {
return <div className="">Landing</div>;
};

export default Landing;
5 changes: 5 additions & 0 deletions src/components/home/Review.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const Review = () => {
return <div className="">Review</div>;
};

export default Review;
11 changes: 11 additions & 0 deletions src/components/home/Reviews.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Review from "./Review";

const Reviews = () => {
return (
<div className="">
<Review />
</div>
);
};

export default Reviews;
Loading