Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bluesmile82 committed Nov 11, 2022
2 parents cda4e8f + 5877ef1 commit 073b6e8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
Binary file added app/javascript/app/assets/partners/unicef.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* eslint-disable max-len */
import { withProps } from 'recompose';
import { withRouter } from 'react-router';

import ndcImage from 'assets/partners/ndcp.png';
import wriImage from 'assets/partners/wri.png';
import unicefImage from 'assets/partners/unicef.png';
import worldBankImage from 'assets/partners/the-world-bank.png';
import vizzualityImage from 'assets/partners/vizzuality.png';
import ccImage from 'assets/partners/unfccc.jpg';
Expand Down Expand Up @@ -125,6 +127,15 @@ const partnershipWith = {
src: wriImage
},
description: 'manages Climate Watch in collaboration with partners.'
},
{
link: 'https://www.unicef.org/',
img: {
alt: 'UNICEF',
src: unicefImage
},
description:
'contributed to Climate Watch by providing NDC-related data based on the NDC Explorer.'
}
]
};
Expand Down
14 changes: 13 additions & 1 deletion app/javascript/app/components/footer/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
import googleImage from 'assets/partners/google.png';
import ndcImage from 'assets/partners/ndcp.png';
import wriImage from 'assets/partners/wri.png';
import unicefImage from 'assets/partners/unicef.png';
import worldBankImage from 'assets/partners/the-world-bank.png';
import ccImage from 'assets/partners/unfccc.jpg';
import gizImage from 'assets/partners/giz.png';
Expand Down Expand Up @@ -62,6 +63,15 @@ const basePartners = [
src: wriImage,
customClass: 'narrower'
}
},
{
link: 'https://www.unicef.org/',
orderingString: 'zzz',
img: {
alt: 'UNICEF',
src: unicefImage,
customClass: 'narrower'
}
}
];

Expand Down Expand Up @@ -176,7 +186,9 @@ class FooterContainer extends PureComponent {
render() {
const { isContained } = this.props;
let partners = getLogos(this.props.location.pathname);
if (isContained) { partners = partners.filter(p => p.orderingString !== 'ndc'); }
if (isContained) {
partners = partners.filter(p => p.orderingString !== 'ndc');
}

const includePartners = !location.pathname.includes('/about');
return createElement(Component, {
Expand Down

0 comments on commit 073b6e8

Please sign in to comment.