a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,666 Commits 3 Branches 0 Tags 30 MiB
d809f22573
Commit Graph

940 Commits

Author SHA1 Message Date
Mateusz Konieczny
e8ff5df818
Merge pull request #711 from colouring-cities/feature/new-building-types 
Feature/new building types
 2022-01-18 18:35:12 +01:00
Mateusz Konieczny
c30c3b6e1c Finish rename 2022-01-18 10:33:58 +01:00
Mateusz Konieczny
08807b2654 Enable hiding legend also on a large screens 2022-01-14 06:11:28 +01:00
Mateusz Konieczny
e12b544503
Merge pull request #708 from colouring-london/feature/more-confetti 
Adding more confetti, as requested
 2022-01-13 15:47:20 +01:00
Mateusz Konieczny
1bf1edd2ae Add ability to mark buildings as unknown 
Also, make residential a bit stronger.
 2022-01-11 17:51:07 +01:00
Mateusz Konieczny
e2c9fd4073 Adding more confetti, as requested 2022-01-10 14:21:03 +01:00
Mateusz Konieczny
12290c09b6
Merge pull request #700 from colouring-london/feature/new_lockfile 
Update lockfile version to 2
 2021-12-12 18:29:04 +01:00
Mateusz Konieczny
5ed0b261ae Set night mode as a default 2021-12-09 17:39:00 +01:00
Mateusz Konieczny
7fea5abc7f Update lockfile version to 2 
See https://github.blog/2021-02-02-npm-7-is-now-generally-available/#changes-to-the-lockfile

This was triggered by updating caniuse

Which was in turn caused by following

> Run npx browserslist@latest --update-db

request appearing during build
 2021-12-09 01:33:16 +01:00
Mateusz Konieczny
a0111a190b Simplify code 
Co-authored-by: Tom Russell <tomalrussell@gmail.com>
 2021-12-08 17:54:09 +01:00
Mateusz Konieczny
9bae9a0b63 Merge branch 'master' into night_mode 2021-12-03 20:37:03 +01:00
Mateusz Konieczny
6551d9742f revert part of whitespace changes 2021-12-03 20:32:54 +01:00
Mateusz Konieczny
92d0899a95
Merge pull request #694 from colouring-london/feature/689-privacy-policy-and-contributor-agreement 
Feature - privacy policy and contributor agreement (#689)
 2021-11-08 18:21:40 +01:00
Mateusz Konieczny
b8504c7ea5 Apply provided text of contributor agreement 
some fixes were applied to the provided text, see https://github.com/colouring-london/colouring-london/issues/689#issuecomment-962927441
 2021-11-08 09:49:31 +01:00
Mateusz Konieczny
3f169e4bf4 Apply provided privacy policy text 2021-11-08 09:49:29 +01:00
Mateusz Konieczny
2e43ee2118 Fix some typos 2021-11-08 09:48:24 +01:00
Mateusz Konieczny
e110a07a83 apply new code of conduct text 2021-11-06 06:13:50 +01:00
Mateusz Konieczny
fa3261cdfb apply provided data accuracy text 2021-11-05 18:31:14 +01:00
Maciej Ziarkowski
25a4bb7e0d Add new feature notice, solid border in community 2021-10-11 14:13:02 +02:00
Maciej Ziarkowski
ad8b4343d3 Add markdown support, add bold to community title 2021-10-11 11:49:04 +02:00
Maciej Ziarkowski
22cac99675 Change public ownership sources field to array 2021-10-08 13:19:48 +01:00
Maciej Ziarkowski
a4d1afab81 Rewrite map with hooks, add map colour toggle 
Map and Legend components rewritten using hooks.
Also, each category can now have multiple available colour scales.
These can be switched using a select dropdown in the legend.
 2021-10-01 13:30:03 +01:00
Maciej Ziarkowski
d3a17f2e5f Tweak style and text of user opinion aggregations 2021-09-30 15:51:20 +01:00
Maciej Ziarkowski
d438dc2189 Revert type change for user_verified in frontend 
In principle the type annotation is desirable,
but something causes errors in YearDataEntry.
Need to work this out at a different time
 2021-09-27 14:07:54 +03:00
Maciej Ziarkowski
75f0044b3b Add community fields about public ownership 2021-09-27 13:47:27 +03:00
Maciej Ziarkowski
522eff2031 Correct API error on unknown field edit 2021-09-24 20:32:05 +03:00
Maciej Ziarkowski
8c8a6a8094 Add user opinion fields to community section 2021-09-24 20:31:03 +03:00
Maciej Ziarkowski
29ed25f36c Replace likes with generic building-user attribs 2021-08-23 02:26:58 +01:00
Maciej Ziarkowski
c1679a0c35 Handle likes database count as integer 2021-08-12 21:11:52 +01:00
Maciej Ziarkowski
2118d6ba7c Add likes_total data definition in API 2021-08-12 21:11:36 +01:00
Maciej Ziarkowski
a0da41fa92 Reformat like data entry 2021-08-12 21:11:00 +01:00
Maciej Ziarkowski
806e1f6e74
Merge pull request #684 from mz8i/fix/681-land-use-edit 
Allow non-editable fields to be auto-derived
 2021-08-12 01:32:06 +01:00
Maciej Ziarkowski
9722c173d8 Allow non-editable fields to be auto-derived 
Some fields shouldn't be editable through the API
but can still be modified, because they are derived
from another field which is editable.
This change fixes a bug where a derived field
wouldn't be updated, because it was not on the
editable fields whitelist.
 2021-08-12 01:29:37 +01:00
Vincent Schaffer
611772efa8 intergrated night filter 2021-07-17 17:49:38 -04:00
Vincent Schaffer
c0ad25240d added filter css 2021-07-17 17:30:03 -04:00
Maciej Ziarkowski
4905e93266
Correct typo in dynamics field description 2021-06-16 22:47:35 +01:00
Maciej Ziarkowski
8f94c22586
Reduce map maxZoom to avoid tiles missing on retina 
Due to a problem with Leaflet, the combination of setting maxZoom, maxNativeZoom and detectRetina
causes the map on retina devices to go blank when zooming to max zoom level.
Decreasing max zoom to 18 reduces the ability of users to zoom in, but prevents this issue.
 2021-06-16 22:41:01 +01:00
Maciej Ziarkowski
b6ecbb61c2 Add patern data entry to location number 2021-06-16 21:35:09 +01:00
Maciej Ziarkowski
efb5dafcdc Update map position setting for react-leaflet v3 2021-06-12 01:35:20 +01:00
Maciej Ziarkowski
c262922af9
Correct tile renderer map bounds for London 
This updates the hard-coded bounding box for London, to correctly render tiles for parts of London east of Upminster.
 2021-05-12 00:06:42 +01:00
Maciej Ziarkowski
b0791c4cdc Set base map theme to Light without switching 
This is necessary until we transition to a better
option for base maps (e.g. vector maps), as the
previous OS API is now defunct / inaccessible
 2021-05-06 18:53:57 +01:00
Maciej Ziarkowski
1ee6a7581e Add hotfix for basemap - set to plain color 2021-05-04 17:17:14 +01:00
Maciej Ziarkowski
0848ba5246 Fix TileLayer url bug, reorganise map layers 2021-05-02 18:24:27 +01:00
Maciej Ziarkowski
38896d6852 Fix bug in updated react-leaflet highlight layer 2021-04-27 00:30:51 +01:00
Maciej Ziarkowski
ac3a9ad45a Update/install explicitly lodash 2021-04-26 23:53:56 +01:00
Maciej Ziarkowski
75281c9884 Update mapnik (4.5.8) 2021-04-26 23:35:12 +01:00
Maciej Ziarkowski
044c3edaa4 Update typescript, react, leaflet 2021-04-26 19:19:06 +01:00
Maciej Ziarkowski
ec6d87f7c5 Fix npm audit vulnerabilities 2021-04-18 20:44:05 +01:00
Maciej Ziarkowski
effc9fdd9e Update build and SSR dependencies 2021-04-18 20:38:21 +01:00
Maciej Ziarkowski
ff4585ba78 Autosave changes to dynamics toggle 2021-03-18 21:19:38 +00:00
Maciej Ziarkowski
1184ffe4dc Add form change handler with autosave 2021-03-18 21:18:58 +00:00
Maciej Ziarkowski
4aa35b94dd Add logical toggle for demolished buildings 2021-03-18 19:44:16 +00:00
Maciej Ziarkowski
26a91a229e Add logical (yes/no/?) data entry 2021-03-18 19:29:42 +00:00
Maciej Ziarkowski
f931195053 Add documentation to frontend data fields config 2021-03-18 14:14:35 +00:00
Maciej Ziarkowski
27b7b72a57 Improve data netry list UI for new entry 2021-03-16 19:02:11 +00:00
Maciej Ziarkowski
c9176f96ac Prevent form submit on enter without JavaScript 2021-03-16 19:00:54 +00:00
Maciej Ziarkowski
4433041d0d Disable prop types eslint rule 2021-03-15 20:49:28 +00:00
Maciej Ziarkowski
6ecd5b6819 Change MultiDataEntry to FC with hooks 2021-03-15 19:32:10 +00:00
Maciej Ziarkowski
efb660db9e Update link to dynamics category forum discussion 2021-03-15 14:48:14 +00:00
Maciej Ziarkowski
81b92fe6fa Add simple dynamics frontend 2021-03-11 19:33:45 +00:00
Maciej Ziarkowski
8a42f93dd2 Add a field row component 2021-03-11 19:19:20 +00:00
Maciej Ziarkowski
542fe6634b Add simple dynamics map definition 2021-03-11 19:16:37 +00:00
Maciej Ziarkowski
28bad44220 Add simple dynamics API support 2021-03-11 19:15:58 +00:00
Maciej Ziarkowski
b93d016a77 Only show number input arrows in Firefox on hover 2021-03-11 19:10:26 +00:00
Maciej Ziarkowski
b225a21f41 Allow children-only InfoBox without msg prop 2021-03-11 19:09:22 +00:00
Maciej Ziarkowski
ec6e892aeb Fix URL navigation around edit history 2021-03-11 19:08:44 +00:00
Maciej Ziarkowski
3f4464afbf Allow different value/label for SelectDataEntry 2021-03-11 19:07:38 +00:00
Maciej Ziarkowski
d0a2726f07 Add slug modifier for labelling complex inputs 
This adds a slugModifier optional prop for most data entries
the modifier will be used with the slug to form input
element IDs, names and for attributes of label.
This ensures that clicking on a label for a complex attribute will
focus/highlight the correct input field.
 2021-03-11 19:06:25 +00:00
Maciej Ziarkowski
fc7fbc3334 Pass more html options through data entry props 
This allows for setting the required prop on some entry components
and to specify a URL required format for the basic data entry
 2021-03-11 19:00:49 +00:00
Maciej Ziarkowski
4a3f009235 Tweak save/discard button bar text and style 2021-03-11 18:53:03 +00:00
Maciej Ziarkowski
fc35436db1 Allow autosave upon adding to an array attribute 
Category views receive an additional prop, onSaveAdd,
which allows to add an item to the array-like attribute
specified using the slug parameter, and immediately
send the data to the server to update the building/map.
 2021-03-11 18:49:17 +00:00
Maciej Ziarkowski
3726a0b81c Enable jsonb fields with json schema 
This adds the ability to verify JSON/JSONB fields using
json-schema, and adds a simple edit history JSON formatting.
 2021-03-11 18:40:01 +00:00
Maciej Ziarkowski
58bc11be04 Allow for more API data configuration 
This puts the data configuration in a dedicated file,
and allows for separately allowing/disallowing editing and verification
for each field, as well as specifying PSQL types to cast to on inserting
 2021-03-11 18:33:04 +00:00
Maciej Ziarkowski
4bd3c147e3 Hide building use change field from type category 2021-02-25 11:43:04 +00:00
Maciej Ziarkowski
50bc487735 Fully disable streetscape fields to fix bug 2021-02-25 03:41:49 +00:00
Maciej Ziarkowski
3188fa09cc Update categories and data fields text/names 2021-02-25 03:22:25 +00:00
Maciej Ziarkowski
75caf768f0 Fix click on empty space to deselect building 2021-02-24 08:41:48 +00:00
Maciej Ziarkowski
2afc7f8c8f Improve navigation handling in new map app 2021-02-24 07:49:56 +00:00
Maciej Ziarkowski
305f2f1671 Refactor map app with hooks and separated config 2021-02-24 07:49:56 +00:00
Maciej Ziarkowski
a881b66d76
Fix bug in tile cache switch 
By default, only base_night and base_light tile layers were cached.
 2021-02-24 07:21:44 +00:00
Maciej Ziarkowski
17b83212c6 Preload auth context with user data from SSR 2021-02-17 22:43:04 +00:00
Maciej Ziarkowski
2d53154a82 Correct My Account page whitespace formatting 2021-02-17 22:40:44 +00:00
Maciej Ziarkowski
edde1fc1c7 Add mapnik XML directory to build output 
Enables deploying the whole app by simply copying the build folder
 2021-02-15 18:27:31 +00:00
Maciej Ziarkowski
3bb01f6a11 Move user authentication to context and hooks 2021-02-08 16:03:30 +00:00
Maciej Ziarkowski
1ff3b38c4a
Refactor data maps and add building outlines (#630) 
* Add subtle border for age layer buildings

* Simplify map data queries

* Fix typo in updated construction layer query

* Enable data tile caching switch for development

* Enable turning tile cache off

* Use render time variables for highlight tiles

* Create building numbers map layer

* Create database view for simpler map queries

* Decrease min zoom for numbers layer

* Add building outlines to all map layers

* Adjust building numbers style and zoom level

* Revert "Create database view for simpler map queries"

This reverts commit e3c342cb7393f491c838df5654c2316a9dab08e1
which cannot be implemented before upgrading Postgres to min v11
 2021-01-29 02:40:11 +00:00
Maciej Ziarkowski
2927b04b54
Reorganise menu items (#652) 2021-01-29 00:35:14 +00:00
Maciej Ziarkowski
e42d0980c9 Refactor header menu to accept list of links 2021-01-28 03:20:01 +00:00
Maciej Ziarkowski
de2094eb29 Remove categories from header, add link targets 2021-01-28 03:20:01 +00:00
Maciej Ziarkowski
44a3725058 Update references to UCL and Alan Turing Institute 2021-01-21 16:30:31 +00:00
Maciej Ziarkowski
79eff831b2 Refactor API building service into multiple files 2021-01-21 02:27:14 +00:00
Maciej Ziarkowski
5001ab7426 Disable location free-text field editing 2021-01-15 18:40:24 +00:00
Maciej Ziarkowski
3a0c852088
Refactor and restyle UI (#645) 
Tweaks to visual output and code organisation related to styles of:

- sidebar (category grid, data view/edit, section headers and action buttons)
- header/menu
- map controls (search box)
- layout (sidebar, menu, header sizes)
 2020-12-27 23:51:32 +00:00
Maciej Ziarkowski
9219f76c12 Update txt: point repo links to new organisation 2020-12-09 13:25:38 +00:00
Maciej Ziarkowski
886fb3b23f Edit txt: update Use info on Residential default 2020-12-09 13:24:07 +00:00
Maciej Ziarkowski
e0e712ebe1 Edit cat: rename Original Use to Type 2020-12-09 12:44:53 +00:00
Maciej Ziarkowski
93d8493a57 Edit website text content and images 2020-12-05 01:07:59 +00:00
Tom Russell
ea9bbc81a6 Throw confetti from verify button location. 2020-08-07 14:48:45 +01:00
Tom Russell
54a1033eeb Fix up interface for DataContainerProps - edited not required 2020-08-04 19:23:07 +01:00
Tom Russell
ea64d4cb5d Disable verify if edited 2020-08-04 19:15:37 +01:00
Tom Russell
3e8497e96a Verify sustainability 2020-08-04 19:15:26 +01:00
Tom Russell
79ace052d8 Verify active planning fields 2020-08-04 19:11:08 +01:00
Tom Russell
414e99d1f3 Avoid duplication in checkbox data entries 2020-08-04 19:10:46 +01:00
Tom Russell
9942225807 Disable buttons (but still show) if not verifiable 2020-08-04 19:10:26 +01:00
Tom Russell
4b3136c5d6 Verify active size fields 2020-08-04 18:40:25 +01:00
Tom Russell
522fb8ec09 Verify address name/number/street (and open to editing) 2020-08-04 18:29:50 +01:00
Tom Russell
dc6eb74172 Verify attachment/configuration 2020-08-04 18:20:38 +01:00
Tom Russell
77a916134c Verify land use group/s 2020-08-04 17:16:57 +01:00
Tom Russell
8f56f96779 Verify date_year 2020-08-04 17:01:20 +01:00
Tom Russell
1b3014471c Fix build - remove stray try block 2020-08-04 16:04:17 +01:00
Tom Russell
2d6a18f81b Add verification for Facade Data, thread info through frontend 2020-08-04 15:54:49 +01:00
Tom Russell
b30e882669 Add backend service to GET/POST user verifications, and include verification counts in building data 2020-08-04 15:54:12 +01:00
Tom Russell
718c3c762a Update packages, add canvas-confetti for fun 2020-08-04 15:53:05 +01:00
Maciej Ziarkowski
07cdae8899 Only detect deletions where attribute set to null 
For fields where an empty value is represented by null,
it is easy to detect deletions. For other fields e.g. arrays,
more complex logic needs to be developed later
 2020-07-17 16:27:40 +02:00
Maciej Ziarkowski
63268ebca4 Allow filtering deletions on edit history page 2020-07-17 16:08:44 +02:00
Maciej Ziarkowski
3d3048258f
Add missing word in welcome page 2020-07-16 18:41:17 +02:00
Maciej Ziarkowski
1c34cc4bcb Update land use colour map 2020-07-16 16:45:07 +02:00
Maciej Ziarkowski
6846a03878 Update current use legend 2020-07-16 16:22:30 +02:00
Maciej Ziarkowski
e544e54583 Update style, enable subtitle in legend 2020-07-16 16:22:11 +02:00
Maciej Ziarkowski
2c9335c1eb
Merge pull request #617 from mz8i/feature/login-username-warn 
Warn of wrong username on login screen
 2020-07-01 01:12:51 +02:00
Maciej Ziarkowski
d913d30c34 Warn of wrong username on login screen 2020-07-01 00:02:53 +01:00
Tom Russell
c18dc837db Move updateBuilding out of try-catch around authentication 2020-06-25 11:51:40 +01:00
Maciej Ziarkowski
88459f3e09 Amend Agriculture and Fisheries legend text 2020-06-25 04:56:26 +01:00
Maciej Ziarkowski
f83f040ee3 Make land use group copyable 2020-06-25 04:50:16 +01:00
Tom Russell
4b3e2d7530 Add dwellings note to use 2020-06-18 14:58:16 +01:00
Tom Russell
c8e6953c85 Text change in current use box 2020-06-18 12:39:30 +01:00
Tom Russell
e6e0f790f1 Fix land use styles 
Add vacant/derelict and agriculture/fisheries
Fix transport green
 2020-06-18 12:28:11 +01:00
Tom Russell
d1aaf2ccbb Add babel-runtime explicitly to deps 
Was failing to build with:

Cannot find module 'babel-runtime/helpers/extends'
Require stack:
- /app/node_modules/react-leaflet-universal/dist/decorator.js
- /app/node_modules/react-leaflet-universal/dist/index.js
- /app/build/server.js
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:966:15)
    at Function.Module._load (internal/modules/cjs/loader.js:842:27)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
    at require (internal/modules/cjs/helpers.js:72:18)
    at Object.<anonymous> (/home/tom/projects/colouring-london/colouring-london/app/node_modules/react-leaflet-universal/dist/decorator.js:7:17)
    at Module._compile (internal/modules/cjs/loader.js:1138:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1158:10)
    at Module.load (internal/modules/cjs/loader.js:986:32)
    at Function.Module._load (internal/modules/cjs/loader.js:879:14)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
 2020-06-18 11:39:02 +01:00
Tom Russell
1731969f87 Bump node packages 2020-06-18 11:10:10 +01:00
Tom Russell
210f57f6fa Add link to new content page 2020-05-14 17:24:34 +01:00
Tom Russell
ebe1e3f264 Disable secondary materials for now 2020-05-04 14:24:53 +01:00
Tom Russell
d1c42a40a6 Rename construction migration to 017, fix tile definition 
Note that enum types need to be cast to ::text for mapnik
rules to work as expected.
 2020-04-17 17:01:21 +01:00
Tom Russell
c20ea2bbb0 Knock out showcase link, fix leaderboard 2020-04-09 16:58:59 +01:00
Tom Russell
c4ffdf4db9 Tidy up initial basic leaderboard 2020-04-09 16:52:41 +01:00
Tom Russell
a2393a019a Tweak welcome text 2020-04-09 16:10:07 +01:00
Tom Russell
f4d18f7bda Move welcome float to sidebar 2020-04-09 15:57:17 +01:00
Tom Russell
3649f92d4c Fix compile errors by casting variables pulled from query strings 2020-04-09 15:44:11 +01:00
Tom Russell
3c2ecbd76e Fix showing maps for likes 2020-04-09 15:23:50 +01:00
Tom Russell
8dc4a387a8 Set razzle to use eslint, drop tslint.json 2020-04-09 15:09:34 +01:00
Tom Russell
ab3f0c4ce2 Move linting to use eslint (drop deprecated tslint) 2020-04-09 14:32:58 +01:00
Tom Russell
fa527f0f95 Bump npm packages 2020-04-09 14:08:18 +01:00
Tom Russell
b901e392bb
Merge branch 'master' into feature/menu-sidebar 2020-04-09 13:30:03 +01:00
Tom Russell
97953db742
Merge branch 'master' into develop 2020-04-09 13:26:36 +01:00
Tom Russell
218155ccdd
Merge pull request #573 from mz8i/feature/538-planning-update 
Feature 538: planning update
 2020-04-09 13:22:15 +01:00
Tom Russell
2696820ff5
Merge pull request #586 from colouring-london/feature/568-activate-construction 
Feature/568 activate construction
 2020-04-09 11:28:20 +01:00
Tom Russell
bb73419caa
Merge pull request #591 from colouring-london/develop 
Point tsconfig to client and server TS files only
 2020-04-09 10:52:54 +01:00
Tom Russell
b782f36230
Merge pull request #535 from colouring-london/feature/initial_leaderboard 
Implementation of basic leaderboard
 2020-04-09 10:33:23 +01:00
MeldaS
32bfb490be Modify files for adding colouring map attribute 2020-04-01 12:18:44 +01:00
MeldaS
e503ee4dcc Modify files for adding construction attributes 2020-04-01 12:18:19 +01:00
Maciej Ziarkowski
7b09fe6f84 Update land use hints 2020-03-27 15:23:57 +00:00
Maciej Ziarkowski
a5f29c6aad Improve multi entry + autofill UI 2020-03-27 14:32:19 +00:00