diff --git a/src/app/(noneditor)/notes/new/page.tsx b/src/app/(noneditor)/notes/new/page.tsx
new file mode 100644
index 0000000..7ee0104
--- /dev/null
+++ b/src/app/(noneditor)/notes/new/page.tsx
@@ -0,0 +1,17 @@
+import { redirect } from "next/navigation";
+import { createNote } from "@/lib/notes";
+
+export default async function NewNote() {
+ const noteId = await createNote();
+
+ if (noteId) {
+ redirect(`/notes/${noteId}`);
+ }
+
+ return (
+
+ Failed to create a new note!
+ Please, try again.
+
+ );
+}
diff --git a/src/app/(noneditor)/notes/page.tsx b/src/app/(noneditor)/notes/page.tsx
index 359cd30..995951b 100644
--- a/src/app/(noneditor)/notes/page.tsx
+++ b/src/app/(noneditor)/notes/page.tsx
@@ -1,14 +1,27 @@
import { Metadata } from "next";
+import { getNotes } from "@/lib/notes";
+import NoteCard from "@/components/NoteCard";
export const metadata: Metadata = {
title: "Notes - Rhyme",
- description: "View, create and edit your notes",
+ description: "View and edit your notes",
};
-export default function Notes() {
+export default async function Notes() {
+ const notes = await getNotes();
+
return (
-
-
Notes
-
+ <>
+
Notes
+ {notes ? (
+ notes.length > 0 ? (
+ notes.map((note) =>
)
+ ) : (
+
You don't have any saved notes!
+ )
+ ) : (
+
Failed to get notes! Please, try again.
+ )}
+
);
}
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index d52903f..23b3468 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -4,7 +4,7 @@ import { logOut } from "@/app/actions";
import { getAuth } from "@/lib/auth";
import HeaderButton from "./HeaderButton";
-export default async function Header({ showToolbar = false }: { showToolbar?: boolean }) {
+export default async function Header({ allowExport = false }: { allowExport?: boolean }) {
const auth = await getAuth();
return (
@@ -24,7 +24,7 @@ export default async function Header({ showToolbar = false }: { showToolbar?: bo
)}
- {showToolbar &&
} />}
+ {allowExport &&
} />}
diff --git a/src/components/NoteCard.tsx b/src/components/NoteCard.tsx
new file mode 100644
index 0000000..479fad9
--- /dev/null
+++ b/src/components/NoteCard.tsx
@@ -0,0 +1,25 @@
+import Link from "next/link";
+import { revalidatePath } from "next/cache";
+import { X } from "lucide-react";
+import { notesTable } from "@/lib/db/schema";
+import { deleteNote } from "@/lib/notes";
+import IconOnlyButton from "./ui/IconOnlyButton";
+
+export default function NoteCard({ note }: { note: typeof notesTable.$inferSelect }) {
+ const handleDeleteNote = async () => {
+ "use server";
+ await deleteNote(note.id);
+ revalidatePath("/notes");
+ }
+
+ return (
+
+
+
{note.name}
+ Creation date: {note.creationTime.toString()}
+ Last time edited: {note.lastEdited.toString()}
+
+ } onClick={handleDeleteNote} />
+
+ );
+}
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index d27d71d..77487ec 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,4 +1,7 @@
import { cookies } from "next/headers";
+import { eq } from "drizzle-orm";
+import { usersTable } from "./db/schema";
+import { db } from "./db";
import jwt from "jsonwebtoken";
export async function getAuth() {
@@ -9,5 +12,17 @@ export async function getAuth() {
}
const decodedToken = jwt.decode(token) as jwt.JwtPayload;
- return { username: decodedToken.sub };
+ const username = decodedToken.sub;
+ if (!username) {
+ return null;
+ }
+
+ const users = await db.select()
+ .from(usersTable)
+ .where(eq(usersTable.username, username));
+ if (users.length === 0) {
+ return null;
+ }
+
+ return users[0];
}
diff --git a/src/lib/db/schema.ts b/src/lib/db/schema.ts
index a3dee1b..fa05a09 100644
--- a/src/lib/db/schema.ts
+++ b/src/lib/db/schema.ts
@@ -1,26 +1,41 @@
-import { pgTable, integer, json, varchar } from "drizzle-orm/pg-core";
+import { pgTable, json, varchar, timestamp, uuid } from "drizzle-orm/pg-core";
import { relations } from "drizzle-orm";
export const usersTable = pgTable("users", {
- id: integer().primaryKey().generatedAlwaysAsIdentity(),
+ id: uuid().primaryKey().defaultRandom(),
username: varchar({ length: 50 }).notNull().unique(),
password: varchar().notNull(),
});
export const usersRelations = relations(usersTable, ({ many }) => ({
- blocks: many(blocksTable),
+ notes: many(notesTable),
}));
-export const blocksTable = pgTable("blocks", {
- id: integer().primaryKey().generatedAlwaysAsIdentity(),
- tag: varchar({ length: 100 }).notNull().default(""),
- lines: json().notNull().default([]),
- authorId: integer(),
+export const notesTable = pgTable("notes", {
+ id: uuid().primaryKey().defaultRandom(),
+ name: varchar({ length: 50 }).notNull().default("Untitled"),
+ creationTime: timestamp().notNull().defaultNow(),
+ lastEdited: timestamp().notNull().defaultNow(),
+ authorId: uuid(),
});
-export const blocksRelations = relations(blocksTable, ({ one }) => ({
+export const notesRelations = relations(notesTable, ({ one }) => ({
author: one(usersTable, {
- fields: [blocksTable.authorId],
+ fields: [notesTable.authorId],
references: [usersTable.id],
}),
}));
+
+export const blocksTable = pgTable("blocks", {
+ id: uuid().primaryKey().defaultRandom(),
+ tag: varchar({ length: 100 }).notNull().default(""),
+ lines: json().notNull().default([]),
+ noteId: uuid(),
+});
+
+export const blocksRelations = relations(blocksTable, ({ one }) => ({
+ note: one(notesTable, {
+ fields: [blocksTable.noteId],
+ references: [notesTable.id],
+ }),
+}));
diff --git a/src/lib/notes.ts b/src/lib/notes.ts
new file mode 100644
index 0000000..7a095f3
--- /dev/null
+++ b/src/lib/notes.ts
@@ -0,0 +1,38 @@
+import { eq } from "drizzle-orm";
+import { notesTable } from "./db/schema";
+import { getAuth } from "./auth";
+import { db } from "./db";
+
+export async function getNotes() {
+ const auth = await getAuth();
+ if (!auth) {
+ return null;
+ }
+
+ return db.select()
+ .from(notesTable)
+ .where(eq(notesTable.authorId, auth.id));
+}
+
+export async function createNote() {
+ const auth = await getAuth();
+ if (!auth) {
+ return null;
+ }
+
+ const note = await db
+ .insert(notesTable)
+ .values({ authorId: auth.id })
+ .returning({ id: notesTable.id });
+
+ return note[0].id;
+}
+
+export async function deleteNote(noteId: string) {
+ const auth = await getAuth();
+ if (!auth) {
+ return null;
+ }
+
+ await db.delete(notesTable).where(eq(notesTable.id, noteId));
+}
diff --git a/src/middleware.ts b/src/middleware.ts
deleted file mode 100644
index 6839fa2..0000000
--- a/src/middleware.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import { getAuth } from "./lib/auth";
-
-export async function middleware(request: NextRequest) {
- const auth = await getAuth();
-
- if (auth) {
- return NextResponse.next();
- } else {
- return NextResponse.redirect(new URL("/auth", request.url));
- }
-}
-
-export const config = {
- matcher: "/notes/:path*",
-};