From 97fa055dbfb0d14241ae226de330727849dbd616 Mon Sep 17 00:00:00 2001
From: CrisTofani <cri.tofani@gmail.com>
Date: Wed, 6 Jun 2018 11:42:33 +0200
Subject: [PATCH] Minor fixes on URL, Github Issue #250

---
 public/css/custom.css                   |  4 ++++
 src/components/Footer/Public/Footer.js  | 12 ++++++------
 src/components/Header/Public/Header.js  |  6 +++---
 src/views/Public/Notizie/NotizieList.js |  2 +-
 src/views/Public/Team/Team.js           |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 9e63d02b..020b3e1b 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -552,6 +552,10 @@
         .upper-header h6 {
           /*margin-left:22px;*/ } }
 
+.upper-header a{
+  text-decoration: underline;
+}
+
 .main-header {
     height: 124px;
     background-color: var(--primary);
diff --git a/src/components/Footer/Public/Footer.js b/src/components/Footer/Public/Footer.js
index 7555af4b..930fe0fd 100644
--- a/src/components/Footer/Public/Footer.js
+++ b/src/components/Footer/Public/Footer.js
@@ -23,15 +23,15 @@ class Footer extends Component {
             <div className="col-12 col-sm-3">
               <h4 className="text-white font-weight-bold mb-3">Open data in Italia</h4>
               <ul className="list-group list-group-flush">
-                <li className="list-group-item bg-footer"><a href="">Il catalogo nazionale</a></li>
-                <li className="list-group-item bg-footer"><a href="">Tipologie</a></li>
-                <li className="list-group-item bg-footer"><a href="">Qualità</a></li>
-                <li className="list-group-item bg-footer"><a href="#/private">Faq</a></li>                
+                <li className="list-group-item bg-footer"><Link to={'/dataset/list'}>Il catalogo dei dataset</Link></li>
+                <li className="list-group-item bg-footer"><Link to={'/userstory/list'}>Le storie</Link></li>
+                <li className="list-group-item bg-footer"><Link to={'/notizie'}>Notizie</Link></li>
+                <li className="list-group-item bg-footer"><Link to={'/partecipa'}>Partecipa</Link></li>                
               </ul>
             </div>
           </div>
           <div className="row">
-            <div className="col-12 col-sm-3">
+            {/* <div className="col-12 col-sm-3">
               <h4 className="text-white font-weight-bold mb-3">Open data in Italia</h4>
               <ul className="list-group list-group-flush">
                 <li className="list-group-item bg-footer"><a href="">Il catalogo nazionale</a></li>
@@ -39,7 +39,7 @@ class Footer extends Component {
                 <li className="list-group-item bg-footer"><a href="">Qualità</a></li>
                 <li className="list-group-item bg-footer"><a href="#/private">Faq</a></li>                
               </ul>
-            </div>
+            </div> */}
             <div className="col-12 col-sm-3">
               <h4 className="text-white font-weight-bold mb-3">Seguici su</h4>
               <ul className="list-group list-group-flush">
diff --git a/src/components/Header/Public/Header.js b/src/components/Header/Public/Header.js
index 34006cbb..686d13fd 100644
--- a/src/components/Header/Public/Header.js
+++ b/src/components/Header/Public/Header.js
@@ -130,7 +130,7 @@ class Header extends Component {
       <div className={"app-header " + jsscrolled}>
         <div className="upper-header">
           <div className="container">
-            <h6 className="mx-5 px-1 mb-0">Agid + Team Digitale</h6>
+            <h6 className="mx-5 px-1 mb-0"><a className="text-white" href="https://www.agid.gov.it/">Agid</a> + <a href="https://teamdigitale.governo.it/" className="text-white">Team Digitale</a></h6>
           </div>
         </div>
         <div className="main-header container">
@@ -154,8 +154,8 @@ class Header extends Component {
               <div className="h-100 row">
                 <p className="d-sm-down-none text-white mr-3">Seguici su</p>
                 {/* <a className="social-button bg-white rounded-circle text-center mx-1 py-1"><i className="fab fa-facebook-f"/></a> */}
-                <a className="d-sm-down-none social-button bg-white rounded-circle text-center mx-1 py-1" href={properties.twitterURL}><i className="fab fa-twitter"/></a>
-                <a className="d-sm-down-none social-button bg-white rounded-circle text-center mx-1 py-1" href={properties.mediumURL}><i className="fab fa-medium-m"/></a>
+                <a className="d-sm-down-none social-button bg-white rounded-circle text-center mx-1 py-1" href={properties.twitterURL} target="_blank"><i className="fab fa-twitter"/></a>
+                <a className="d-sm-down-none social-button bg-white rounded-circle text-center mx-1 py-1" href={properties.mediumURL} target="_blank"><i className="fab fa-medium-m"/></a>
                 <div className="row col-12 px-4" style={{height: '56px'}}>
                   <button className={(this.state.search ? "btn-accento":"btn-header")+" h-100 btn"} style={{width: '56px'}} onClick={this.openSearch.bind(this)}><i className="fa fa-search fa-lg" /></button>
                     {localStorage.getItem('token')?
diff --git a/src/views/Public/Notizie/NotizieList.js b/src/views/Public/Notizie/NotizieList.js
index 2beec508..3b982ca9 100644
--- a/src/views/Public/Notizie/NotizieList.js
+++ b/src/views/Public/Notizie/NotizieList.js
@@ -13,7 +13,7 @@ class NotizieList extends Component {
     componentDidMount(){
         // ORIG URL  https://medium.com/feed/team-per-la-trasformazione-digitale
         // FINAL URL https://datipubblici.daf.teamdigitale.it/dati-gov/medium/medium.com/feed/team-per-la-trasformazione-digitale
-        let url = serviceurl.apiMedium + this.props.properties.mediumURL
+        let url = serviceurl.apiMedium + this.props.properties.notizieURL
         this.load(url);
     }
 
diff --git a/src/views/Public/Team/Team.js b/src/views/Public/Team/Team.js
index 479cfaa4..347fc3c3 100644
--- a/src/views/Public/Team/Team.js
+++ b/src/views/Public/Team/Team.js
@@ -13,7 +13,7 @@ class Team extends Component{
         <div className="row mt-4">
           <div className="col-8">
             <h5 className="">
-            Il progetto nasce da un’iniziativa del Team per la Trasformazione Digitale in collaborazione con l’Agenzia per l’Italia Digitale della Presidenza del Consiglio dei Ministri. 
+            Il progetto nasce da un’iniziativa del <a href="https://teamdigitale.governo.it/" target="_blank" className="text-primary">Team per la Trasformazione Digitale</a> in collaborazione con <a href="https://www.agid.gov.it/" target="_blank" className="text-primary">l’Agenzia per l’Italia Digitale</a> della Presidenza del Consiglio dei Ministri. 
             Lo sviluppo delle varie componenti software utilizzate nel Dataportal è avvenuto grazie anche al supporto di:
             </h5>
             <ul className="my-4">