From 463841192be99ebd899c860e0cf54f150ee1c4ec Mon Sep 17 00:00:00 2001 From: Matilde Beate Segui Lund Date: Thu, 1 Oct 2026 11:54:14 +0200 Subject: [PATCH 1/2] Fiks tsconfig outDir/exclude, fjern committede build-filer, rett .env-format --- FETCH_HEAD | 0 client/.gitignore | 6 ++++++ server/.gitignore | 7 ++++--- server/prisma/seed.d.ts | 2 -- server/prisma/seed.d.ts.map | 1 - server/prisma/seed.js | 37 ------------------------------------- server/prisma/seed.js.map | 1 - 7 files changed, 10 insertions(+), 44 deletions(-) create mode 100644 FETCH_HEAD delete mode 100644 server/prisma/seed.d.ts delete mode 100644 server/prisma/seed.d.ts.map delete mode 100644 server/prisma/seed.js delete mode 100644 server/prisma/seed.js.map diff --git a/FETCH_HEAD b/FETCH_HEAD new file mode 100644 index 0000000..e69de29 diff --git a/client/.gitignore b/client/.gitignore index a547bf3..a97ad56 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -22,3 +22,9 @@ dist-ssr *.njsproj *.sln *.sw? +node_modules +dist +.env +*.d.ts.map +*.js.map +server/uploads/ diff --git a/server/.gitignore b/server/.gitignore index 126419d..18dbe89 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,5 +1,6 @@ node_modules -# Keep environment variables out of version control +dist .env - -/src/generated/prisma +*.d.ts.map +*.js.map +server/uploads/ diff --git a/server/prisma/seed.d.ts b/server/prisma/seed.d.ts deleted file mode 100644 index 0986b1c..0000000 --- a/server/prisma/seed.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export {}; -//# sourceMappingURL=seed.d.ts.map \ No newline at end of file diff --git a/server/prisma/seed.d.ts.map b/server/prisma/seed.d.ts.map deleted file mode 100644 index c1a0e0b..0000000 --- a/server/prisma/seed.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["seed.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/server/prisma/seed.js b/server/prisma/seed.js deleted file mode 100644 index 68c9546..0000000 --- a/server/prisma/seed.js +++ /dev/null @@ -1,37 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const client_1 = require("@prisma/client"); -const prisma = new client_1.PrismaClient(); -async function main() { - const tagPasta = await prisma.tag.upsert({ where: { name: 'vegetar' }, update: {}, create: { name: 'vegetar' } }); - const user = await prisma.user.create({ - data: { name: 'Test Testesen', email: 'testesen@eksempel.no' }, - }); - await prisma.recipe.create({ - data: { - title: "Pesto Pasta", - description: "beste studentmiddagen vi har", - prepTimeMinutes: 15, - servings: 1, - category: 'middag', - status: 'PUBLISHED', - authorId: user.id, - tags: { connect: [{ id: tagPasta.id }] }, - ingredients: { - create: [ - { name: 'Pasta', amount: 200, unit: 'g', order: 1 }, - { name: 'Pesto', amount: 0.5, unit: 'stk', order: 2 }, - ], - }, - steps: { - create: [ - { order: 1, instruction: 'Kok opp vann og ha i pasta når det koker. følg koketid på pakka' }, - { order: 2, instruction: 'Ha ferdigkokt pasta i en bolle og ha over et halvt glass pesto, bland sammen' }, - { order: 3, instruction: 'Spis yummy pasta.' } - ], - }, - }, - }); -} -main().finally(() => prisma.$disconnect()); -//# sourceMappingURL=seed.js.map \ No newline at end of file diff --git a/server/prisma/seed.js.map b/server/prisma/seed.js.map deleted file mode 100644 index 657d5b6..0000000 --- a/server/prisma/seed.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"seed.js","sourceRoot":"","sources":["seed.ts"],"names":[],"mappings":";;AAAA,2CAA8C;AAC9C,MAAM,MAAM,GAAG,IAAI,qBAAY,EAAE,CAAC;AAElC,KAAK,UAAU,IAAI;IACf,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAC,EAAC,CAAC,CAAC;IAEhH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAClC,IAAI,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,sBAAsB,EAAE;KACjE,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QACvB,IAAI,EAAE;YACF,KAAK,EAAE,aAAa;YACpB,WAAW,EAAE,8BAA8B;YAC3C,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAC,CAAC,EAAC;YACtC,WAAW,EAAE;gBACT,MAAM,EAAE;oBACJ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAC;oBAClD,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAC;iBACvD;aACJ;YAED,KAAK,EAAE;gBACH,MAAM,EAAE;oBACJ,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,iEAAiE,EAAC;oBAC3F,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,8EAA8E,EAAC;oBACxG,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAC;iBAChD;aACJ;SACJ;KACJ,CAAC,CAAC;AAEP,CAAC;AAED,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC"} \ No newline at end of file From 641da811ab81eccffbc8ea7a8475c6a19dc5f87f Mon Sep 17 00:00:00 2001 From: Matilde Beate Segui Lund Date: Thu, 1 Oct 2026 12:17:23 +0200 Subject: [PATCH 2/2] Legg til oppdateringsskript for VM --- client/src/components/layout/Header.tsx | 4 ++-- deploy/update.sh | 25 +++++++++++++++++++++++++ server/tsconfig.json | 7 +++---- 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100755 deploy/update.sh diff --git a/client/src/components/layout/Header.tsx b/client/src/components/layout/Header.tsx index 1851963..be81eb8 100644 --- a/client/src/components/layout/Header.tsx +++ b/client/src/components/layout/Header.tsx @@ -24,11 +24,11 @@ function navLinkClass({ isActive }: { isActive: boolean }) { const buttonBase = `whitespace-nowrap rounded-medium px-3 py-2 text-sm font-body transition-colors ${focusRing}`; // Hovedknapp, understreket når siden er aktiv -function newRecipeClass({ isActive }: { isActive: boolean }) { +/*function newRecipeClass({ isActive }: { isActive: boolean }) { const base = `${buttonBase} bg-primary text-background hover:bg-primary-hover`; return isActive ? `${base} underline underline-offset-4` : base; -} +}*/ // underknapp, fylt når siden er aktiv function userClass({ isActive }: { isActive: boolean }) { diff --git a/deploy/update.sh b/deploy/update.sh new file mode 100755 index 0000000..1e03b59 --- /dev/null +++ b/deploy/update.sh @@ -0,0 +1,25 @@ +#!/bin/bash +set -e + +cd /var/www/prosjekt2 + +echo "Henter nyeste kode..." +git checkout main +git pull origin main + +echo "Bygger backend..." +cd server +npm install +npx prisma migrate deploy +npm run build + +echo "Restarter backend..." +sudo systemctl restart prosjekt2-backend + +echo "Bygger frontend..." +cd ../client +npm install +npm run build + +echo "Ferdig! Sjekk status:" +sudo systemctl status prosjekt2-backend --no-pager diff --git a/server/tsconfig.json b/server/tsconfig.json index af7d4ec..a8f8c99 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -2,14 +2,14 @@ // Visit https://aka.ms/tsconfig to read more about this file "compilerOptions": { // File Layout - // "rootDir": "./src", - // "outDir": "./dist", + "rootDir": "./src", + "outDir": "./dist", // Environment Settings // See also https://aka.ms/tsconfig/module "module": "nodenext", "target": "esnext", - "types": [], + "types": ["node"], // For nodejs: // "lib": ["esnext"], // "types": ["node"], @@ -34,7 +34,6 @@ // Recommended Options "strict": true, - "jsx": "react-jsx", "verbatimModuleSyntax": true, "isolatedModules": true, "noUncheckedSideEffectImports": true,