a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another pass at removing references to Colouring London

Browse Source
This commit is contained in:
Mike Simpson 2022-12-06 16:55:10 +00:00
parent a1c69fdc13
commit 543a576b5d
7 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/api/services/passwordReset.ts
View File

@ -8,6 +8,9 @@ import { validatePassword } from '../validation';
import { transporter } from './email';
import * as userService from './user';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
/**
* Generate a password reset token for the specified account and send the password reset link by email
@ -52,7 +55,7 @@ function getPasswordResetEmail(email: string, token: string, siteOrigin: string)
const messageBody = `Hi there,
Someone has requested a password reset for the Colouring London account associated with this email address.
Someone has requested a password reset for the Colouring ${config.cityName} account associated with this email address.
Click on the following link within the next 24 hours to reset your password:
${linkString}
@ -60,7 +63,7 @@ function getPasswordResetEmail(email: string, token: string, siteOrigin: string)
return {
text: messageBody,
subject: 'Reset your Colouring London password',
subject: `Reset your Colouring ${config.cityName} password`,
to: email,
from: 'no-reply@colouring.london'
};

13
app/src/frontend/pages/about.tsx
View File

@ -5,15 +5,18 @@ import './about.css';
import Categories from '../building/categories';
import SupporterLogos from '../components/supporter-logos';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
const AboutPage = () => (
<article>
<section className="main-col">
<h1 className="h2">
Can you help us capture information on every building in London?
Can you help us capture information on every building in the city?
</h1>
<p>
How many buildings are there in London? What are their characteristics? Where
How many buildings are there? What are their characteristics? Where
are they located and how do they contribute to the city? How adaptable are
they? How long will they last, and what are the environmental and
socio-economic implications of demolition?
@ -21,7 +24,7 @@ const AboutPage = () => (
</p>
<p>
Colouring London is being designed to address these questions by crowdsourcing
Colouring {config.cityName} is being designed to address these questions by crowdsourcing
and visualising information on London’s buildings. We’re releasing the
prototype for testing in the late summer. See the slideshow below for what it
will look like.
@ -53,7 +56,7 @@ const AboutPage = () => (
<section className="main-col">
<p>
Colouring London is being designed and built by the Centre for Advanced Spatial
Colouring Cities is being designed and built by the Centre for Advanced Spatial
Analysis (CASA), University College London and funded by Historic England.
Ordnance Survey is providing building footprints required to collect the data,
facilitated by the GLA, and giving access to its API and technical support. It
@ -126,7 +129,7 @@ const AboutPage = () => (
Access bulk downloads of data created through the project to use and reuse
under a liberal open data license. Let us know and we’ll feature showcase
projects on the Colouring London site.
projects on the Colouring Cities site.
</p>
<img className="border-image" src="images/slide-5-download.png"

6
app/src/frontend/pages/contact.tsx
View File

@ -10,7 +10,7 @@ const ContactPage = () => (
<h1 className="h2">
Contact
</h1>
<p> Colouring London has been designed as a sustainable, low-cost model for knowledge exchange/open data platforms able to be reproduced by other towns and cities using our open platform code.</p>
<p> Colouring Cities has been designed as a sustainable, low-cost model for knowledge exchange/open data platforms able to be reproduced by other towns and cities using our open platform code.</p>
<p> It is being developed by a small, dedicated team at The Alan Turing Institute. We are unable to answer individual queries but welcome constructive comments on how to improve the site, and on other types of data and new features you might like to see.</p>
@ -21,13 +21,13 @@ const ContactPage = () => (
<p>For press enquiries please contact <a href="https://www.turing.ac.uk/contact-us/press-office">The Alan Turing Institute press office</a></p>
<p>
If you capture images from the maps on Colouring London, please credit our
If you capture images from the maps on Colouring Cities, please credit our
contributors (who collected the data) and Ordnance Survey
(who provided the basemaps and building geometries) as follows:
</p>
<p>
<pre><code>
Colouring London https://colouring.london Building attribute data is © Colouring London contributors. Maps contain OS data © Crown copyright: OS Maps baselayers and building outlines.
Colouring Cities https://colouring.london Building attribute data is © Colouring Cities contributors. Maps contain OS data © Crown copyright: OS Maps baselayers and building outlines.
</code></pre>
</p>
<hr />

2
app/src/frontend/pages/contributor-agreement.tsx
View File

@ -54,7 +54,7 @@ const ContributorAgreementPage : React.SFC<any> = () => (
<h3 className='h3'>What you are contributing to</h3>
<p>
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 London is also the prototype platform for 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 <a href="https://github.com/colouring-london/colouring-london/issues/687">'Data ethics'</a> 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.
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 <a href="https://github.com/colouring-london/colouring-london/issues/687">'Data ethics'</a> 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.
</p>
<h3 className='h3'>Diversity and inclusivity</h3>

5
app/src/frontend/user/forgotten-password.tsx
View File

@ -3,6 +3,9 @@ import React, { ChangeEvent, FormEvent } from 'react';
import ErrorBox from '../components/error-box';
import InfoBox from '../components/info-box';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
interface ForgottenPasswordState {
success: boolean;
error: string;
@ -62,7 +65,7 @@ export default class ForgottenPassword extends React.Component<{}, ForgottenPass
<ErrorBox msg={this.state.error} />
<InfoBox msg="">
{this.state.success ?
`If the email address is registered on Colouring London, a password reset link will be sent to ${this.state.emailUsed}. Please check your inbox.` :
`If the email address is registered on Colouring ${config.cityName}, a password reset link will be sent to ${this.state.emailUsed}. Please check your inbox.` :
null
}
</InfoBox>

11
app/src/frontend/user/my-account.tsx
View File

@ -6,6 +6,9 @@ import ConfirmationModal from '../components/confirmation-modal';
import ErrorBox from '../components/error-box';
import { SpinnerIcon } from '../components/icons';
import { CCConfig } from '../../cc-config';
let config: CCConfig = require('../../cc-config.json')
export const MyAccountPage: React.FC = () => {
const { isLoading, user, userError, logout, generateApiKey, deleteAccount } = useAuth();
@ -39,6 +42,8 @@ export const MyAccountPage: React.FC = () => {
);
}
const issuesURL = config.githubURL + "/issues"
return (
<article>
<section className="main-col">
@ -46,9 +51,9 @@ export const MyAccountPage: React.FC = () => {
{!userError && (<>
<h1 className="h1">Welcome, {user.username}!</h1>
<p>
Colouring London is under active development. Please{' '}
Colouring {config.cityName} is under active development. Please{' '}
<a href="https://discuss.colouring.london/">discuss suggestions for improvements</a> and{' '}
<a href="https://github.com/colouring-london/colouring-london/issues"> report issues or problems</a>.
<a href={issuesURL}> report issues or problems</a>.
</p>
<p>
For reference, here are the{' '}
@ -84,7 +89,7 @@ export const MyAccountPage: React.FC = () => {
</form>
<h3 className="h3">Open Source Code</h3>
Colouring London site code is developed at <a href="http://github.com/colouring-london/colouring-london/">colouring-london</a> on Github
Colouring {config.cityName} site code is developed at <a href={config.githubURL}>colouring-cities</a> on Github
<hr />

11
app/src/frontendRoute.tsx
View File

@ -15,6 +15,9 @@ import { App } from './frontend/app';
import { parseBuildingURL } from './parse';
import asyncController from './api/routes/asyncController';
import { CCConfig } from './cc-config';
let config: CCConfig = require('../../cc-config.json')
// reference packed assets
const assets = require(process.env.RAZZLE_ASSETS_MANIFEST);
@ -93,8 +96,8 @@ function renderHTML(context, data, req, res) {
<meta property="og:url" content="https://colouring.london" />
<meta property="og:type" content="website" />
<meta property="og:title" content="Colouring London" />
<meta property="og:description" content="Colouring London is a knowledge exchange platform collecting information on every building in London, to help make the city more sustainable. We’re building it at The Bartlett Centre for Advanced Spatial Analysis, University College London." />
<meta property="og:title" content="Colouring ${config.cityName}" />
<meta property="og:description" content="Colouring ${config.cityName} is a knowledge exchange platform collecting information on every building in London, to help make the city more sustainable. We’re building it at The Bartlett Centre for Advanced Spatial Analysis, University College London." />
<meta property="og:locale" content="en_GB" />
<meta property="og:image" content="https://colouring.london/images/logo-cl-square.png" />
@ -102,13 +105,13 @@ function renderHTML(context, data, req, res) {
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Colouring London">
<meta name="apple-mobile-web-app-title" content="Colouring ${config.cityName}">
<link rel="apple-touch-icon" href="icon-192x192.png">
<meta name="mobile-web-app-capable" content="yes">
<link rel="icon" sizes="192x192" href="icon-192x192.png">
<title>Colouring London</title>
<title>Colouring ${config.cityName}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<style>
@font-face {