From 4defcfbf9c09d062315041e4d48dd73c00323732 Mon Sep 17 00:00:00 2001 From: Mike Simpson Date: Tue, 17 Sep 2024 10:49:21 +0100 Subject: [PATCH 1/4] Updates to Welcome Text See #1383 --- app/src/frontend/pages/welcome.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/frontend/pages/welcome.tsx b/app/src/frontend/pages/welcome.tsx index af5f1f77..1278ac66 100644 --- a/app/src/frontend/pages/welcome.tsx +++ b/app/src/frontend/pages/welcome.tsx @@ -35,8 +35,11 @@ const Welcome = () => ( All data collected (e.g data-extracts) and code are free to download, use and share under open licence terms. Our - open manual provides non-technical information for anyone interested in our research. - We also have an impact studies showcase. + open manual provides non-technical information for anyone interested in our research, + as well as a Technical Manual, + which describes how to use and contribute to the platform. + We also have an impact studies showcase, + which shows how the data from the platform can be used.

From 838089c4ab6d6ff87ac432d6ca15e7d7bc0bb9ea Mon Sep 17 00:00:00 2001 From: Mike Simpson Date: Tue, 17 Sep 2024 13:02:13 +0100 Subject: [PATCH 2/4] Update Menu Links + Remove code of conduct, which is now on the Wiki #1382 --- app/src/cc-config.json | 2 +- app/src/frontend/app.tsx | 2 - app/src/frontend/header.tsx | 4 +- app/src/frontend/pages/code-of-conduct.tsx | 104 --------------------- 4 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 app/src/frontend/pages/code-of-conduct.tsx diff --git a/app/src/cc-config.json b/app/src/cc-config.json index a3bb220a..5c1c87da 100644 --- a/app/src/cc-config.json +++ b/app/src/cc-config.json @@ -4,7 +4,7 @@ "projectBlurb": "Colouring {City Name} is part of Colouring Cities.", "githubURL": "https://github.com/colouring-cities/colouring-core", - "manualURL": "https://github.com/colouring-cities/manual/wiki/M3.-COLOURING-BRITAIN", + "manualURL": "https://github.com/colouring-cities/manual/wiki/COLOURING-BRITAIN", "privacyStatement": "{Privacy statement goes here}", "initialMapPosition": [ 51.5245255, -0.1338422 ], diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx index b3104c85..92548e0f 100644 --- a/app/src/frontend/app.tsx +++ b/app/src/frontend/app.tsx @@ -12,7 +12,6 @@ import { MapApp } from './map-app'; import { Building, UserVerified } from './models/building'; import { User } from './models/user'; import ChangesPage from './pages/changes'; -import CodeOfConductPage from './pages/code-of-conduct'; import ContactPage from './pages/contact'; import ContributorAgreementPage from './pages/contributor-agreement'; import DataAccuracyPage from './pages/data-accuracy'; @@ -74,7 +73,6 @@ export const App: React.FC = props => { - diff --git a/app/src/frontend/header.tsx b/app/src/frontend/header.tsx index 57133c8d..2751b76f 100644 --- a/app/src/frontend/header.tsx +++ b/app/src/frontend/header.tsx @@ -99,7 +99,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] { external: true }, { - to: "https://github.com/colouring-cities/manual/wiki/F1.-ETHICAL-FRAMEWORK-and-ethics-policies", + to: "https://github.com/colouring-cities/manual/wiki/ETHICAL-FRAMEWORK", text: "Ethical Framework", external: true } @@ -132,7 +132,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] { external: true }, { - to: "/code-of-conduct.html", + to: "https://github.com/colouring-cities/manual/wiki/ETHICAL-FRAMEWORK", text: "Code of Conduct" }, { diff --git a/app/src/frontend/pages/code-of-conduct.tsx b/app/src/frontend/pages/code-of-conduct.tsx deleted file mode 100644 index ce501a6a..00000000 --- a/app/src/frontend/pages/code-of-conduct.tsx +++ /dev/null @@ -1,104 +0,0 @@ -import React from 'react'; -import InfoBox from '../components/info-box'; - - -const CodeOfConductPage = () => ( -
-
-

Contributor Code of Conduct

- -

- This Code of Conduct is adapted from the Contributor Covenant, version 1.4, - available at - https://www.contributor-covenant.org/version/1/4/code-of-conduct.html -

- -

Our Pledge

- -

- In the interest of fostering an open and welcoming environment, we as - contributors and maintainers pledge to make participation in our project and - our community a harassment-free experience for everyone, regardless of age, body - size, disability, ethnicity, sex characteristics, gender identity and expression, - level of experience, education, socio-economic status, nationality, personal - appearance, race, religion, or sexual identity and orientation. -

-

Our Standards

-

- Examples of behaviour that contributes to creating a positive environment - include: -

-
    -
  • Using welcoming and inclusive language
    • -
  • Being respectful of differing viewpoints and experiences
    • -
  • Gracefully accepting constructive criticism
    • -
  • Focusing on what is best for the community
    • -
  • Showing empathy towards other community members
    • -
- -

- Examples of unacceptable behaviour by participants include: -

- -
    -
  • The use of sexualized language or imagery and unwelcome sexual attention or
    • - advances -
  • Trolling, insulting/derogatory comments, and personal or political attacks
    • -
  • Public or private harassment
    • -
  • Publishing others' private information, such as a physical or electronic address, without explicit permission
    • -
  • Other conduct which could reasonably be considered inappropriate in a professional setting
    • -
- -

Our Responsibilities

-

- Project maintainers are responsible for clarifying the standards of acceptable - behaviour and are expected to take appropriate and fair corrective action in - response to any instances of unacceptable behaviour. -

- -

- Project maintainers have the right and responsibility to remove, edit, or - reject comments, commits, code, wiki edits, issues, and other contributions - that are not aligned to this Code of Conduct, or to ban temporarily or - permanently any contributor for other behaviours that they deem inappropriate, - threatening, offensive, or harmful. -

- -

Scope

-

- This Code of Conduct applies within all project spaces, and it also applies when - an individual is representing the project or its community in public spaces. - Examples of representing a project or community include using an official - project e-mail address, posting via an official social media account, or acting - as an appointed representative at an online or offline event. Representation of - a project may be further defined and clarified by project maintainers. -

- -

Enforcement

-

- Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by - contacting the project team at team@colouring.london or dataprotection@turing.ac.uk. All complaints will - be reviewed and investigated and will result in a response that is deemed necessary and - appropriate to the circumstances. The project team is obligated to maintain - confidentiality with regard to the reporter of an incident. Further details of - specific enforcement policies may be posted separately. -

- -

- Project maintainers who do not follow or enforce the Code of Conduct in good - faith may face temporary or permanent repercussions as determined by other - members of the project's leadership. -

- -

- For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq -

- -
-
-); - -export default CodeOfConductPage; From 9fbe8881bfda1bb6a740cc5d1e0352023acefb84 Mon Sep 17 00:00:00 2001 From: Mike Simpson Date: Tue, 17 Sep 2024 13:04:16 +0100 Subject: [PATCH 3/4] Correct Code of Conduct Link --- app/src/frontend/header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/header.tsx b/app/src/frontend/header.tsx index 2751b76f..7e0702e2 100644 --- a/app/src/frontend/header.tsx +++ b/app/src/frontend/header.tsx @@ -132,7 +132,7 @@ function getCurrentMenuLinks(username: string): MenuLink[][] { external: true }, { - to: "https://github.com/colouring-cities/manual/wiki/ETHICAL-FRAMEWORK", + to: "https://github.com/colouring-cities/manual/wiki/F2.-PROTOCOLS-&-CODES-OF-CONDUCT#ccrp-contributor-code-of-conduct", text: "Code of Conduct" }, { From 0caf0d493c33cc32f1273dca5cefae1326080cb4 Mon Sep 17 00:00:00 2001 From: Mike Simpson Date: Tue, 17 Sep 2024 13:22:20 +0100 Subject: [PATCH 4/4] Remove Contributor Agreement and Update Links #309 --- app/src/frontend/app.tsx | 2 - .../frontend/pages/contributor-agreement.tsx | 84 ------------------- app/src/frontend/user/my-account.tsx | 5 +- app/src/frontend/user/signup.tsx | 7 +- 4 files changed, 5 insertions(+), 93 deletions(-) delete mode 100644 app/src/frontend/pages/contributor-agreement.tsx diff --git a/app/src/frontend/app.tsx b/app/src/frontend/app.tsx index 92548e0f..3bbd5de6 100644 --- a/app/src/frontend/app.tsx +++ b/app/src/frontend/app.tsx @@ -13,7 +13,6 @@ import { Building, UserVerified } from './models/building'; import { User } from './models/user'; import ChangesPage from './pages/changes'; import ContactPage from './pages/contact'; -import ContributorAgreementPage from './pages/contributor-agreement'; import DataAccuracyPage from './pages/data-accuracy'; import DataExtracts from './pages/data-extracts'; import LeaderboardPage from './pages/leaderboard'; @@ -68,7 +67,6 @@ export const App: React.FC = props => { - diff --git a/app/src/frontend/pages/contributor-agreement.tsx b/app/src/frontend/pages/contributor-agreement.tsx deleted file mode 100644 index 8cb79383..00000000 --- a/app/src/frontend/pages/contributor-agreement.tsx +++ /dev/null @@ -1,84 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; - -import { CCConfig } from '../../cc-config'; -let config: CCConfig = require('../../cc-config.json') - -const ContributorAgreementPage : React.SFC = () => ( -
-
-

Contributor Agreement

- -

Contributor responsibilities

- -

- We ask all our contributors to: -

-
    -
  • - adhere to our Code of Conduct -
    • -
  • - never knowingly add data that derives from a restricted, copyrighted, malicious or illegal source -
    • -
  • - help us create an open data platform that supports the development of sustainable, resilient, inclusive, and equitable cities, and encourages the use of data for the public good -
    • -
  • - add sources wherever possible, to benefit others -
    • -
  • - verify data, whenever possible, to benefit others -
    • -
  • - ensure our open licencing terms are fully adhered to with regard to our open data, and our open code -
    • -
  • - provide us with as little personal data as possible -
    • -
  • - take full responsibility for assessing the reliability of Colouring {config.cityName} data and its suitability for any intended use (see also our 'Data Accuracy Agreement') -
    • -
  • - provide feedback on actual or potential privacy and security concerns -
    • -
- -

Additional notes for contributors

- -

Open data

-

- Colouring {config.cityName} is an open data project. Open data are licensed under the Open Data Commons Open Database License (https://opendatacommons.org/licenses/odbl/) by Colouring {config.cityName} contributors. Under this licence you are free to copy, distribute, transmit and adapt our data, as long as you credit Colouring {config.cityName} and our contributors. If you alter or build upon our data, you may distribute the result only under the same licence. Our open platform code are available under a GNU, General Public Licence (https://www.gnu.org/licenses/gpl-3.0.en.html). -

- -

What you are contributing to

- -

- Colouring {config.cityName} is a free knowledge exchange platform and open database designed for public use. It has been set up to support a whole-of-society approach to improving the sustainability, resilience and inclusivity of cities. Colouring {config.cityName} is also part of the international Colouring Cities Research Programme (CCRP) run at the Alan Turing Institute. Its design is guided by principles set out in the United Nations New Urban Agenda, the Open Data Charter, the General Data Protection Regulation (GDPR), The Gemini Principles, the Open Data Institute's recommendations on personal data and data infrastructure, and specific Articles within the Declaration of Human rights. These are discussed on our 'Data ethics' page, where we also use the Open Data Institute's data ethics canvas to answer questions on how we use and manage our data. We capture spatial statistics and do not collect text or images, though images may be integrated in the future. The type of spatial data we collect can be viewed by clicking on each data category, on 'Info' buttons and on the 'Building data categories' page. We are also planning a 'Showcase section' to enable platform users to share, and view, ways in which Colouring {config.cityName} data are used. -

- -

Diversity and inclusivity

- -

- We are very grateful for all constructive contributions provided by our contributors. Our platform is designed for everyone, and we are working to make it as inclusive, welcoming and accessible as possible. We respect and actively seek diversity of contributors and audiences, and celebrate diversity of knowledge. We use colour, crowdsourcing, and non-technical language to reduce barriers to the contribution of statistical information and to make the process rewarding and interesting. Diversity of age, gender, skills and abilities, and cultural background is also essential to allow us, as communities, to make our cities and towns more inclusive, equitable, sustainable and resilient places. Our collective knowledge on the composition, dynamic behaviour and energy performance of our stocks, and how well our buildings work, is critical to inform policies on what buildings we should reuse, demolish and build anew, to accelerate retrofit, and to better understand stocks as dynamic systems, so that they may be improved. -

- -

Copyright and data accuracy and quality

- -

- We are unable to accept any data derived from copyrighted or restricted sources, other than those covered by fair use, nor from illegal sources, and we ask contributors to carefully check sources prior to upload. We are also unable to take responsibility for the quality of datasets as it is not feasible to check each data entry, and as different degrees of accuracy and precision will be required by different users, depending on what they are using the data for (e.g. a school project or scientific paper). However our aim is to make our data as reliable and useful as possible. We therefore ask contributors to include sources and to verify other data entries wherever possible. -

- -

- For information on data privacy and security please see our Privacy and Security page. -

- - -
- Back to sign up -
-
-
-); - -export default ContributorAgreementPage; diff --git a/app/src/frontend/user/my-account.tsx b/app/src/frontend/user/my-account.tsx index 5b0011b2..dea66d68 100644 --- a/app/src/frontend/user/my-account.tsx +++ b/app/src/frontend/user/my-account.tsx @@ -57,9 +57,8 @@ export const MyAccountPage: React.FC = () => {

For reference, here are the{' '} - privacy policy,{' '} - contributor agreement and{' '} - data accuracy agreement. + privacy policy,{' and the '} + contributor & data user data accuracy & ethical use agreement

diff --git a/app/src/frontend/user/signup.tsx b/app/src/frontend/user/signup.tsx index e1413f2b..af0533aa 100644 --- a/app/src/frontend/user/signup.tsx +++ b/app/src/frontend/user/signup.tsx @@ -99,10 +99,9 @@ export const SignUp: React.FC = () => { onChange={e => setConfirmConditions(e.target.checked)} required />