From 726730544bebb51cbcf9499c0dbb0a1f8da5304a Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 6 Jul 2026 13:31:31 +0200 Subject: [PATCH 1/5] Revert "Preserve newlines in material descriptions (#154)" This reverts commit c2261b25ea815a5bbe628980e20dce0c80c3c045. --- src/lib/components/PublishReview.svelte | 2 +- src/lib/components/publication/publish/Preview.svelte | 2 +- src/routes/[user]/[publication]/+page.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/PublishReview.svelte b/src/lib/components/PublishReview.svelte index 260bb0be..3400664a 100644 --- a/src/lib/components/PublishReview.svelte +++ b/src/lib/components/PublishReview.svelte @@ -38,7 +38,7 @@ {title}
- Description: {description}
+ Description: {description}
diff --git a/src/lib/components/publication/publish/Preview.svelte b/src/lib/components/publication/publish/Preview.svelte index 8735d31c..f08c5b65 100644 --- a/src/lib/components/publication/publish/Preview.svelte +++ b/src/lib/components/publication/publish/Preview.svelte @@ -23,7 +23,7 @@ {/each} -

{data.description}

+

{data.description}

{#if !isCircuit && dataMaterial}

diff --git a/src/routes/[user]/[publication]/+page.svelte b/src/routes/[user]/[publication]/+page.svelte index 6b95331b..818d44d9 100644 --- a/src/routes/[user]/[publication]/+page.svelte +++ b/src/routes/[user]/[publication]/+page.svelte @@ -507,7 +507,7 @@

Description: - {pubView.publication.description} + {pubView.publication.description}

From 7ee28c176d70358bc73f4295769613a4977f7f63 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 6 Jul 2026 13:35:14 +0200 Subject: [PATCH 2/5] Reapply "Preserve newlines in material descriptions (#154)" This reverts commit 726730544bebb51cbcf9499c0dbb0a1f8da5304a. --- src/lib/components/PublishReview.svelte | 2 +- src/lib/components/publication/publish/Preview.svelte | 2 +- src/routes/[user]/[publication]/+page.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/PublishReview.svelte b/src/lib/components/PublishReview.svelte index 3400664a..260bb0be 100644 --- a/src/lib/components/PublishReview.svelte +++ b/src/lib/components/PublishReview.svelte @@ -38,7 +38,7 @@ {title}
- Description: {description}
+ Description: {description}
diff --git a/src/lib/components/publication/publish/Preview.svelte b/src/lib/components/publication/publish/Preview.svelte index f08c5b65..8735d31c 100644 --- a/src/lib/components/publication/publish/Preview.svelte +++ b/src/lib/components/publication/publish/Preview.svelte @@ -23,7 +23,7 @@ {/each}
-

{data.description}

+

{data.description}

{#if !isCircuit && dataMaterial}

diff --git a/src/routes/[user]/[publication]/+page.svelte b/src/routes/[user]/[publication]/+page.svelte index 818d44d9..6b95331b 100644 --- a/src/routes/[user]/[publication]/+page.svelte +++ b/src/routes/[user]/[publication]/+page.svelte @@ -507,7 +507,7 @@

Description: - {pubView.publication.description} + {pubView.publication.description}

From 374e6006c8dbc364186e1c8d985246c7da015650 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 6 Jul 2026 13:36:47 +0200 Subject: [PATCH 3/5] Revert "chore: removed password and email verified fields" This reverts commit d779af1aefdf06d34b36bd9f5f6e5ac6cb599c3f. --- .../20260706112752_removed_password/migration.sql | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 prisma/migrations/20260706112752_removed_password/migration.sql diff --git a/prisma/migrations/20260706112752_removed_password/migration.sql b/prisma/migrations/20260706112752_removed_password/migration.sql deleted file mode 100644 index eab9ba90..00000000 --- a/prisma/migrations/20260706112752_removed_password/migration.sql +++ /dev/null @@ -1,10 +0,0 @@ -/* - Warnings: - - - You are about to drop the column `emailVerified` on the `User` table. All the data in the column will be lost. - - You are about to drop the column `password` on the `User` table. All the data in the column will be lost. - -*/ --- AlterTable -ALTER TABLE "User" DROP COLUMN "emailVerified", -DROP COLUMN "password"; From fcc9da97f70fd2a585aefc42d392296a80136aa7 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 6 Jul 2026 13:37:24 +0200 Subject: [PATCH 4/5] Revert "chore: removed password and email verified fields" This reverts commit 9ff23444e48815c7025c383118126f453addf3d7. --- prisma/schema.prisma | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0baa3ac0..5f0bbdfe 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -38,20 +38,22 @@ enum PublicationType { } enum PublicationEventType { - CREATE // The Genesis event of the publication - UPDATE // Every other event + CREATE // The Genesis event of the publication + UPDATE // Every other event } model User { - id String @id @default(uuid()) @db.Uuid + id String @id @default(uuid()) @db.Uuid firstName String lastName String - username String @unique @default(dbgenerated("gen_random_uuid()")) - email String @default("noemail@abv.bg") - reputation Int @default(0) - aboutMe String @default("") - platformId String @default("") - institutionId String @default("") + username String @unique @default(dbgenerated("gen_random_uuid()")) + email String @default("noemail@abv.bg") + emailVerified DateTime? // TODO: REMOVE THIS + reputation Int @default(0) + password String? // hashed password // TODO: REMOVE THIS + aboutMe String @default("") + platformId String @default("") + institutionId String @default("") saved Publication[] @relation("saved") posts Publication[] @@ -69,8 +71,8 @@ model User { replies Reply[] isAdmin Boolean @default(false) - profilePic File? @relation("ProfilePic") - courses Course[] @relation("CourseInstructors") + profilePic File? @relation("ProfilePic") + courses Course[] @relation("CourseInstructors") publicationHistory PublicationHistory[] } @@ -132,8 +134,8 @@ model Publication { } model PublicationHistory { - id String @id @default(uuid()) - createdAt DateTime @default(now()) + id String @id @default(uuid()) + createdAt DateTime @default(now()) action PublicationEventType // Optional user explanation on the change From d80db55b32855e175584c4b3dcd54ffd2d8c74ba Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 6 Jul 2026 13:54:01 +0200 Subject: [PATCH 5/5] chore: fixed width of publications in user page --- src/routes/[user]/+page.svelte | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/routes/[user]/+page.svelte b/src/routes/[user]/+page.svelte index af23e82c..a43117bb 100644 --- a/src/routes/[user]/+page.svelte +++ b/src/routes/[user]/+page.svelte @@ -126,14 +126,16 @@

So empty... There are no publications here

{:else}
- {#each cardPosts as publication, i} - x.course)} - saved={data.savedByUser.includes(publication.id)} - publisher={publication.publisher}/> - {/each} + {#each cardPosts as publication, i} +
+ x.course)} + saved={data.savedByUser.includes(publication.id)} + publisher={publication.publisher}/> +
+ {/each}
{/if} {/if}