Rename GnpIS Plant Data Search in FAIDARE. Add Elixir logo in navbar. GNP-5519, #18.

ba6994a0 · Célia Michotey · Jérémy Destin · feff3ae3 · ba6994a0 · ba6994a0
Commit ba6994a0 authored May 22, 2019 by Célia Michotey Committed by Jérémy Destin Jun 05, 2019
--- a/README.md
+++ b/README.md
-# 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


--- a/frontend/README.md
+++ b/frontend/README.md
-# GnpIS Plant Data Search Frontend
+# FAIDARE Frontend

 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.6.


--- a/frontend/src/app/navbar/navbar.component.html
+++ b/frontend/src/app/navbar/navbar.component.html
 <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>
--- 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);


--- a/frontend/src/assets/faidare/elixir_logo.png
+++ b/frontend/src/assets/faidare/elixir_logo.png
--- 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'
+        }
    }
 };
--- 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'
+        }
    }
 };


--- 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">