Merge branch 'dev' into aboutpageupdate

ScilifelabDataCentre · May 20, 2024 · 94a233f · 94a233f
2 parents e27fec2 + 9a87528
commit 94a233f
Show file tree

Hide file tree

Showing 12 changed files with 372 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@
 
 /pmp-frontend-app/npm-debug.log*
 pmp-frontend-app/public/.DS_Store
+
+/react-app
diff --git a/pmp-frontend-app/package-lock.json b/pmp-frontend-app/package-lock.json
diff --git a/pmp-frontend-app/package.json b/pmp-frontend-app/package.json
@@ -11,8 +11,10 @@
   },
   "dependencies": {
     "@jonkoops/matomo-tracker-react": "^0.7.0",
+    "axios": "^1.6.8",
     "daisyui": "^4.7.3",
     "js-cookie": "^3.0.5",
+    "lato-font": "^3.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-google-recaptcha": "^3.1.0",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@

		/pmp-frontend-app/npm-debug.log*
		pmp-frontend-app/public/.DS_Store

		/react-app