Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(layer-info): content updates #541

Merged
merged 8 commits into from
Aug 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions data/layers-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"basemap": "ocean",
"timeFormat": {
"year": "numeric",
"month": "long"
"month": "long",
"day": "numeric"
},
"flyTo": {
"position": {
Expand Down Expand Up @@ -226,7 +227,8 @@
"basemap": "blue",
"timeFormat": {
"year": "numeric",
"month": "long"
"month": "long",
"day": "numeric"
},
"flyTo": {
"position": {
Expand All @@ -246,7 +248,8 @@
"basemap": "blue",
"timeFormat": {
"year": "numeric",
"month": "long"
"month": "long",
"day": "numeric"
},
"flyTo": {
"position": {
Expand Down
2 changes: 1 addition & 1 deletion i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dataInfo": "Data Information",
"storiesSelected": "{numberSelected, number} {numberSelected, plural, one {Story} other {Stories}} selected",
"resetFilters": "Reset Filters",
"projectDescription": "# About the project\n\nClimate from Space application for ESAs CCI program.\n\nLorem ipsum dolor, sit amet consectetur adipisicing elit. Reiciendis natus praesentium reprehenderit veritatis mollitia quisquam distinctio nihil voluptate rerum ut placeat sint tenetur, tempora facere, velit in sed. Ex, sapiente.",
"projectDescription": "# About the project\n\nThe European Space Agency (ESA) [Climate Change Initiative (CCI)](https://climate.esa.int/) programme aims to provide stable, long-term, satellite-based Essential Climate Variable (ECV) data products to the scientific community and general public. Based on Earth Observation (EO) archives that ESA together with its member states have established over the last 30 years, the CCI programme adds significant and timely contributions to the ECV databases required by United Nations Framework Convention on Climate Change ([UNFCCC](https://unfccc.int/)).\n\nESA's Climate Change initiative is organised in different themes:\n- Development of Essential Climate Variables\n- Cross-ECV scientific exploitation of the data products\n- Knowledge Exchange\n\nThe objective for Knowledge Exchange activities within CCI is to maximise awareness, access, use\nand understanding of satellite data for climate research with an emphasis on promoting the CCI\nProgramme as a whole.\n\nThe role of the Climate from Space application (this application) within those objectives is to increase the visibility of the CCI programme and the role of ESA satellite data in climate science. It addresses a general public and educational audience as well as representing ESA climate office at exhibition environments.",
"tags.nature": "Nature",
"tags.biomass": "Biomass",
"tags.university": "University",
Expand Down
37 changes: 37 additions & 0 deletions scripts/md-converter.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<html>
<head>
<title>Mark Down Converter</title>
<style>
input, textarea {
width: 80%;
}
</style>
</head>
<body>
<h1>Prepare Mark Down for config files by stringifying multiline content</h1>
Markdown:<br>
<textarea id="rawInput" cols="100" rows="30"></textarea><br>
<br>
Stringified:<br>
<input id="processedContent"/><br>
(Clicking or giving focus will copy into clipboard.)
<script>
document.getElementById('rawInput').value = '# Hello\nworld!';
document.getElementById('rawInput').focus();
document.getElementById('rawInput').select();

function copyToClipboard(){
document.getElementById('processedContent').select();
document.execCommand('copy');
console.log('copied!');
}

document.getElementById('rawInput').addEventListener('keyup', ()=> {
const rawContent = document.getElementById('rawInput').value;
document.getElementById('processedContent').value = JSON.stringify(rawContent).slice(1, -1).trim();
});
document.getElementById('processedContent').addEventListener('click', copyToClipboard);
document.getElementById('processedContent').addEventListener('focus', copyToClipboard);
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions scripts/update-metadata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Usage: ./scripts/update-metadata.sh <layerId (optional)>


version=0.6.1
version=0.7.1
workingDir="./download"
layersConfigFile="./data/layers-config.json"
layersConfigFile="../data/layers-config.json"

# take optional layer ID from command line argument
layerID=$1
Expand Down
6 changes: 4 additions & 2 deletions src/scripts/components/layers/layer-info/layer-info.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {FunctionComponent} from 'react';
import ReactMarkdown from 'react-markdown';
import ReactMarkdown from 'react-markdown/with-html';

import {LayerListItem} from '../../../types/layer-list';

Expand All @@ -17,6 +17,7 @@ const LayerInfo: FunctionComponent<Props> = ({layer}) => (
<ReactMarkdown
source={layer.description}
linkTarget="_blank"
escapeHtml={false}
allowedTypes={[
'heading',
'text',
Expand All @@ -26,7 +27,8 @@ const LayerInfo: FunctionComponent<Props> = ({layer}) => (
'emphasis',
'list',
'listItem',
'link'
'link',
'html'
]}
/>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/scripts/components/main/about-project/about-project.styl
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
display: flex
justify-content: space-between
color: $textDefault

a
color: $textColor
text-decoration: none
3 changes: 2 additions & 1 deletion src/scripts/components/main/about-project/about-project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ const AboutProject: FunctionComponent = () => {
'image',
'imageReference',
'list',
'listItem'
'listItem',
'link'
]}
/>
</div>
Expand Down
Loading