From 9fc500bb2017c7408cc7117c52708dbfcddd5514 Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@gmail.com>
Date: Wed, 6 Oct 2021 12:18:23 +0200
Subject: [PATCH] chore: Update links to more information about GW moral goods

---
 lib/displayElement.js       | 31 ++++++++++++++++++++++---------
 pages/listOfMoralGoods.json | 26 +++++++++++++++++---------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/lib/displayElement.js b/lib/displayElement.js
index 1d6a29a..04ff366 100644
--- a/lib/displayElement.js
+++ b/lib/displayElement.js
@@ -3,16 +3,29 @@ import React from "react";
 let capitalizeFirstLetter = (string) =>  string.charAt(0).toUpperCase() + string.slice(1)
 
 export function DisplayElement({element}){
-    let otherkeys = Object.keys(element).filter(key => key!="name" && key!="url" && key != "id")
+    let otherkeys = Object.keys(element).filter(key => key!="name" && key!="url" && key != "id" && key != "isReferenceValue")
     let othervalues = otherkeys.map(key => element[key])
     let otherpairs = otherkeys.map((key,i) => ({key: capitalizeFirstLetter(key), value: othervalues[i]}))
-        
-    return(
-        <div>
-            <a href={element.url} target="_blank">
+    
+    if(element.url){
+        return(
+            <div>
+                {/*<a href={element.url} target="_blank">*/}
+                    <h2>{`${element.name}`}</h2>
+                {/*</a>*/}
+                {otherpairs.map(pair => <p key={pair.value}>{`${pair.key}: ${pair.value}`}</p>)}
+                <p>
+                <a href={element.url} target="_blank">More info</a>
+                </p>
+            </div>
+        )
+    }else{
+        return(
+            <div>
                 <h2>{`${element.name}`}</h2>
-            </a>
-            {otherpairs.map(pair => <p key={pair.value}>{`${pair.key}: ${pair.value}`}</p>)}
-        </div>
-    )
+                {otherpairs.map(pair => <p key={pair.value}>{`${pair.key}: ${pair.value}`}</p>)}
+            </div>
+        )
+    }
+    
 }
\ No newline at end of file
diff --git a/pages/listOfMoralGoods.json b/pages/listOfMoralGoods.json
index 5d5f26a..f62aa9c 100644
--- a/pages/listOfMoralGoods.json
+++ b/pages/listOfMoralGoods.json
@@ -1,29 +1,37 @@
 [
   {
     "name": "Doubling consumption for one person for one year",
-    "note": "(at fairly low levels of wealth)",
-    "isReferenceValue": true
+    "note": "at fairly low levels of wealth",
+    "isReferenceValue": true,
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A5:E5"
   },
   {
-    "name": "Averting the death of an individual under 5 from malaria"
+    "name": "Averting the death of an individual under 5 from malaria",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A8:T8"
   },
   {
-    "name": "Averting the death of an individual 5 or older from malaria"
+    "name": "Averting the death of an individual 5 or older from malaria",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A9:T9"
   },
   {
     "name": "Averting the death of a 6- to 59-month-old child",
-    "note": "(through Vitamin A Supplementation)"
+    "note": "through Vitamin A Supplementation",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A10:T10"
   },
   {
-    "name": "Averting the death of an individual under 5 from vaccine-preventable diseases"
+    "name": "Averting the death of an individual under 5 from vaccine-preventable diseases",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A11:T11"
   },
   {
-    "name": "Averting the death of an individual 5-14 years old from vaccine-preventable diseases"
+    "name": "Averting the death of an individual 5-14 years old from vaccine-preventable diseases",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A12:T12"
   },
   {
-    "name": "Averting the death of an individual 15-49 years old from vaccine-preventable diseases"
+    "name": "Averting the death of an individual 15-49 years old from vaccine-preventable diseases",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A13:T13"
   },
   {
-    "name": "Averting the death of an individual 50-74 years old from vaccine-preventable diseases"
+    "name": "Averting the death of an individual 50-74 years old from vaccine-preventable diseases",
+    "url": "https://docs.google.com/spreadsheets/d/11HsJLpq0Suf3SK_PmzzWpK1tr_BTd364j0l3xVvSCQw/edit#gid=1362437801&range=A14:T14"
   }
 ]