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

869 Commits

Author SHA1 Message Date
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
Maciej Ziarkowski
c3f757734a Make land use legend more concise 2020-03-24 00:16:37 +00:00
Maciej Ziarkowski
853c558b37 Add land use hints 2020-03-23 23:33:03 +00:00
Maciej Ziarkowski
87f16398f2 Parse markdown links in tooltip text 2020-03-23 23:32:10 +00:00
Maciej Ziarkowski
559971c6da Improve tooltip show/hide 2020-03-23 23:31:33 +00:00
Maciej Ziarkowski
d6beb03065 Verify correct land use group parameters 2020-03-22 19:18:07 +00:00
Maciej Ziarkowski
aebf7c7135 Improve errors and data access for building update 2020-03-22 19:03:05 +00:00
Maciej Ziarkowski
786389a50b Fix land use group autofill 2020-03-20 01:05:23 +00:00
Maciej Ziarkowski
bbd570ddbe Clean up land use order map/legend 2020-03-20 01:05:06 +00:00
Maciej Ziarkowski
f6b71c7fc7 Improve land use group autofill 2020-03-19 18:17:56 +00:00
Maciej Ziarkowski
ff027cb64b Remove current land use class from frontend 2020-03-19 14:41:44 +00:00
Maciej Ziarkowski
914d7e56d4 Rewrite landuse domain logic without landuse class 2020-03-19 13:45:35 +00:00
Maciej Ziarkowski
4bda0f0aa6 Add unfinished land use class,group,order impl 2020-03-17 16:29:59 +00:00
Maciej Ziarkowski
bb30aa7098 Include test files in tsconfig for intellisense 2020-03-08 18:46:28 +00:00
Maciej Ziarkowski
af64c4ca58 Merge branch 'develop' into feature/513-activate-land-use 2020-03-08 16:05:55 +00:00
Maciej Ziarkowski
9826ba784c Point tsconfig to client and server TS files only 
Previous config defined a glob for all TS files. But only the files
required from the client or server root files need to be transpiled.
This prevents the whole project build failinig due to one corrupt source
file that might not be committed to the repository, and isn't actually
used anywhere.
 2020-03-08 15:08:26 +00:00
Maciej Ziarkowski
4c7edee271 Update Age colours to latest style 2020-03-06 14:12:23 +00:00
Maciej Ziarkowski
ff703709a5 Gradate stroke width for conservation area 2020-02-17 00:09:20 +00:00
Maciej Ziarkowski
68ae627901 Add outline to listed bldgs in conservation area 2020-02-16 20:44:45 +00:00
Maciej Ziarkowski
d4d8d710f9 Change transport color 2020-02-16 19:49:04 +00:00
Maciej Ziarkowski
aebd90a788 Update legend title for Planning 2020-02-16 18:33:40 +00:00
Maciej Ziarkowski
20ceb7af0a Clean up planning legend and map 2020-02-16 18:04:08 +00:00
Maciej Ziarkowski
a5556670fa Move/rename sections in Planning 2020-02-10 23:39:51 +00:00
Maciej Ziarkowski
48de4fd645 Add disclaimer to legend 2020-02-10 23:38:46 +00:00
Maciej Ziarkowski
84e4d80b3e Add test colours for planning 2020-02-10 22:51:22 +00:00
Maciej Ziarkowski
63c6c77796 Update age legend labels 2020-02-10 21:11:42 +00:00
Maciej Ziarkowski
78315ed986 Update age map colour progression 2020-02-10 21:09:03 +00:00
Maciej Ziarkowski
3bd8ad85ae Merge branch 'fix/age-colours' into feature/538-planning-update 2020-02-10 18:10:41 +00:00
Maciej Ziarkowski
d6e8695140 Swap scheduled monument, conservation area colours 2020-02-10 18:10:00 +00:00
Maciej Ziarkowski
213819859a Disable Historic England entries in planning 2020-02-09 22:51:59 +00:00
Maciej Ziarkowski
3c157f079f Add listed buildings to planning map and legend 2020-02-09 22:51:03 +00:00
Maciej Ziarkowski
f68343f03e Merge branch 'develop' 2020-02-09 18:11:22 +00:00
Maciej Ziarkowski
7f4086f5ad Fix colour scale for height to apex 2020-02-07 16:07:18 +00:00
Maciej Ziarkowski
b168a0b331 Adjust age map colours 2020-02-07 15:57:44 +00:00
Maciej Ziarkowski
0c9177d4fe Add OpenAPI doc for extracts and history 2020-02-07 14:21:18 +00:00
Tom Russell
7e8f34a22e Remove 'Vacant and Derelict' from Land Use key 2020-02-03 22:40:52 +00:00
Tom Russell
1a8e035fea Categories everywhere 2020-02-03 22:36:51 +00:00
Tom Russell
ca6ba7f217 Colour logo in legend 2020-02-03 22:36:51 +00:00
Tom Russell
d19eb4a31a Fix logo colour (category change) 2020-02-03 22:36:51 +00:00
Tom Russell
4dc08630d3 Create dynamics section, move lik to community 2020-02-03 22:36:51 +00:00
Tom Russell
517e338f39 Rework main menu 2020-02-03 22:36:51 +00:00
Tom Russell
f03e2de1ec Position text content (article) pages 2020-02-03 22:36:51 +00:00
Tom Russell
0e23e47762 Change major breakpoint to 990px 2020-02-03 22:36:51 +00:00
Tom Russell
29d5af062e Add draft code of conduct 
From Contributor Covenant, as suggested in #391
 2020-02-03 22:36:51 +00:00
Tom Russell
2d6b15ea4f Sidebar toggle on mobile 2020-02-03 22:36:51 +00:00
Tom Russell
33ff812aec Refine layout 
Sidebar menu, mobile quirks
 2020-02-03 22:36:51 +00:00
Tom Russell
9f961ca116 Broad layout 
Sidebar-constrained header
 2020-02-03 22:36:51 +00:00
Maciej Ziarkowski
4719dea2d4 Update edit history frontend 2020-02-03 12:40:36 +00:00
Maciej Ziarkowski
aa43ab7711 Merge branch 'develop' into feature/history-paging 2020-02-02 16:40:17 +00:00
Maciej Ziarkowski
e3be0a2869 Remove prop types generation, babel from build 2020-01-31 18:34:27 +00:00
Maciej Ziarkowski
fac4c8b35b Split errors into api and general 2020-01-31 18:02:24 +00:00
Maciej Ziarkowski
72cc7e62d2 Add param parsing to edit history controller 2020-01-31 15:45:12 +00:00
Maciej Ziarkowski
753c84acb7 Update edit history tests and implementation 2020-01-31 15:39:47 +00:00
Maciej Ziarkowski
908f3181e6 Remove babel loader from build pipeline 2020-01-31 15:36:37 +00:00
Maciej Ziarkowski
928eed6671 Clarify param parser handling positive integers 2020-01-31 15:35:34 +00:00
Maciej Ziarkowski
297f7ccf5f Update edit history service tests and implementation 2020-01-30 18:23:59 +00:00
Maciej Ziarkowski
60d087c424 Fix mock edit history data access 2020-01-30 15:27:48 +00:00
Maciej Ziarkowski
2d4682685b Fix edit history data access queries/usage 2020-01-29 17:24:44 +00:00
Maciej Ziarkowski
899e450eda Add missing API error class exports/imports 2020-01-29 17:24:04 +00:00
Maciej Ziarkowski
92ff5d7172 Add API error classes, parameter parsing functions 2020-01-29 15:59:44 +00:00
Maciej Ziarkowski
4ff64cda79 Rework edit history service, add unit tests 2020-01-27 01:08:32 +00:00
Maciej Ziarkowski
e682cfa074 Add edit history data access mock 2020-01-27 01:06:58 +00:00
Maciej Ziarkowski
196c7b7873 Add sorting helpers 2020-01-27 01:01:18 +00:00
Maciej Ziarkowski
52ad759c4d Add edit history data access 2020-01-27 00:57:14 +00:00
Maciej Ziarkowski
f6147ead9d
Merge pull request #558 from mz8i/feature/node-12 
Update node to v12.14.1
 2020-01-24 17:18:58 +00:00
Maciej Ziarkowski
de855f08fe Update node to v12.14.1 2020-01-24 15:44:19 +00:00
Maciej Ziarkowski
88d1032e13 Rename field to revision_timestamp in edit history 2020-01-23 10:31:20 +00:00
Maciej Ziarkowski
fd78724203 Add better error message to parseIntParam 2020-01-23 00:26:46 +00:00
Maciej Ziarkowski
f0e791297e Order bulk extracts in API by date descending 2020-01-21 12:37:14 +00:00
Maciej Ziarkowski
9734c089fa Merge branch 'develop' 2020-01-21 12:30:38 +00:00
Maciej Ziarkowski
aa3a5934f3
Collapse number of floors, expand height in size 2020-01-16 17:19:27 +00:00
Maciej Ziarkowski
68af41c16c
Fix query for height map activation 2020-01-16 17:04:17 +00:00