Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added FETCH_HEAD
Empty file.
6 changes: 6 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ dist-ssr
*.njsproj
*.sln
*.sw?
node_modules
dist
.env
*.d.ts.map
*.js.map
server/uploads/
4 changes: 2 additions & 2 deletions client/src/components/layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) {
Expand Down
25 changes: 25 additions & 0 deletions deploy/update.sh
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions server/.gitignore
Original file line number Diff line number Diff line change
@@ -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/
2 changes: 0 additions & 2 deletions server/prisma/seed.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion server/prisma/seed.d.ts.map

This file was deleted.

37 changes: 0 additions & 37 deletions server/prisma/seed.js

This file was deleted.

1 change: 0 additions & 1 deletion server/prisma/seed.js.map

This file was deleted.

7 changes: 3 additions & 4 deletions server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -34,7 +34,6 @@

// Recommended Options
"strict": true,
"jsx": "react-jsx",
"verbatimModuleSyntax": true,
"isolatedModules": true,
"noUncheckedSideEffectImports": true,
Expand Down