From f359d1c2d93a1a001c9e36166e25f9e1a8ae595b Mon Sep 17 00:00:00 2001 From: mz8i <36160844+mz8i@users.noreply.github.com> Date: Tue, 13 Aug 2019 21:17:39 +0100 Subject: [PATCH] Add contributor agreement Closes #317 via #382 --- app/src/frontend/app.tsx | 2 + app/src/frontend/contributor-agreement.tsx | 47 ++++++++++++++++++++++ app/src/frontend/signup.tsx | 8 ++-- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 app/src/frontend/contributor-agreement.tsx diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx index 7c9ee1f0..4667898c 100644 --- a/app/src/frontend/app.tsx +++ b/app/src/frontend/app.tsx @@ -18,6 +18,7 @@ import MyAccountPage from './my-account'; import SignUp from './signup'; import Welcome from './welcome'; import { parseCategoryURL } from '../parse'; +import ContributorAgreementPage from './contributor-agreement'; /** * App component @@ -255,6 +256,7 @@ class App extends React.Component { // TODO: add proper types logout={this.logout} /> + diff --git a/app/src/frontend/contributor-agreement.tsx b/app/src/frontend/contributor-agreement.tsx new file mode 100644 index 00000000..310fa763 --- /dev/null +++ b/app/src/frontend/contributor-agreement.tsx @@ -0,0 +1,47 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; + +import InfoBox from './info-box'; + +const ContributorAgreementPage : React.SFC = () => ( +
+
+

Contributor Agreement

+ + + +

Open data

+ +

+ Colouring London contributions are open data, licensed under the Open Data Commons Open Database License (ODbL) by Colouring London contributors. +

+

+ You are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring London and our contributors.If you alter or build upon our data, you may distribute the result only under the same licence. +

+ +

Your contributions

+ +

+ Colouring London emphasises local and community knowledge. Contributors use a variety of sources and local and expert knowledge of buildings to contribute data and verify that Colouring London is accurate and up to date. +

+

+ When you contribute to Colouring London, you make your contributions available as open data for anyone to copy, distribute, transmit and adapt in line with the licence. +

+

+ We are unable to accept any data derived from copyright or restricted sources, other than as covered by fair use. +

+

+ We encourage full attribution of data sources where appropriate - more details on potential sources are documented with suggestions for each data category. +

+

+ When you make a contribution to Colouring London, you are creating a permanent, public record of all data added, removed, or changed by you.The database records the username and ID of the user making the edit, along with the time and date of the change.All of this information is also made publicly available through the website and through bulk downloads of the edit history. +

+ +
+ Back to sign up +
+
+
+) + +export default ContributorAgreementPage; diff --git a/app/src/frontend/signup.tsx b/app/src/frontend/signup.tsx index 3d99352d..c409b926 100644 --- a/app/src/frontend/signup.tsx +++ b/app/src/frontend/signup.tsx @@ -11,7 +11,7 @@ class SignUp extends Component { // TODO: add proper types login: PropTypes.func.isRequired, user: PropTypes.object }; - + constructor(props) { super(props); this.state = { @@ -135,9 +135,9 @@ class SignUp extends Component { // TODO: add proper types onChange={this.handleChange} required />