Skip to content
Open
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
6 changes: 5 additions & 1 deletion app/(pages)/(home)/page.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import styles from "./page.module.scss"
import Test from "../_components/test";

export default function Home() {
return (
<main>
<div>Home</div>
<div className={styles.test}>Home</div>
<Test title="title" text="text"/>
</main>
);
}
2 changes: 1 addition & 1 deletion app/(pages)/(home)/page.module.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.test {
font-family: sans-serif;
font-family: "Space Grotesk";
}
8 changes: 8 additions & 0 deletions app/(pages)/_components/test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default function Test({title, text}) {
return (
<main>
<div>{title} {text}</div>
</main>
);
}

Empty file.
5 changes: 3 additions & 2 deletions app/(pages)/layout.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import "./_globals/globals.scss";
import { Oxanium } from "next/font/google";
import { Oxanium, Space_Grotesk} from "next/font/google";

export const metadata = {
title: "Space and Satellite Systems",
description: "Space and Satellite Systems club at UC Davis",
icons: "./favicon.png",
};

const spaceGrotesk = Space_Grotesk();
const oxanium = Oxanium();

export default function RootLayout({ children }) {
return (
<html lang="en">
<body className={oxanium.className}>{children}</body>
<body className={`${spaceGrotesk.className} ${oxanium.className}`}>{children}</body>
</html>
);
}