Skip to content

Commit

Permalink
Ran prettier using npm to format files
Browse files Browse the repository at this point in the history
  • Loading branch information
Yeetomeister committed Mar 29, 2024
1 parent 74b7971 commit edb0d68
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 110 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
## My sideproject website

Made by me, to learn:

- Next.js
- Typescript
- TailWindCSS
- Vercel
- Vercel
20 changes: 19 additions & 1 deletion public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
{"name":"Trym Site","short_name":"Trym","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
{
"name": "Trym Site",
"short_name": "Trym",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
8 changes: 2 additions & 6 deletions src/app/components/HTBandTHMlinks.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
export function ProjectList() {
return (
<div>

</div>
)
}
return <div></div>;
}
34 changes: 18 additions & 16 deletions src/app/components/navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import Link from "next/link";

export function Navigation() {
return (
<div className="flex justify-center">
<nav className="flex gap-4 text-center">
<Link href="/">
<a className="text-emerald-950 hover:text-blue-200">Hjem</a>
</Link>
<Link href="/my-links">
<a className="text-emerald-950 hover:text-blue-200">Link to my HTB, THM, GitHub and LinkedIn</a>
</Link>
<Link href="/my-projects">
<a className="text-emerald-950 hover:text-blue-200">My projects</a>
</Link>
</nav>
</div>
);
}
return (
<div className="flex justify-center">
<nav className="flex gap-4 text-center">
<Link href="/">
<a className="text-emerald-950 hover:text-blue-200">Hjem</a>
</Link>
<Link href="/my-links">
<a className="text-emerald-950 hover:text-blue-200">
Link to my HTB, THM, GitHub and LinkedIn
</a>
</Link>
<Link href="/my-projects">
<a className="text-emerald-950 hover:text-blue-200">My projects</a>
</Link>
</nav>
</div>
);
}
52 changes: 26 additions & 26 deletions src/app/components/project-list.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
export function ProjectList() {
return (
<div>
<h2 className="text-2xl mb-4">Mine prosjekter:</h2>
<ul className="pl-4 list-disc space-y-4">
<li>
<h3 className="text-lg">Tetris</h3>
<p className="text-sm">Semesteroppgave jeg hadde i INF101</p>
</li>
<li>
<h3 className="text-lg">TowerDefense</h3>
<p className="text-sm">Semesteroppgave jeg hadde i INF101</p>
</li>
<li>
<h3 className="text-lg">TowerDefense i libGDX</h3>
<p className="text-sm">Oppgave i INF112</p>
</li>
<li>
<h3 className="text-lg">Egen hjemmeside</h3>
<p className="text-sm">
En nettside jeg laget på workshop med echo Webkom
</p>
</li>
</ul>
</div>
)
}
return (
<div>
<h2 className="text-2xl mb-4">Mine prosjekter:</h2>
<ul className="pl-4 list-disc space-y-4">
<li>
<h3 className="text-lg">Tetris</h3>
<p className="text-sm">Semesteroppgave jeg hadde i INF101</p>
</li>
<li>
<h3 className="text-lg">TowerDefense</h3>
<p className="text-sm">Semesteroppgave jeg hadde i INF101</p>
</li>
<li>
<h3 className="text-lg">TowerDefense i libGDX</h3>
<p className="text-sm">Oppgave i INF112</p>
</li>
<li>
<h3 className="text-lg">Egen hjemmeside</h3>
<p className="text-sm">
En nettside jeg laget på workshop med echo Webkom
</p>
</li>
</ul>
</div>
);
}
26 changes: 13 additions & 13 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Metadata } from "next";
import "./globals.css";
import Head from 'next/head';
import Head from "next/head";

export const metadata: Metadata = {
title: "Trym",
Expand All @@ -12,17 +12,17 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<>
<Head>
<title>{metadata.title as string}</title>
<link rel="manifest" href="/site.webmanifest"/>
</Head>
<html lang="no">
<body>
{/* <Navigation /> */}
{children}
</body>
</html>
</>
<>
<Head>
<title>{metadata.title as string}</title>
<link rel="manifest" href="/site.webmanifest" />
</Head>
<html lang="no">
<body>
{/* <Navigation /> */}
{children}
</body>
</html>
</>
);
}
22 changes: 11 additions & 11 deletions src/app/my-links/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {ProjectList} from "@/app/components/project-list";
import {Navigation} from "@/app/components/navigation";
import { ProjectList } from "@/app/components/project-list";
import { Navigation } from "@/app/components/navigation";
export default function MyLinks() {
return (
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 via-purple-500 to-pink-500">
<div className="max-w-screen-sm mx-auto text-lg flex flex-col gap-6 py-24">
<Navigation />
<h2 className="text-2xl text-gray-100 mb-4">My links:</h2>
</div>
</div>
);
}
return (
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 via-purple-500 to-pink-500">
<div className="max-w-screen-sm mx-auto text-lg flex flex-col gap-6 py-24">
<Navigation />
<h2 className="text-2xl text-gray-100 mb-4">My links:</h2>
</div>
</div>
);
}
24 changes: 12 additions & 12 deletions src/app/my-projects/page.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import {ProjectList} from "@/app/components/project-list";
import {Navigation} from "@/app/components/navigation";
import { ProjectList } from "@/app/components/project-list";
import { Navigation } from "@/app/components/navigation";

export default function Projects() {
return (
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 via-purple-500 to-pink-500">
<div className="max-w-screen-sm mx-auto text-lg flex flex-col gap-6 py-24">
<Navigation />
<h2 className="text-2xl text-gray-100 mb-4">Mine prosjekter</h2>
<ProjectList/>
</div>
</div>
);
}
return (
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 via-purple-500 to-pink-500">
<div className="max-w-screen-sm mx-auto text-lg flex flex-col gap-6 py-24">
<Navigation />
<h2 className="text-2xl text-gray-100 mb-4">Mine prosjekter</h2>
<ProjectList />
</div>
</div>
);
}
48 changes: 24 additions & 24 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
import {ProjectList} from "@/app/components/project-list";
import {Navigation} from "@/app/components/navigation";
import { ProjectList } from "@/app/components/project-list";
import { Navigation } from "@/app/components/navigation";

export default function Home() {
return (
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 from-10% via-sky-500 via-30% to-emerald-500 to-90%">
<Header />
<br/>
<div className="flex-grow">
<Navigation />
</div>
<Footer />
<div className="flex flex-col min-h-screen bg-gradient-to-b from-indigo-500 from-10% via-sky-500 via-30% to-emerald-500 to-90%">
<Header />
<br />
<div className="flex-grow">
<Navigation />
</div>
<Footer />
</div>
);

function Header() {
return (
<div>
<h1 className="text-4xl flex-grow text-center">Velkommen</h1>
</div>
);
}
function Header() {
return (
<div>
<h1 className="text-4xl flex-grow text-center">Velkommen</h1>
</div>
);
}

function Footer() {
return (
<div>
<p className="text-center p-4">Made by Trym, as a hobby project</p>
</div>
);
}
}
function Footer() {
return (
<div>
<p className="text-center p-4">Made by Trym, as a hobby project</p>
</div>
);
}
}

0 comments on commit edb0d68

Please sign in to comment.