rebasing is stupid

3 years ago · 72c2c5fb53
parent 1c69ccab23
commit 72c2c5fb53
5 changed files with 80 additions and 79 deletions
--- a/app/forum/page.js
+++ b/app/forum/page.js
@ -1,6 +1,26 @@
+import getItems from "./getItems";
+
 export default async function Page({ children }) {
+    const resultList = await getItems;
    return (
-        <h1>
-        </h1>
+        <div>
+            <h1>hi</h1>
+            <div>
+                {resultList.items.map((item, i) => (
+                    <div key={i}>
+                        // Show all things which you want
+                        <br/>
+                        {i}
+                        <br/>
+                        {item.title}
+                        <br/>
+                        {i}
+                        <br/>
+                        {item.description}
+                    </div>
+                ))
+                }
+            </div>
+        </div>
    );
 }
--- a/app/globals.css
+++ b/app/globals.css
@ -33,6 +33,12 @@ nav {
  padding-right: 3rem;
 }

+.social {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
@media (prefers-color-scheme: dark) {
  html {
    color-scheme: dark;
--- a/app/layout.js
+++ b/app/layout.js
@ -6,7 +6,10 @@ import './globals.css';
 export default function RootLayout({ children }) {
    return (
        <html>
-      <head></head>
+        <head>
+            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.2.0/css/fork-awesome.min.css"
+                  integrity="sha256-XoaMnoYC5TH6/+ihMEnospgm0J1PM/nioxbOUdnM8HY=" crossOrigin="anonymous"/>
+        </head>
        <body>
        <main>
            <nav>
@ -28,6 +31,14 @@ export default function RootLayout({ children }) {
                <Link href="contact">
                    Kontakt
                </Link>
+                <div className="social">
+                    <Link href="https://discord.gg/S763kufxCF">
+                        <i className="fa fa-discord-alt fa-2x" aria-hidden="true"></i>
+                    </Link>
+                    <Link href="https://git.emperorpenguin.dev/Alex/Saachen_lu">
+                        <i className="fa fa-gitea fa-2x" aria-hidden="true"></i>
+                    </Link>
+                </div>
            </nav>
            <div>
                {children}
--- a/app/page.js
+++ b/app/page.js
@ -1,39 +1,6 @@
-import PocketBase from "pocketbase";
-
-async function getItems() {
-    const client = new PocketBase('https://backend.saachen.lu');
-    const adminAuthData = await client.admins.authViaEmail(process.env.USERNAME, process.env.PASSWORD);
-//console.log(adminAuthData);
-    const resultList = await client.records.getList('forums', 1, 50, {
-        filter: 'created >= "2022-01-01 00:00:00"',
-    });
-    console.log(resultList);
-    return resultList;
-}
-
 export default async function Page({ children }) {
-    const resultList = await getItems();
    return(
-        <div>
-            <h1>hi</h1>
-            <div>
-                {resultList.items.map((item, i) => (
-                    <div key={i}>
-                        // Show all things which you want
-                        <br/>
-                        {i}
-                        <br/>
-                        {item.title}
-                        <br/>
-                        {i}
-                        <br/>
-                        {item.description}
-                    </div>
-                ))
-                }
-            </div>
-        </div>
+        <h1>
+        </h1>
    );
 }
-
-export default Page;
--- a/app/user/[slug]/page.js
+++ b/app/user/[slug]/page.js
@ -1,9 +1,6 @@
-export default function Page({ params, searchParams }: {
+export default function Page({ params, searchParams }) {
    // /blog/hello-world => { params: { slug: 'hello-world' } }
    // /blog/hello-world?id=123 => { searchParams: { id: '123' } }
-    params: { slug: string },
-    searchParams: { id: string },
-}) {
    return (
        <div>
            <p>{params.slug}</p>