From ce4e014acb740e7e64bcd3434f84cb2df8270d52 Mon Sep 17 00:00:00 2001 From: cirroskais Date: Tue, 30 Apr 2024 21:30:05 -0400 Subject: [PATCH] fix the thousand year old bug --- .../20240501012209_fix/migration.sql | 7 ++ prisma/schema.prisma | 70 +++++++++---------- src/routes/(app)/dashboard/+page.js | 10 --- src/routes/(app)/dashboard/+page.server.js | 13 +++- 4 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 prisma/migrations/20240501012209_fix/migration.sql delete mode 100644 src/routes/(app)/dashboard/+page.js diff --git a/prisma/migrations/20240501012209_fix/migration.sql b/prisma/migrations/20240501012209_fix/migration.sql new file mode 100644 index 0000000..be2e157 --- /dev/null +++ b/prisma/migrations/20240501012209_fix/migration.sql @@ -0,0 +1,7 @@ +-- DropIndex +DROP INDEX `Upload_fileName_key` ON `Upload`; + +-- AlterTable +ALTER TABLE `UserSettings` MODIFY `embedColor` INTEGER NOT NULL DEFAULT 0, + MODIFY `embedDescription` VARCHAR(191) NOT NULL DEFAULT 'Uploaded by {{username}} at {{time}}', + MODIFY `embedTitle` VARCHAR(191) NOT NULL DEFAULT '{{file}}'; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 15edaf2..dcd3e1d 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,56 +1,56 @@ datasource db { - provider = "mysql" - url = env("DATABASE_URL") + provider = "mysql" + url = env("DATABASE_URL") } generator client { - provider = "prisma-client-js" + provider = "prisma-client-js" } model User { - id Int @id @default(autoincrement()) - username String @unique - email String @unique - password String - createdAt DateTime @default(now()) - lastSeen DateTime @default(now()) - settings UserSettings? - // STORED AS MEGABYTES !! - maxUploadMB Int @default(100) - uploads Upload[] - sessions Session[] + id Int @id @default(autoincrement()) + username String @unique + email String @unique + password String + createdAt DateTime @default(now()) + lastSeen DateTime @default(now()) + settings UserSettings? + // STORED AS MEGABYTES !! + maxUploadMB Int @default(100) + uploads Upload[] + sessions Session[] } model Session { - id String @id @unique - user User @relation(fields: [userId], references: [id]) - userId Int + id String @id @unique + user User @relation(fields: [userId], references: [id]) + userId Int - authorized Boolean - createdAt DateTime @default(now()) - expiresAt DateTime - remoteAddress String? + authorized Boolean + createdAt DateTime @default(now()) + expiresAt DateTime + remoteAddress String? } model UserSettings { - id Int @id @default(autoincrement()) - user User @relation(fields: [userId], references: [id]) - userId Int @unique + id Int @id @default(autoincrement()) + user User @relation(fields: [userId], references: [id]) + userId Int @unique - newPostsPublic Boolean @default(false) - linkToRaw Boolean @default(false) + newPostsPublic Boolean @default(false) + linkToRaw Boolean @default(false) - embedTitle String - embedDescription String - embedColor Int + embedTitle String @default("{{file}}") + embedDescription String @default("Uploaded by {{username}} at {{time}}") + embedColor Int @default(0) } model Upload { - id String @id - uploader User @relation(fields: [uploaderId], references: [id]) - uploaderId Int + id String @id + uploader User @relation(fields: [uploaderId], references: [id]) + uploaderId Int - fileName String @unique - public Boolean @default(false) - uploaded DateTime @default(now()) + fileName String + public Boolean @default(false) + uploaded DateTime @default(now()) } diff --git a/src/routes/(app)/dashboard/+page.js b/src/routes/(app)/dashboard/+page.js deleted file mode 100644 index e14f25b..0000000 --- a/src/routes/(app)/dashboard/+page.js +++ /dev/null @@ -1,10 +0,0 @@ -/** @type {import("@sveltejs/kit").Load } */ -export function load({ fetch }) { - const statistics = fetch('/api/statistics').then((response) => response.json()); - - return { - streamed: { - statistics - } - }; -} diff --git a/src/routes/(app)/dashboard/+page.server.js b/src/routes/(app)/dashboard/+page.server.js index 60affd8..3f68899 100644 --- a/src/routes/(app)/dashboard/+page.server.js +++ b/src/routes/(app)/dashboard/+page.server.js @@ -1,4 +1,11 @@ -/** @type {import("@sveltejs/kit").Load} */ -export function load({ locals }) { - return { user: locals?.user }; +/** @type {import("@sveltejs/kit").ServerLoad} */ +export function load({ locals, fetch }) { + const statistics = fetch('/api/statistics').then((response) => response.json()); + + return { + user: locals?.user, + streamed: { + statistics + } + }; }