Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RSD v2 release #787

Merged
merged 56 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b56c538
feat: software overview page v2
dmijatovic Jun 9, 2023
6e05656
feat: add country and short description to organisation card and cons…
dmijatovic Jun 15, 2023
decd7b5
Added real organization logos to data-generation set
jmaassen Jun 16, 2023
1961c28
fix: use logos in data generation for organisations
ewan-escience Jun 16, 2023
b0a8e68
Added software logos
jmaassen Jun 19, 2023
ca53a1e
fix: use software logos in data generation
ewan-escience Jun 19, 2023
bebc7d2
fix: sometimes have no image for different entities in data generation
ewan-escience Jun 19, 2023
777c300
Fixed the licenses to properly refect owners
jmaassen Jun 22, 2023
f0ac96c
Fixed the licenses to properly refect owners
jmaassen Jun 22, 2023
caa85bf
Calculate distance between left an centered container (#918)
ctwhome Jun 23, 2023
88c9ffd
feat: organisation page v2 design implementation
dmijatovic Jun 29, 2023
6faef9c
chore: upgrade dependencies
dmijatovic Jul 3, 2023
55ee4b8
e2e: fix broken e2e test and recover lost fake api calls commit
dmijatovic Jul 4, 2023
38855ce
fix: release date, show message when no release date instead 1-1-1970
dmijatovic Jul 4, 2023
b48a258
fix: show 404 page for non-existing organisation/research unit
dmijatovic Jul 4, 2023
205ae56
chore!: bump frontend version to 2.0.0 after software,project and org…
dmijatovic Jul 4, 2023
ac53ebb
chore: clean unused imports code and files using unimported library
dmijatovic Jul 6, 2023
7282aff
fix: duplicate project entries per organisation
dmijatovic Jul 6, 2023
4467d9c
chore: add unimported lib for checking unused files/components
dmijatovic Jul 6, 2023
a417095
feat: add order on project title
dmijatovic Jul 6, 2023
3b26ec6
feat: link to software and project page with default order on mention…
dmijatovic Jul 7, 2023
ff22863
fix: group software metric values bottom right
dmijatovic Jul 11, 2023
1348ae2
ui: add Software Hightlights text
dmijatovic Jul 11, 2023
ddb733a
fix: null contributors/mentions in masonry card stats
dmijatovic Jul 11, 2023
0d639a9
chore: upgrade eslint to support latest version of typescript
dmijatovic Aug 8, 2023
b234ea7
feat: add project status filter to project overview and organisation …
dmijatovic Aug 15, 2023
807424a
chore: remove test pattern from exclude as it is automatically added …
dmijatovic Aug 15, 2023
98439d3
feat: add verified organisation badge and claim organisation button
dmijatovic Aug 15, 2023
9d64980
refactor: do not show project period component only when both date ar…
dmijatovic Aug 17, 2023
fcef64b
refactor: implement sonar suggestions in admin, projects, software, u…
dmijatovic Aug 21, 2023
776a7c3
tests: additional unit tests
dmijatovic Aug 21, 2023
739924c
chore: fix/update VSCode project settings for ESLint and formating
fembau Aug 29, 2023
aea3156
chore: fix linter warnings
fembau Aug 31, 2023
a63d635
refactor: cache login providers after intial api call
dmijatovic Aug 29, 2023
15b44f5
refactor: use more efficient mentions queries as advised in #955
dmijatovic Aug 29, 2023
75f9cb3
fix: highlight carousel cumulative layout shift when calculating firs…
dmijatovic Aug 31, 2023
22910e9
chore: upgrade fe image to use node v20 and bump fe version
dmijatovic Aug 31, 2023
41c8278
audit: increase max-age for image cache to 1yr based on lighthouse a…
dmijatovic Sep 1, 2023
4d148a5
audit: use explicit image size in cards and logos, based on lighthous…
dmijatovic Sep 1, 2023
5229105
feat: adds global announcements
cmeessen Aug 22, 2023
9a61f3f
refactor: basic announcement setup extract api calls from ui componen…
dmijatovic Aug 28, 2023
e44f6d1
test: create basic tests for announcement components
dmijatovic Aug 28, 2023
2b1a5b1
fix: font color used in admin keyword and rsd-contributors tables
dmijatovic Aug 29, 2023
621d46b
minor: remove wrong license and apply suggestions
cmeessen Sep 1, 2023
f184344
lighthouse: add arial labels to admin buttons.
dmijatovic Sep 4, 2023
718d97d
lighthouse: change csp values adviced during audit
dmijatovic Sep 4, 2023
ccf8e8b
fix: image scaling on participating organisations and software card (…
dmijatovic Sep 5, 2023
d517254
fix: software pinnen filter
dmijatovic Sep 5, 2023
1c1c8b1
fix: showing one software/project on multiple pages during the pagina…
dmijatovic Sep 5, 2023
db0ced1
fix: remove pinned order from project overview and set is as default …
dmijatovic Sep 5, 2023
d224fcc
chore: extend CSP based on audit suggestion
dmijatovic Sep 5, 2023
44b8252
refactor: only show organisation member badge, do not offer claim org…
dmijatovic Sep 5, 2023
59eb142
chore: fix linter warnings
dmijatovic Sep 5, 2023
23ad135
refactor: order programming languages by use
dmijatovic Sep 7, 2023
29cfb7d
chore: fix linter warnings
dmijatovic Sep 8, 2023
2e3767a
chore: move duplicated code into MentionEditButton (sonar audit)
dmijatovic Sep 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -52,3 +53,4 @@ yarn-error.log*

# typescript
*.tsbuildinfo
.history
35 changes: 11 additions & 24 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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
}
}
}
6 changes: 5 additions & 1 deletion .vscode/settings.json.license
Original file line number Diff line number Diff line change
@@ -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
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
71 changes: 48 additions & 23 deletions data-generation/images.js
Original file line number Diff line number Diff line change
@@ -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'
];
5 changes: 2 additions & 3 deletions data-generation/img/1440x720-pexels-989946.jpg.license
Original file line number Diff line number Diff line change
@@ -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

Binary file modified data-generation/img/1600x900-pexels-17609.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions data-generation/img/1600x900-pexels-17609.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/1728x1080-pexels-1630588.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions data-generation/img/1728x1080-pexels-1630588.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/1920x1080-pexels-1424246.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions data-generation/img/1920x1080-pexels-1424246.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/1920x1200-pexels-1207875.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions data-generation/img/1920x1200-pexels-1207875.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/1920x1200-pexels-247502.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions data-generation/img/1920x1200-pexels-247502.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/213x640-pexels-1262302.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/213x640-pexels-1262302.png.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/426x640-pexels-357573.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/426x640-pexels-357573.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/480x480-pexels-54455.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/480x480-pexels-54455.png.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/480x720-pexels-67552.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/480x720-pexels-67552.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/640x640-pexels-940302.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/640x640-pexels-940302.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/720x720-pexels-1391487.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/720x720-pexels-1391487.jpg.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/960x640-pexels-1391487.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/960x640-pexels-1391487.png.license
Original file line number Diff line number Diff line change
@@ -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
Binary file modified data-generation/img/960x720-pexels-70842.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions data-generation/img/960x720-pexels-70842.jpg.license
Original file line number Diff line number Diff line change
@@ -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
13 changes: 12 additions & 1 deletion data-generation/img/abacaxi-fruit-pineapple-svgrepo-com.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
Loading