From December 8 to December 10 the underlying cloud platform running GitLab CI jobs is being extended and thus, is unavailable. We do our best to compensate this with other resources but it might happen that you experience extended startup times for your CI jobs. Thanks for your understanding!

Unverified Commit c0942d3f authored by Jurriaan H. Spaaks's avatar Jurriaan H. Spaaks Committed by GitHub
Browse files

Merge pull request #725 from research-software-directory/release-3.0.0-prep

Release 3.0.0 prep
parents 77ffc098 3a038a62
......@@ -20,9 +20,11 @@
"pattern": "^https://doi.org/<yourdoi>$"
}, {
"pattern": "^https://github.com/research-software-directory/research-software-directory/blob/3.0.0/docs/dev.md#verifying-the-local-installation$"
}, {
"pattern": "^https://github.com/research-software-directory/research-software-directory/compare/2.0.2...3.0.0$"
}],
"replacementPatterns": [{
"pattern": "^/",
"replacement": "https://github.com/research-software-directory/research-software-directory/blob/master/"
}]
}
\ No newline at end of file
}
{
"creators": [
{
"affiliation": "Netherlands eScience Center",
"name": "Spaaks, Jurriaan H.",
"orcid": "0000-0002-7064-4069"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Klaver, Tom"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Verhoeven, Stefan",
"orcid": "0000-0002-5821-2060"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Maassen, Jason",
"orcid": "0000-0002-8172-4865"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Pawar, Pushpanjali"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Hage, Willem",
"orcid": "0000-0002-6478-3003"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Ridder, Lars",
"orcid": "0000-0002-7635-9533"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Kulik, Lode"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Bakker, Tom"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Hees, Vincent",
"orcid": "0000-0003-0182-9008"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Bogaardt, Laurens",
"orcid": "0000-0002-7712-6627"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Mendrik, Adriënne",
"orcid": "0000-0001-6631-7068"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Es, Bram"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Attema, Jisk",
"orcid": "0000-0002-0948-1176"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Ranguelova, Elena"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Nieuwpoort, Rob",
"orcid": "0000-0002-2947-9444"
}
],
"description": "The Research Software Directory is a content management system for research software. It aims to improve the findability, citability, and reproducibility of the software packages advertised in it, while enabling a qualitative assessment of their impact.",
"keywords": [
"Current Research Information Systems",
"FAIR for software",
"re-usable software",
"reproducible research",
"research software",
"CRIS",
"RSE"
],
"license": {
"id": "Apache-2.0"
},
"title": "Research Software Directory"
"creators": [
{
"affiliation": "Netherlands eScience Center",
"name": "Spaaks, Jurriaan H.",
"orcid": "0000-0002-7064-4069"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Klaver, Tom"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Verhoeven, Stefan",
"orcid": "0000-0002-5821-2060"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Diblen, Faruk",
"orcid": "0000-0002-0989-929X"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Maassen, Jason",
"orcid": "0000-0002-8172-4865"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Tjong Kim Sang, Erik",
"orcid": "0000-0002-8431-081X"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Pawar, Pushpanjali"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Meijer, Christiaan",
"orcid": "0000-0002-5529-5761"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Ridder, Lars",
"orcid": "0000-0002-7635-9533"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Kulik, Lode"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Bakker, Tom"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Hees, Vincent",
"orcid": "0000-0003-0182-9008"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Bogaardt, Laurens",
"orcid": "0000-0002-7712-6627"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Mendrik, Adriënne",
"orcid": "0000-0001-6631-7068"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Es, Bram"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Attema, Jisk",
"orcid": "0000-0002-0948-1176"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Hage, Willem",
"orcid": "0000-0002-6478-3003"
},
{
"affiliation": "Netherlands eScience Center",
"name": "Ranguelova, Elena"
},
{
"affiliation": "Netherlands eScience Center",
"name": "van Nieuwpoort, Rob",
"orcid": "0000-0002-2947-9444"
},
{
"affiliation": "Leipzig University",
"name": "Gey, Ronny",
"orcid": "0000-0003-1028-1670"
},
{
"name": "Zach, Hoskins"
}
],
"description": "The Research Software Directory is a content management system for research software. It aims to improve the findability, citability, and reproducibility of the software packages advertised in it, while enabling a qualitative assessment of their impact.",
"keywords": [
"Current Research Information Systems",
"FAIR for software",
"re-usable software",
"reproducible research",
"research software",
"CRIS",
"RSE"
],
"license": {
"id": "Apache-2.0"
},
"title": "Research Software Directory"
}
# 3.0.0 (Unreleased)
See [data migration notes](/data-migration/2.0-to-3.0/README.md).
# 3.0.0
commit comparison [2.0.2...3.0.0](https://github.com/research-software-directory/research-software-directory/compare/2.0.2...3.0.0)
- Added project page accessible through new route `/projects/<id>` and `/projects/<slug>`
- Added project index page accessible through new route `/projects`
- Added 404 error page
- Clean up and improve scss files
- Cleaned up the file structure for templates
- Improve documentation
- `docker-compose` now uses `.env` for environment variables instead of `export` command
- This version works on Windows and updated the developer documentation
- Added error messages if environment variables are undefined
- Migrated from Travis CI to GitHub Actions
- Added GitHub Superlinter
- Added OSSAR tests
- Added Markdown link checker
- Added `backend` tests
- Added `frontend` tests
- Added `harvesting` tests
- Added integration tests
- Certificate microservice is now called `https` in docker-compose.yml instead of `nginx_ssl`
- Use static docker volumes instead of
- `docker-volumes/letsencrypt`
- `docker-volumes/cert`
- Python docker containers now based on Python 3.8
- Node docker containers now use Node 14.x
- Updated security and other dependencies
- Use `Caddy` in favor of `letsencrypt`
- API changes
- removed `corporateUrl` and `principalInvestigator` from `project` collection
- `image` now uses blobs like `{data: string, mimeType: string}`
- added required properties to `project` collection
- `callUrl`
- `codeUrl`
- `dateEnd`
- `dateStart`
- `description`
- `grantId`
- `isPublished`
- `related.organizations`
- `related.projects`
- `related.software`
- `slug`
- `topics`
- `team`
- added optional properties to `project` collection
- `dataManagementPlanUrl`
- `homeUrl`
- `imageCaption`
- renamed required properties to `project` collection
- `tags` to `technologies`
- the sample data from `database/db-init` was updated to schema version 3.0.0. For notes on
how to migrate your own data, please refer to the
[data migration notes](/data-migration/2.0-to-3.0/README.md).
- the sample data also include data harvested from esciencecenter.nl/projects such as logos,
related people, related organizations, descriptive text, and a hero image; furthermore the
project start dates and end dates were added based on data from Exact.
# 2.0.2
......@@ -82,4 +138,3 @@ submodules SHAs:
# 0.0.0
First release, mostly testing the (Zenodo| GitHub) infrastructure at this point.
......@@ -16,21 +16,30 @@ authors:
family-names: Verhoeven
given-names: Stefan
orcid: "https://orcid.org/0000-0002-5821-2060"
-
affiliation: "Netherlands eScience Center"
family-names: Diblen
given-names: Faruk
orcid: "https://orcid.org/0000-0002-0989-929X"
-
affiliation: "Netherlands eScience Center"
family-names: Maassen
given-names: Jason
orcid: "https://orcid.org/0000-0002-8172-4865"
-
affiliation: "Netherlands eScience Center"
family-names: Tjong Kim Sang
given-names: Erik
orcid: "https://orcid.org/0000-0002-8431-081X"
-
affiliation: "Netherlands eScience Center"
family-names: Pawar
given-names: Pushpanjali
-
-
affiliation: "Netherlands eScience Center"
family-names: Hage
given-names: Willem
name-particle: van
orcid: "https://orcid.org/0000-0002-6478-3003"
family-names: Meijer
given-names: Christiaan
orcid: "https://orcid.org/0000-0002-5529-5761"
-
affiliation: "Netherlands eScience Center"
family-names: Ridder
......@@ -70,6 +79,12 @@ authors:
family-names: Attema
given-names: Jisk
orcid: "https://orcid.org/0000-0002-0948-1176"
-
affiliation: "Netherlands eScience Center"
family-names: Hage
given-names: Willem
name-particle: van
orcid: "https://orcid.org/0000-0002-6478-3003"
-
affiliation: "Netherlands eScience Center"
family-names: Ranguelova
......@@ -80,8 +95,16 @@ authors:
given-names: Rob
name-particle: van
orcid: "https://orcid.org/0000-0002-2947-9444"
cff-version: "1.0.3"
date-released: 2020-06-04
-
affiliation: "Leipzig University"
family-names: Gey
given-names: Ronny
orcid: "https://orcid.org/0000-0003-1028-1670"
-
family-names: Zach
given-names: Hoskins
cff-version: "1.1.0"
date-released: 2020-12-01
doi: 10.5281/zenodo.1154130
keywords:
- "Current Research Information Systems"
......@@ -95,4 +118,4 @@ license: Apache-2.0
message: "If you use this software, please cite it using these metadata."
repository-code: "https://github.com/research-software-directory/research-software-directory"
title: "Research Software Directory"
version: "2.0.2"
version: "3.0.0"
......@@ -10,6 +10,21 @@
}
}
.project-index-title {
margin-top: 5.0rem;
margin-bottom: 2.0rem;
font-size: 6.4rem;
line-height: 1.3;
@include bp(max, $tablet){
font-size: 5.4rem;
}
@include bp(max, $phablet){
font-size: 3.8rem;
line-height: 1.4;
}
}
// Introduction
// -----------------------------------
#introduction {
......@@ -550,20 +565,26 @@
// Related projects
// -----------------------------------
#related-projects, #projects-container {
#related-projects {
.container {
padding-top: 65px;
padding-bottom: 65px;
}
}
#projects-container {
.container {
padding-top: 20px;
padding-bottom: 35px;
}
}
.project-items {
display: flex;
justify-content: space-between;
.project-item {
margin-bottom: 0;
width: 50%;
@include bp(max, 767px) {
......@@ -571,23 +592,23 @@
}
&:hover {
color: $primaryColor !important;
.thumb {
transform: scale(1.03);
}
}
}
.content {
display: flex;
padding-right: 2em;
padding: 20px 20px 10px 20px;
.thumb {
transition: 0.25s ease-in;
flex-shrink: 0;
padding: 0 1em 1em 0;
width: 100px;
height: 100px;
width: 140px;
}
.text-section {
width: 100%;
}
h2 {
font-size: 2rem;
......@@ -610,23 +631,85 @@
font-size: 1.6rem;
line-height: 1.4em;
}
.gutter {
display: flex;
justify-content: space-between;
margin-top: auto;
margin-top: 1.0em;
font-size: 1.2rem;
}
.status {
text-align: right;
}
}
}
.project-card {
.project-items-index-page {
display: flex;
justify-content: space-between;
.project-item {
margin-bottom: 0;
background-color: $light;
border: 1px solid white;
width: 50%;
@include bp(max, 767px) {
width: 100%;
}
&:hover {
color: $white !important;
background-color: $dark;
.thumb {
transform: scale(1.03);
}
}
}
.content {
display: flex;
padding: 20px 20px 10px 20px;
.thumb {
transition: 0.25s ease-in;
flex-shrink: 0;
padding: 0 1em 1em 0;
width: 140px;
}
.text-section {
width: 100%;
}
h2 {
font-size: 2rem;
line-height: 1.3em;
margin-bottom: 0.2em;
font-family: $primaryFont;
}
.text {
font-family: $primaryFontLight;
font-size: 2rem;
line-height: 1.3em;
margin-bottom: 0.2em;
}
.card-text {
min-height: 8em;
}
.author {
margin-top: 0.3em;
font-family: $primaryFont;
font-size: 1.6rem;
line-height: 1.4em;
}
.gutter {
display: flex;
justify-content: space-between;
margin-top: 1.0em;
font-size: 1.2rem;
}
.status {
text-align: right;
}
}
}
// Related tools
......
......@@ -12,7 +12,7 @@
<div class="col-1-4">
</div>
<div class="col-3-4">
<h1 class="title">Projects</h1>
<h1 class="project-index-title">Projects</h1>
</div>
</div>
......@@ -35,7 +35,7 @@
</div>
<div class="col-3-4 search-bar bg-light">
<input type='text' v-model="filter.search" id="input" placeholder="Start typing here to search for project">
<input type='text' v-model="filter.search" id="input" placeholder="Start typing here to search for projects">
<div class="search-bar_button">
<svg class="icon">
<use xlink:href="{{url_for('static', filename='icons/icons.svg')}}#icon-search"></use>
......@@ -167,14 +167,16 @@
</div>
</div>
<div class="col-3-4" id="project_list">
<transition-group appear name="slide-fade" tag="div" class="row project-items">
<transition-group appear name="slide-fade" tag="div" class="row project-items-index-page">
<article v-for="project in pagedProjects" v-bind:key="project" class="project-item project-card bg-light">
<a :href="'/projects/' + (project.id)">
<div class="content">
<div class="thumb">
<img :src="'data:' + (project.image.mimeType) + ';base64,' + (project.image.data)" alt="" >
</div>
<div>
<div class="text-section">
<div class="card-text">
<h2 class="title">[[project.title]]</h2>
<p class="description">[[project.subtitle]]</p>
......@@ -184,6 +186,7 @@
<div class="status">[[project.status]]</div>
</div>
</div>
</div>
</a>
</article>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment