diff --git a/README.md b/README.md
index 53eeec3809a970bf8b7d5796e14c5b0dca3781f1..2543f94e1f637a83f6744aca23dd53cd317e7ebf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-# GnpIS Plant Data Search
-
-GnpIS Plant Data Search *aka* legacy Unified Interface.
+# FAIDARE: FAIR Data-finder for Agronomic Research
+This application provides web services (based on the BrAPI standard) and a web interface with easy to use filters to facilitates the access to plant datasets from a federation of sources.
## How to contribute
diff --git a/frontend/README.md b/frontend/README.md
index 4e60923d7a316f366a71be512fde43538005e7cb..8bfa0289109d3bcf4e9986830c04a17fd7a5f9b0 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -1,4 +1,4 @@
-# GnpIS Plant Data Search Frontend
+# FAIDARE Frontend
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.6.
diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index 6631a05f3fedee885595808de83c850fe874cb6f..c790a3b889fa8884559d1863ebf02ba5e22cbf4b 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -1,7 +1,4 @@
<faidare-navbar></faidare-navbar>
-<div class="alert alert-warning text-center mb-4" role="alert">
-This is a <b>beta</b> application. Please <a href="mailto:urgi-contact@inra.fr" class="alert-link" style="text-decoration: underline">contact us</a> for any comments
-</div>
<div class="container">
<faidare-error></faidare-error>
<router-outlet></router-outlet>
diff --git a/frontend/src/app/navbar/navbar.component.html b/frontend/src/app/navbar/navbar.component.html
index 0f8b7fc4b98483cbef0eb65782b9d262c336e115..c73c9936076ec7247dbbb45565a0c54753436508 100644
--- a/frontend/src/app/navbar/navbar.component.html
+++ b/frontend/src/app/navbar/navbar.component.html
@@ -1,7 +1,7 @@
<nav class="navbar navbar-expand-md navbar-dark py-0 mb-4">
<div class="container px-0">
<a class="navbar-brand d-flex align-items-center mr-0 px-2" routerLink="/">
- <img src="assets/logo.png" alt="Logo" title="{{ navbar.title }}" height="60px"/>
+ <img src="{{ navbar.logo }}" alt="{{ navbar.name }} logo" title="{{ navbar.title }}" height="60px"/>
</a>
<button class="navbar-toggler" type="button" (click)="toggleNavbar()">
<span class="fa fa-bars"></span>
@@ -41,5 +41,9 @@
</li>
</ul>
</div>
+ <a class="navbar-brand d-flex align-items-center"
+ [href]="navbar.contributor.url" target="_blank">
+ <img src="{{ navbar.contributor.logo }}" alt="{{ navbar.contributor.name }} logo" height="60px"/>
+ </a>
</div>
</nav>
diff --git a/frontend/src/app/navbar/navbar.component.spec.ts b/frontend/src/app/navbar/navbar.component.spec.ts
index fcf7415f980fdb1d6db5bea9908cc7ca591a5b65..f057050e98ffbcf31e95a70ad1bf31ab4b370bfb 100644
--- a/frontend/src/app/navbar/navbar.component.spec.ts
+++ b/frontend/src/app/navbar/navbar.component.spec.ts
@@ -54,16 +54,23 @@ describe('NavbarComponent', () => {
const component = tester.componentInstance;
component.navbar = {
- title: 'GnpIS Plant Data Search',
+ name: 'FAIDARE',
+ title: 'FAIR Data-finder for Agronomic REsearch',
+ logo: 'assets/logo.png',
links: [
{ label: 'INRA', url: 'http://www.inra.fr/' },
{ label: 'URGI', url: 'https://urgi.versailles.inra.fr/' }
- ]
+ ],
+ contributor: {
+ name: 'Elixir',
+ url: 'https://elixir-europe.org/',
+ logo: 'assets/elixir_logo.png'
+ }
};
tester.detectChanges();
- expect(tester.logo.attr('title')).toBe('GnpIS Plant Data Search');
+ expect(tester.logo.attr('title')).toBe('FAIR Data-finder for Agronomic REsearch');
expect(tester.links.length).toBe(2);
diff --git a/frontend/src/app/result-page/result-page.component.html b/frontend/src/app/result-page/result-page.component.html
index f13586e7f3332d7be2ae1920c267e29ad7e11b95..33af7dba8452df68e639529a3fb5f94739febc85 100644
--- a/frontend/src/app/result-page/result-page.component.html
+++ b/frontend/src/app/result-page/result-page.component.html
@@ -1,5 +1,6 @@
-<div class="row justify-content-end">
+<h3 align="center" class="mb-4">FAIDARE: FAIR Data-finder for Agronomic REsearch</h3>
+<div class="row justify-content-end">
<!-- Column for form -->
<div class="col-lg-9">
<!-- Reset all button -->
diff --git a/frontend/src/assets/faidare/elixir_logo.png b/frontend/src/assets/faidare/elixir_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..723f989aff5ad9f5d6da4c31ada0f39e58344afa
Binary files /dev/null and b/frontend/src/assets/faidare/elixir_logo.png differ
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 5c875b419bbf487516f93bc5d709287e00af57b3..40182d5c257916bf63319c173222d9fcd08c2adb 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -2,7 +2,9 @@
export const environment = {
production: false,
navbar: {
- title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
+ name: 'FAIDARE',
+ title: 'FAIR Data-finder for Agronomic REsearch',
+ logo: 'assets/logo.png',
links: [
{
label: 'URGI',
@@ -18,6 +20,11 @@ export const environment = {
{ label: 'VIB', url: 'http://pippa.psb.ugent.be' },
{ label: 'IBET', url: 'https://biodata.pt' }
- ]
+ ],
+ contributor: {
+ name: 'Elixir',
+ url: 'https://elixir-europe.org/',
+ logo: 'assets/elixir_logo.png'
+ }
}
};
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 45ed45631fbef8033422655a030635c6ffed0aad..8119eb8da069748c92a9ab95a19bef1909a37826 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -5,7 +5,9 @@
export const environment = {
production: false,
navbar: {
- title: 'FAIDARE : FAIR Data-finder for Agronomic REsearch',
+ name: 'FAIDARE',
+ title: 'FAIR Data-finder for Agronomic REsearch',
+ logo: 'assets/logo.png',
links: [
{
label: 'URGI',
@@ -21,7 +23,12 @@ export const environment = {
{ label: 'VIB', url: 'http://pippa.psb.ugent.be' },
{ label: 'IBET', url: 'https://biodata.pt' }
- ]
+ ],
+ contributor: {
+ name: 'Elixir',
+ url: 'https://elixir-europe.org/',
+ logo: 'assets/elixir_logo.png'
+ }
}
};
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 9ff8eaa8140346f1909964e45cb0de8222fc5e72..1fc845f584a1a28f6d5554c6dd1160a30fc47e8d 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>GnpIS Plant Data Search</title>
+ <title>FAIDARE</title>
<base href="./">
<meta name="viewport" content="width=device-width, initial-scale=1">