Skip to content

Commit

Permalink
Merge pull request #261 from zimmerman-team/develop
Browse files Browse the repository at this point in the history
Variety of copy & URL/I changes
  • Loading branch information
stephanoshadjipetrou authored Jul 1, 2021
2 parents c6230d9 + 4e143aa commit 945f422
Show file tree
Hide file tree
Showing 25 changed files with 138 additions and 189 deletions.
14 changes: 10 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,14 @@ workflows:
group: "all tests"

- deploy:
filters:
branches:
only:
- master
requires:
- "local e2e tests"
- "checkout"
# requires:
# - "local e2e tests"

# - cypress/run:
# name: "deployed e2e tests"
Expand All @@ -100,11 +106,11 @@ workflows:
# name: Set env variables
# command: |
# if [ "${CIRCLE_BRANCH}" == "master" ]; then
# echo 'export CYPRESS_BASE_URL="https://iatidatastore.iatistandard.org"' >> $BASH_ENV
# echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV
# elif [ "${CIRCLE_BRANCH}" == "develop" ]; then
# echo 'export CYPRESS_BASE_URL="https://store.staging.iati.cloud"' >> $BASH_ENV
# echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV
# else
# echo 'export CYPRESS_BASE_URL="https://store.staging.iati.cloud"' >> $BASH_ENV
# echo 'export CYPRESS_BASE_URL="https://iati.cloud"' >> $BASH_ENV
# fi
# source $BASH_ENV
# yarn: true
Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,21 @@ IATI is a global aid transparency standard and it makes information about aid sp
## About the project
* Website: <a href="https://www.iati.cloud" target="_blank">www.iati.cloud</a>
* Authors: <a href="https://www.zimmerman.team/" target="_blank">Zimmerman</a>
* License: AGPLv3 (see included <a href="https://github.com/zimmerman-zimmerman/query-builder-iati.cloud/blob/develop/LICENSE.MD" target="_blank">LICENSE</a> file for full license)
* Github Repo: <a href="https://github.com/zimmerman-zimmerman/query-builder-iati.cloud/" target="_blank">github.com/zimmerman-zimmerman/query-builder-iati.cloud</a>
* Bug Tracker: <a href="https://github.com/zimmerman-zimmerman/query-builder-iati.cloud/issues" target="_blank">github.com/zimmerman-zimmerman/query-builder-iati.cloud/issues</a>
* License: AGPLv3 (see included <a href="https://github.com/zimmerman-team/iati.cloud.frontend/blob/develop/LICENSE.MD" target="_blank">LICENSE</a> file for full license)
* Github Repo: <a href="https://github.com/zimmerman-team/iati.cloud.frontend/" target="_blank">github.com/zimmerman-zimmerman/iati.cloud.frontend</a>
* Bug Tracker: <a href="https://github.com/zimmerman-team/iati.cloud.frontend/issues" target="_blank">github.com/zimmerman-zimmerman/iati.cloud.frontend/issues</a>

## Installing

<b>1.</b> Set up the <a href="https://github.com/zimmerman-zimmerman/iati.cloud" target="_blank">iati.cloud backend</a> first<br/>
<b>1.</b> Set up the <a href="https://github.com/zimmerman-team/iati.cloud" target="_blank">iati.cloud backend</a> first<br/>
<b>2.</b> Checkout this repository to a local folder<br/>
<b>3.</b> Make sure you've installed node.js 10.16.3 or higher<br/>
<b>4.</b> Run ```yarn install``` <br/>
<b>5.</b> Create an .env file and specify the following variables:
- NODE_PATH=src/
- REACT_APP_CLIENT_NAME=IATI Datastore
- REACT_APP_CLIENT_NAME=IATI.cloud


<b>6.</b> Run yarn start
<b>6.</b> Run yarn start

## Documentation
For a birds eye view on the different facets of the query builder please take the following steps:
Expand Down
98 changes: 34 additions & 64 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,71 +1,41 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-CP65J0T1G0"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
<!-- Global site tag (gtag.js) - Google Analytics -->
<script src="https://unpkg.com/[email protected]/dist/ponyfill.es6.js"></script>
<title>IATI.cloud</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
gtag('config', 'G-CP65J0T1G0');
</script>
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
<script src="https://unpkg.com/[email protected]/dist/ponyfill.es6.js"></script>

<script type="text/javascript">
(function(e, t, r, n, a) {
var c = [];
e[a] = function() {
c.push(arguments);
};
e[a].queue = c;
var s = t.createElement(r);
s.async = 1;
s.src = n;
var u = t.getElementsByTagName(r)[0];
u.parentNode.insertBefore(s, u);
})(window, document, 'script', '//cdn.sematext.com/rum.js', 'strum');
</script>
<script type="text/javascript">
strum('config', {
token: '155abb23-9f7e-4bf0-bebd-86ee4043ed74',
receiverUrl: 'https://rum-receiver.eu.sematext.com',
});
</script>
<title>IATI.cloud</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
41 changes: 15 additions & 26 deletions src/app/components/feedback/Banners/CovidBanner/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import React, { SyntheticEvent, useState, useRef } from 'react';
import { css } from 'styled-components/macro';
import useCookie from '@devhammed/use-cookie';
import { useClickAway } from 'react-use';
import { IconChipDelete } from 'app/assets/icons/IconChipDelete';

const FontSize = '16px';

Expand Down Expand Up @@ -50,10 +51,12 @@ const NoticeButtonStyle = css`
top: 24px;
width: 24px;
height: 24px;
background-size: contain;
background-position: 50%;
background-repeat: no-repeat;
background-image: url('https://iatistandard.org/assets/svg/source/icon-cross-alert.1c4f6d9acbd3.svg');
> svg {
path:nth-of-type(2) {
fill: #2e2e2e;
}
}
`;

const ParagraphStyle = css`
Expand Down Expand Up @@ -151,28 +154,12 @@ export const CovidBanner = (props: CookieNoticeParams) => {
<div css={NoticeContentStyle}>
<div css={RichTextStyle}>
<p css={ParagraphStyle}>
<b>Important notice:</b>
<b>Notice:</b>
<br />
Please note that the{' '}
<a
css={LinkTextStyle}
href="https://iatistandard.org/en/news/notice-iati-standard-version-1-is-deprecated/"
target="_blank"
rel="noreferrer"
>
IATI.cloud
</a>{' '}
does not contain data that is published in version 1 of the
Standard, or is published within a dataset which does not conform
with the{' '}
<a
css={LinkTextStyle}
href="https://iatistandard.org/en/news/notice-iati-standard-version-1-is-deprecated/"
target="_blank"
rel="noreferrer"
>
IATI Standard Schema
</a>
Please note that IATI.cloud does not contain data that is
published in version 1 of the Standard. IATI.cloud does contain
datasets which do not fully conform with the IATI Standard to make
as much data available as possible.
</p>
</div>
<div
Expand All @@ -181,7 +168,9 @@ export const CovidBanner = (props: CookieNoticeParams) => {
css={NoticeButtonStyle}
data-cy="covid-banner-close-btn"
aria-label="Button to close the COVID-19 banner"
/>
>
<IconChipDelete />
</div>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/inputs/selects/AsyncSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const customStyles = {
};

async function loadOptions(search, loadedOptions, { page }, pivot) {
const url = `https://iatidatastore.iatistandard.org/search/activity?q=${pivot}:*&facet=on&facet.pivot=${pivot}&rows=0&facet.limit=15&facet.offset=${page *
const url = `https://iati.cloud/search/activity?q=${pivot}:*&facet=on&facet.pivot=${pivot}&rows=0&facet.limit=15&facet.offset=${page *
10}&facet.contains=${search.replace(/[&\/\\#,+()$~%.'":*?<>{}]/g, '')}&facet.contains.ignoreCase=true`;
const response = await fetch(url);
const responseJSON = await response.json();
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/surfaces/Footer/FooterLG.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,23 @@ export const FooterLG = () => {
<Mail style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="mailto:[email protected]"
href="mailto:[email protected]"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
[email protected]
[email protected]
</Link>
</Typography>
</Grid>
<Grid container item alignItems="center">
<Twitter style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="https://twitter.com/IATI_aid"
href="https://twitter.com/zimmerman_team"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
@iati
@zimmerman
</Link>
</Typography>
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/surfaces/Footer/FooterMD.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ export const FooterMD = () => {
<Mail style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="mailto:[email protected]"
href="mailto:[email protected]"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
[email protected]
[email protected]
</Link>
</Typography>
</Grid>
<Grid item style={{ display: 'flex' }} >
<Twitter style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="https://twitter.com/IATI_aid"
href="https://twitter.com/zimmerman_team"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
@iati
@zimmerman
</Link>
</Typography>
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/surfaces/Footer/FooterSM.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ export const FooterSM = () => {
<Mail style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="mailto:[email protected]"
href="mailto:[email protected]"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
[email protected]
[email protected]
</Link>
</Typography>
</Grid>
<Grid item style={{ display: 'flex' }} >
<Twitter style={{ marginRight: '16px', fill: 'white' }} />
<Typography variant="body1" color="textSecondary">
<Link
href="https://twitter.com/IATI_aid"
href="https://twitter.com/zimmerman_team"
target="_blank"
style={{ color: 'white', textDecoration: 'underline' }}
>
@iati
@zimmerman
</Link>
</Typography>
</Grid>
Expand Down
Loading

0 comments on commit 945f422

Please sign in to comment.