Merge pull request #285 from datasektionen/main

Merge main branch to production
datasektionen · Jan 11, 2024 · ea4c23c · ea4c23c
2 parents bd3c832 + cc928e9
commit ea4c23c
Show file tree

Hide file tree

Showing 33 changed files with 1,825 additions and 1,291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,6 @@ next-env.d.ts
 .vscode
 *.swp
 *.swo
+
+#ts
+tsconfig.tsbuildinfo
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Taken from here (with a few changes)
 # https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
 
-FROM node:18-alpine AS base
+FROM node:18-alpine3.18 AS base
 
 # Install dependencies only when needed
 FROM base AS deps

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Konglig Datasektionen
+Copyright (c) 2024 Konglig Datasektionen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,5 +38,8 @@
     "prisma": "^4.12.0",
     "tailwindcss": "^3.2.6",
     "typescript": "4.9.5"
+  },
+  "volta": {
+    "node": "18.19.0"
   }
-}
+}
diff --git a/public/img/d-dagen-logo-24-en.svg b/public/img/d-dagen-logo-24-en.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,3 +39,6 @@ next-env.d.ts @@
     .vscode
     *.swp
     *.swo
+    #ts
+    tsconfig.tsbuildinfo