From 438cde0ab82cf9fdbdcbb45e0ad8e43efc3525bb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 31 Mar 2019 17:40:44 +0200 Subject: hide pdf --- client/chart/pie.charts.js | 5 ++++- client/index.js | 4 ++-- client/map/index.js | 8 ++++---- scraper/client/paper/paper.verify.js | 14 ++++++++++---- site/assets/css/applets.css | 12 +++++++++++- site/public/about/faq/index.html | 11 +++++------ site/public/about/press/index.html | 7 +++---- site/public/about/privacy/index.html | 7 +++---- site/public/about/terms/index.html | 7 +++---- 9 files changed, 45 insertions(+), 30 deletions(-) diff --git a/client/chart/pie.charts.js b/client/chart/pie.charts.js index 6e579537..84e85c3a 100644 --- a/client/chart/pie.charts.js +++ b/client/chart/pie.charts.js @@ -17,6 +17,7 @@ class PieCharts extends Component { render() { const { payload } = this.props const { paper, citations } = payload.data + console.log(this.props) if (!citations.length) return null const countries = {} @@ -83,9 +84,10 @@ class PieCharts extends Component { } }} size={{ - height: 336, + height: countryRows.length < 4 ? 316 : 336, }} /> + {paper.name}{' dataset citations by country'}
+ {paper.name}{' dataset citations by organization type'}
) diff --git a/client/index.js b/client/index.js index 5c8bc880..5a7315b5 100644 --- a/client/index.js +++ b/client/index.js @@ -87,9 +87,9 @@ function runApplets() { if (dataset === 'index.html') { dataset = path.pop() } - console.log('dataset from path:', dataset) + // console.log('dataset from path:', dataset) } else { - console.log('not on a dataset page') + // console.log('not on a dataset page') return [el, payload] } } diff --git a/client/map/index.js b/client/map/index.js index 9ca43867..475ba3c6 100644 --- a/client/map/index.js +++ b/client/map/index.js @@ -104,10 +104,10 @@ export default function append(el, payload) { let citationsByAddress = {} citations.forEach(citation => { if (!citation.addresses) { - console.log(citation) + // console.log(citation) return } - console.log(citation) + // console.log(citation) citation.addresses.forEach(address => { if (!(address.name in citationsByAddress)) { citationsByAddress[address.name] = { address, citations: []} @@ -118,7 +118,7 @@ export default function append(el, payload) { Object.keys(citationsByAddress).map(name => { const { citations: citationList, address: citationAddress } = citationsByAddress[name] - console.log(name, citationsByAddress[name]) + // console.log(name, citationsByAddress[name]) // console.log(citation) const latlng = [citationAddress.lat, citationAddress.lng].map(n => parseFloat(n)) if (Number.isNaN(latlng[0]) || Number.isNaN(latlng[1])) return @@ -135,7 +135,7 @@ export default function append(el, payload) { addArc(map, source, latlng, style) }) - console.log(paper) + // console.log(paper) const rootMarker = addMarker(map, source, [paper]) rootMarker.openPopup() diff --git a/scraper/client/paper/paper.verify.js b/scraper/client/paper/paper.verify.js index 83eb5b44..fcebac02 100644 --- a/scraper/client/paper/paper.verify.js +++ b/scraper/client/paper/paper.verify.js @@ -60,6 +60,7 @@ class PaperVerify extends Component { ...initialState, ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), } this.setState(newState) } else if (verify && !verify.loading && verify.paper && (!oldPaper || oldPaper !== verify.paper)) { @@ -70,6 +71,7 @@ class PaperVerify extends Component { ...initialState, ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), } this.setState(newState) } else { @@ -79,6 +81,7 @@ class PaperVerify extends Component { newState = { ...citationState, ...address.paper, + pdfIndex: citationState.citations.pdf.findIndex(el => el.pdf.match(/^http:/)), uses_dataset: paper.uses_dataset, images_in_paper: paper.images_in_paper, verified_by: paper.verified_by, @@ -156,7 +159,7 @@ class PaperVerify extends Component { if (citationIndex < 0) { history.push('/paper/' + key + '/info/') } else { - let nextId = citations[citationIndex].id + let nextId = sortedCitations[citationIndex].id history.push('/paper/' + key + '/verify/' + nextId) } } @@ -172,10 +175,10 @@ class PaperVerify extends Component { history.push('/paper/' + key + '/info/') } else { citationIndex += 1 - if (citationIndex >= citations.length) { + if (citationIndex >= sortedCitations.length) { history.push('/paper/' + key + '/info/') } else { - let nextId = citations[citationIndex].id + let nextId = sortedCitations[citationIndex].id history.push('/paper/' + key + '/verify/' + nextId) } } @@ -414,7 +417,10 @@ class PaperVerify extends Component { >{'Next >'} -