Merge pull request #787 from research-software-directory/rsd-v2-release

RSD v2 release

.gitignore

@@ -1,7 +1,8 @@
 # SPDX-FileCopyrightText: 2021 - 2022 Dusan Mijatovic (dv4all)
 # SPDX-FileCopyrightText: 2021 - 2022 Ewan Cahen (Netherlands eScience Center) <[email protected]>
-# SPDX-FileCopyrightText: 2021 - 2022 Netherlands eScience Center
 # SPDX-FileCopyrightText: 2021 - 2022 dv4all
+# SPDX-FileCopyrightText: 2021 - 2023 Netherlands eScience Center
+# SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -52,3 +53,4 @@ yarn-error.log*
 
 # typescript
 *.tsbuildinfo
+.history

.vscode/settings.json

@@ -1,43 +1,30 @@
 {
-  // required to indicate that eslint project is not in the root
+  // ESLint
   "eslint.workingDirectories": [
     "./frontend",
   ],
-  // FORMAT ON SAVE for VSC
-  // based on this acticle https://www.aleksandrhovhannisyan.com/blog/format-code-on-save-vs-code-eslint/
-  // define files to validate, can have more options
-  // but in this project we use typescript and react
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact",
-  ],
-  // it tells VScode to use eslint plugin
-  // Note! you might also need to disable Prettier or VSCode defaults
+  // Formating with ESLint:
+  "eslint.format.enable": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true,
   },
+  "[javascript][javascriptreact][typescript][typescriptreact]": {
+    "editor.tabSize": 2,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true,
+  },
   // Tailwind plugin integration
   "css.validate": false,
   "editor.quickSuggestions": {
     "strings": true
   },
-  "tailwindCSS.includeLanguages":{
+  "tailwindCSS.includeLanguages": {
     "plaintext": "html"
   },
+  // Backend
   "[java]": {
     "editor.suggest.snippetsPreventQuickSuggestions": false,
     "editor.useTabStops": true,
     "editor.insertSpaces": false,
   },
-  "java.configuration.updateBuildConfiguration": "automatic",
-  "java.test.config": {
-    "envFile": "${workspaceFolder}/.env",
-  },
-  "[typescript]": {
-    "editor.tabSize": 2,
-    "editor.insertSpaces": true,
-    "editor.detectIndentation": false
-  }
-}
+}

.vscode/settings.json.license

@@ -1,3 +1,7 @@
-SPDX-FileCopyrightText: 2022 Netherlands eScience Center
+SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2023 dv4all
 
+SPDX-License-Identifier: Apache-2.0
 SPDX-License-Identifier: CC0-1.0

Makefile

@@ -5,6 +5,7 @@
 # SPDX-FileCopyrightText: 2022 - 2023 Netherlands eScience Center
 # SPDX-FileCopyrightText: 2022 - 2023 dv4all
 # SPDX-FileCopyrightText: 2022 Jesús García Gonzalez (Netherlands eScience Center) <[email protected]>
+# SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -45,11 +46,6 @@ install: clean
 clean:
 	docker compose down --volumes
 
-
-dev:
-	docker compose up --scale scrapers=0 --detach
-	make -j 2 dev-docs dev-frontend # Run concurrently
-
 stop:
 	docker compose down
 
@@ -73,7 +69,10 @@ frontend/.env.local: .env
 	sed -i 's/POSTGREST_URL=http:\/\/backend:3500/POSTGREST_URL=http:\/\/localhost\/api\/v1/g' frontend/.env.local
 	sed -i 's/RSD_AUTH_URL=http:\/\/auth:7000/RSD_AUTH_URL=http:\/\/localhost\/auth/g' frontend/.env.local
 
-dev-frontend: frontend/.env.local
+dev: frontend/.env.local
+	docker compose build # build all services
+	docker compose up --scale data-generation=1 --scale scrapers=0 --scale frontend=0 --detach
+	# open http://localhost:3000 to see the application running
 	cd frontend && yarn dev
 
 # run end-to-end test locally

data-generation/images.js

@@ -1,29 +1,54 @@
 // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all)
 // SPDX-FileCopyrightText: 2022 dv4all
+// SPDX-FileCopyrightText: 2023 Ewan Cahen (Netherlands eScience Center) <[email protected]>
+// SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 //
 // SPDX-License-Identifier: Apache-2.0
 
-const images = [
-  'img/213x640-pexels-1262302.png',
-  'img/426x640-pexels-357573.jpg',
-  'img/480x480-pexels-54455.png',
-  'img/480x720-pexels-67552.jpg',
-  'img/640x640-pexels-940302.jpg',
-  'img/720x720-pexels-1391487.jpg',
-  'img/960x640-pexels-1391487.png',
-  'img/960x720-pexels-70842.jpg',
-  'img/1440x720-pexels-989946.jpg',
-  'img/1600x900-pexels-17609.jpg',
-  'img/1728x1080-pexels-1630588.jpg',
-  'img/1920x1080-pexels-1424246.jpg',
-  'img/1920x1200-pexels-1207875.jpg',
-  'img/1920x1200-pexels-247502.jpg',
-  'img/abacaxi-fruit-pineapple-svgrepo-com.svg',
-  'img/amoras-fruit-svgrepo-com.svg',
-  'img/bee-svgrepo-com.svg',
-  'img/hibiscus-svgrepo-com.svg',
-  'img/supportfemale-svgrepo-com.svg',
-  'img/supportmale-svgrepo-com.svg'
-]
+export const images = [
+	'img/213x640-pexels-1262302.png',
+	'img/426x640-pexels-357573.jpg',
+	'img/480x480-pexels-54455.png',
+	'img/480x720-pexels-67552.jpg',
+	'img/640x640-pexels-940302.jpg',
+	'img/720x720-pexels-1391487.jpg',
+	'img/960x640-pexels-1391487.png',
+	'img/960x720-pexels-70842.jpg',
+	'img/1440x720-pexels-989946.jpg',
+	'img/1600x900-pexels-17609.jpg',
+	'img/1728x1080-pexels-1630588.jpg',
+	'img/1920x1080-pexels-1424246.jpg',
+	'img/1920x1200-pexels-1207875.jpg',
+	'img/1920x1200-pexels-247502.jpg',
+	'img/abacaxi-fruit-pineapple-svgrepo-com.svg',
+	'img/amoras-fruit-svgrepo-com.svg',
+	'img/bee-svgrepo-com.svg',
+	'img/hibiscus-svgrepo-com.svg',
+	'img/supportfemale-svgrepo-com.svg',
+	'img/supportmale-svgrepo-com.svg'
+];
 
-export default images
+export const organisationLogos = [
+	'img/logos/AMOLF.jpg',
+	'img/logos/Amsterdamuniversitylogo.svg',
+	'img/logos/Eindhoven_University_of_Technology_logo_new.png',
+	'img/logos/Erasmus_University_Rotterdam_Stacked_logo_Colour.png',
+	'img/logos/Nikhef_logo_red-on-white.svg',
+	'img/logos/NWO_logo_-_RGB.jpg',
+	'img/logos/Radboud_Universiteit.jpg',
+	'img/logos/Sron-Logo_kleur_RGB.jpg',
+	'img/logos/UniversiteitLeidenLogo.svg'
+];
+
+export const softwareLogos = [
+	'img/software/Apache_Airavata_Logo.svg',
+	'img/software/Apache_Camel_Logo.svg',
+	'img/software/Apache_kafka.svg',
+	'img/software/Apache_Kylin_logo.svg',
+	'img/software/GNU_Compiler_Collection_logo.svg',
+	'img/software/ibis-logo.png',
+	'img/software/JavaGAT.png',
+	'img/software/manta_flipped.jpg',
+	'img/software/Tux.svg',
+	'img/software/Xenon_logo.svg'
+];

data-generation/img/1440x720-pexels-989946.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
 
-Photo by Aleksandr Slobodianyk
-https://www.pexels.com/photo/white-feathers-illustration-989946/
+Photo from unsplash
+https://unsplash.com/license
 
 SPDX-License-Identifier: CC-BY-0
-

data-generation/img/1600x900-pexels-17609.jpg.license

@@ -1,8 +1,7 @@
-SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
-SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Omran Jamal
-https://www.pexels.com/photo/egg-on-gray-stainless-steel-forks-17609/
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/1728x1080-pexels-1630588.jpg.license

@@ -1,8 +1,7 @@
-SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
-SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by John  Finkelstein
-https://www.pexels.com/photo/red-apple-1630588/
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/1920x1080-pexels-1424246.jpg.license

@@ -1,8 +1,7 @@
-SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
-SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Janez Podnar
-https://www.pexels.com/photo/photo-of-brown-house-near-mountain-1424246/
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/1920x1200-pexels-1207875.jpg.license

@@ -1,8 +1,7 @@
-SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
-SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Andre Mouton
-https://www.pexels.com/photo/closeup-photo-of-primate-1207875/
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/1920x1200-pexels-247502.jpg.license

@@ -1,8 +1,7 @@
-SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
-SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Pixabay
-https://www.pexels.com/photo/close-up-portrait-of-lion-247502/
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/213x640-pexels-1262302.png.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Rakicevic Nenad
-https://www.pexels.com/photo/man-holding-ice-cream-cone-under-cloud-1262302/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/426x640-pexels-357573.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Pixabay
-https://www.pexels.com/photo/pancake-with-honey-on-plate-357573/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/480x480-pexels-54455.png.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Pixabay
-https://www.pexels.com/photo/five-white-plates-with-different-kinds-of-dishes-54455/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/480x720-pexels-67552.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Pixabay
-https://www.pexels.com/photo/brown-giraffe-walking-on-brown-grass-67552/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/640x640-pexels-940302.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Toa Heftiba Şinca
-https://www.pexels.com/photo/black-fork-and-knife-clip-art-940302/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/720x720-pexels-1391487.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by monicore
-https://www.pexels.com/photo/photography-of-tomatoes-near-basil-leaves-1391487/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/960x640-pexels-1391487.png.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by monicore
-https://www.pexels.com/photo/photography-of-tomatoes-near-basil-leaves-1391487/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/960x720-pexels-70842.jpg.license

@@ -1,8 +1,7 @@
 SPDX-FileCopyrightText: 2021 Dusan Mijatovic (dv4all)
 SPDX-FileCopyrightText: 2021 dv4all
-
-Photo by Pixabay
-https://www.pexels.com/photo/green-chili-with-fire-70842/
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
-
+SPDX-License-Identifier: CC-BY-4.0

data-generation/img/abacaxi-fruit-pineapple-svgrepo-com.svg.license

@@ -1,4 +1,7 @@
-Image taken from svgrepo.com
-https://www.svgrepo.com/svg/429779/abacaxi-fruit-pineapple
+SPDX-FileCopyrightText: 2021 - 2023 Dusan Mijatovic (dv4all)
+SPDX-FileCopyrightText: 2021 - 2023 dv4all
+SPDX-FileCopyrightText: 2023 Dusan Mijatovic (Netherlands eScience Center)
+SPDX-FileCopyrightText: 2023 Netherlands eScience Center
 
 SPDX-License-Identifier: CC-BY-0
+SPDX-License-Identifier: CC-BY-4.0