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

1038 Commits

Author SHA1 Message Date
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
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
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
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
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
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
af64c4ca58 Merge branch 'develop' into feature/513-activate-land-use 2020-03-08 16:05:55 +00:00
Maciej Ziarkowski
4c7edee271 Update Age colours to latest style 2020-03-06 14:12:23 +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
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
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
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
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
Maciej Ziarkowski
9cba25405a Activate height to apex colour map 2020-01-16 14:52:10 +00:00
Maciej Ziarkowski
d2a1469b72 Separate out land use data access layer 2020-01-14 22:53:22 +00:00
Maciej Ziarkowski
7efcf8ccc3 Rename autofill dropdown folder and files 2020-01-09 19:44:38 +00:00
Maciej Ziarkowski
09c9261677 Improve multi-data-entry UI 
The "No entries" state is now contained in a dashed-border box
Adding an empty entry is not not possible
 2020-01-09 19:43:59 +00:00
Maciej Ziarkowski
494ec52afb Move from pg_trgm to full-text search for autofill 2020-01-09 15:35:38 +00:00
Maciej Ziarkowski
11743dc983 Group multi-data-entry elements 2020-01-09 15:08:58 +00:00
Maciej Ziarkowski
c07937baee Use npm package for throttle hook 2020-01-09 13:07:50 +00:00
Maciej Ziarkowski
cd6fa2d68e Disable landuse_group when landuse_class not empty 2020-01-07 19:27:31 +00:00
Maciej Ziarkowski
6ee4432fd5 Improve multi-edit, autofill usability 2020-01-07 19:06:42 +00:00
Maciej Ziarkowski
d9c0cca31b Fix frontend detection of edits in arrays 2020-01-07 18:35:30 +00:00
Maciej Ziarkowski
cced9e6cc8 Amend autofill dropdown style/content 2020-01-07 18:32:13 +00:00
Maciej Ziarkowski
b5131d12a3 Add throttling of autofill API calls 2020-01-07 18:26:23 +00:00
Maciej Ziarkowski
fa31ffc198 Check in frontend for unsaved array edits 2020-01-07 18:14:51 +00:00
Maciej Ziarkowski
4a098ad57c Add autofill dropdown to data entry 2020-01-06 19:48:47 +00:00
Martin-dJ
08cc107388 Fixed issue with database query and implemented review suggestions 2020-01-06 18:10:42 +00:00
Maciej Ziarkowski
cf5906dc89 Reorganise multi data entry 2020-01-06 16:36:19 +00:00
Maciej Ziarkowski
f67323fc16 Reuse single data entry in multi 2020-01-06 16:21:44 +00:00
Maciej Ziarkowski
aafb81a17b Add autofill backend 2020-01-06 16:15:36 +00:00
Maciej Ziarkowski
00c77bfca7 Merge branch 'develop' into feature/api-helpers 2020-01-02 15:44:35 +00:00
Maciej Ziarkowski
93a465a549
Merge pull request #536 from mz8i/fix/parse-building-id 
Fix/parse building
 2020-01-02 13:01:27 +00:00
Maciej Ziarkowski
5a6091f13f Move int param parsing to common function 2020-01-02 12:56:16 +00:00
Maciej Ziarkowski
beea6675cb Remove null-conditional operator 2020-01-02 12:23:12 +00:00
Maciej Ziarkowski
f351c87756 Parse building ID in API controller 2020-01-02 12:39:24 +01:00
Maciej Ziarkowski
dbd6487b0b Add API helpers 2020-01-02 10:59:13 +00:00
Maciej Ziarkowski
465c8f7dbf
Update welcome page text 2019-12-16 18:54:12 +01:00
Martin-dJ
1f2256c721 Implementation of basic leaderboard 2019-12-16 13:26:13 +00:00
Maciej Ziarkowski
817b44515b Change Mixd Use order to capitalised 2019-12-03 18:19:50 +00:00
Maciej Ziarkowski
529ce96e42 Add current land use frontend (read-only) 2019-12-03 18:17:04 +00:00
Maciej Ziarkowski
5170dc7971 Improve land use processing backend 2019-12-03 17:30:51 +00:00
Maciej Ziarkowski
c3b5c51da7 Deep compare array fields 2019-12-03 17:29:08 +00:00
Maciej Ziarkowski
adb620fc77 Plug in domain logic processing into building API 2019-12-03 13:51:16 +00:00
Maciej Ziarkowski
3ea505359a Add land use classification API processing logic 2019-12-03 13:50:24 +00:00
Maciej Ziarkowski
6a7c4f1270 Re-order land use legend 2019-12-02 15:19:44 +00:00
Maciej Ziarkowski
415a6872b7 Add legend for land use 2019-12-02 15:12:18 +00:00
Maciej Ziarkowski
51a2a3a1d8 Add tile layer and style for land use 2019-12-02 15:12:02 +00:00
Maciej Ziarkowski
2428b28eda Merge branch 'master' into feature/500-age-source-update 2019-12-02 00:12:55 +00:00
Maciej Ziarkowski
3d72fd9459 Update Age source options without 'Other website' 2019-12-02 00:01:43 +00:00
Maciej Ziarkowski
06dfae0113 Set bounds for numbers, increase lat/lon precision 2019-11-28 12:22:10 +00:00
Maciej Ziarkowski
c421ffbdb7 Merge branch 'develop' into fix/lat-lon-errors 2019-11-28 12:00:11 +00:00
Maciej Ziarkowski
56b1aafb98
Merge pull request #521 from mz8i/feature/517-prevent-copy-empty 
Feature 517: prevent copying empty values
 2019-11-27 14:01:33 +01:00
Maciej Ziarkowski
f96dcc85fb Prevent copying empty values 2019-11-26 12:09:27 +00:00
Maciej Ziarkowski
7c863b41de Prevent selecting empty field for copy 2019-11-22 19:30:03 +00:00
Maciej Ziarkowski
31768a0860 Prevent blocked user from logging in 2019-11-22 18:13:13 +00:00
Maciej Ziarkowski
866e103a80 Handle nullish, not falsey values in numeric input 2019-11-22 16:03:36 +00:00
Maciej Ziarkowski
2ffa14cdbb Add info when no recent edit history to display 2019-11-18 14:18:19 +00:00
Maciej Ziarkowski
fe84016e79
Merge pull request #508 from mz8i/feature/499-global-edit-history 
Decrease simple edit history time to 1 week
 2019-11-18 12:36:29 +00:00
Maciej Ziarkowski
3b35331ead Decrease simple edit history time to 1 week 2019-11-18 11:21:02 +00:00
Maciej Ziarkowski
ff219a3d6e
Merge pull request #498 from mz8i/feature/277-data-accuracy-info 
Add data accuracy text to welcome screen
 2019-11-14 18:22:59 +00:00
Maciej Ziarkowski
07c2fe0933
Merge pull request #503 from mz8i/feature/499-global-edit-history 
Global edit history
 2019-11-14 16:49:12 +00:00
Maciej Ziarkowski
29245906de Amend welcome screen text 2019-11-14 16:31:33 +00:00
Maciej Ziarkowski
e833c4dd3b Amend forgotten password email send confirmation 2019-11-14 16:17:05 +00:00
Maciej Ziarkowski
96b4a73573 Add await to catch errors in user service 2019-11-14 16:16:20 +00:00
Maciej Ziarkowski
c84ed10af5 Handle unknown fields 2019-11-14 16:08:25 +00:00
Maciej Ziarkowski
5e3ce365d5 Improve history types, handling unknown category 2019-11-14 16:01:24 +00:00
Maciej Ziarkowski
70fa8725b4 Add global edit history page 2019-11-14 15:28:12 +00:00
Maciej Ziarkowski
91270ff6a0 Add optional links to edit history components 2019-11-14 15:27:25 +00:00
Maciej Ziarkowski
a02bcd8c27 Fetch data when opening building page without SSR 2019-11-14 15:25:19 +00:00
Maciej Ziarkowski
b8d5c9f0f6 Add basic global edit history API endpoint 2019-11-14 12:56:03 +00:00
Maciej Ziarkowski
0df2a369f4 Import library css without relative import path 2019-11-13 19:23:22 +00:00
Maciej Ziarkowski
bc76185613 Move css imports group to second place 2019-11-13 19:20:47 +00:00
Maciej Ziarkowski
70a24f6367 Adjust welcome text and link color 2019-11-13 19:10:02 +00:00
Maciej Ziarkowski
1241b24ba1 Add data accuracy text to welcome screen 2019-11-13 12:55:17 +00:00
Maciej Ziarkowski
529d535b6d Merge branch 'develop' into feature/sort-imports 2019-11-13 11:47:51 +00:00
Tom Russell
aeebd7ed36
Merge pull request #458 from tomalrussell/fix/375-attribution 
Highlight attribution requirements
 2019-11-12 11:00:19 +00:00
Tom Russell
215f6bdee0
Fix closing Link tag 2019-11-12 10:49:15 +00:00
Tom Russell
59ec2f7ecb
Merge branch 'master' into fix/375-attribution 2019-11-12 10:45:23 +00:00
Tom Russell
ba501dfc3c
Merge pull request #466 from mz8i/feature/72-increase-max-zoom 
Allow zoom level 19 with OS basemap interpolation
 2019-11-12 10:43:40 +00:00
Maciej Ziarkowski
739bcad08a Lint semicolons 2019-11-07 09:13:30 +01:00
Maciej Ziarkowski
b95185d9dd Lint newline at end of file 2019-11-07 08:00:14 +00:00
Maciej Ziarkowski
8019e77200 Organise imports in tileserver 2019-11-07 07:48:51 +00:00
Maciej Ziarkowski
175d3236eb Organise imports in frontend and API 2019-11-07 07:45:19 +00:00
mz8i
24b8b13ad6
Merge pull request #463 from mz8i/feature/simplify-tile-renderer 
Simplify tile renderer, improve stitching and caching
 2019-11-07 07:35:19 +00:00
mz8i
6a42961eaf
Merge pull request #489 from mz8i/feature/generate-prop-types 
Auto-generate propTypes
 2019-11-06 20:01:05 +00:00
Maciej Ziarkowski
ffcf31cb34 Format boolean values in edit history 2019-11-06 15:39:44 +00:00
Maciej Ziarkowski
daf36c9750 Add propTypes generation, remove manual propTypes 2019-11-05 20:13:10 +00:00
mz8i
bc0cd575e0
Merge pull request #479 from mz8i/feature/189-increase-likes 
Feature 189: Adjust likes colour scale and legend
 2019-10-31 16:30:08 +00:00
Maciej Ziarkowski
bf1a8def6e Revise like bins and colour scale 2019-10-31 13:22:34 +00:00
Maciej Ziarkowski
5406b60416 Improve edit history styling 2019-10-30 13:29:02 +00:00
Maciej Ziarkowski
09b84f5b84 Add white background on edit history header 2019-10-30 12:35:23 +00:00
Maciej Ziarkowski
740b788246 Only accept view/edit modes for building view 2019-10-30 12:28:10 +00:00
mz8i
06eb4e53ed
Merge branch 'develop' into feature/84-show-edit-history 2019-10-29 17:58:01 +00:00
mz8i
cf18e5bb70
Merge branch 'develop' into feature/data-container-state 2019-10-29 17:34:27 +00:00
Tom Russell
c18851b3eb Remove unused 'configuration' field in size (#457) 
Closes #409

Building attachment/configuration is now in type
 2019-10-29 17:20:05 +00:00
mz8i
25029ef153
Load max revision ID on start (#485) 
* Load max revision ID on start

* Update revision ID upon mounting MapApp
 2019-10-29 16:56:49 +00:00
mz8i
997e92d27d
Add GLA boundary to map (#464) 2019-10-28 16:48:59 +00:00
mz8i
5d3eff4800
Branding adjustments (#471) 
* Synchronise category colours with WIX page version

* Display static colourful logo on map pages
 2019-10-28 16:46:22 +00:00
Maciej Ziarkowski
c2ea90a372 Fix typo in likes legend 2019-10-28 16:07:22 +00:00
Maciej Ziarkowski
3cecb62993 Adjust likes colour scale and legend 2019-10-28 15:55:40 +00:00
Maciej Ziarkowski
86b252f186 Add field labels to multi edit view 2019-10-25 18:07:24 +01:00
Maciej Ziarkowski
09c343f91d Move all field titles/tooltips to data_fields.ts 2019-10-25 17:43:39 +01:00
Maciej Ziarkowski
0f88627ab2 Update code documentation 2019-10-24 15:57:09 +01:00
Maciej Ziarkowski
8bc56fbbe2 Add edit history frontend routing 2019-10-24 12:20:48 +01:00
Maciej Ziarkowski
2e47d85faa Add edit history components 2019-10-24 12:19:54 +01:00
Maciej Ziarkowski
946209282c Use fields info in age container 2019-10-24 12:16:23 +01:00
Maciej Ziarkowski
3892191144 Add data fields definition, populate Age and Like 2019-10-24 12:15:41 +01:00
Maciej Ziarkowski
d70f341448 Move buttons code out from ContainerHeader 2019-10-24 12:13:07 +01:00
Maciej Ziarkowski
ab04483479 Sort edit history from new to old 2019-10-24 12:05:52 +01:00
Maciej Ziarkowski
aa59067d9e Add edit history route/controller 2019-10-21 16:29:44 +01:00
mz8i
c63f42f921
Refactor types and await for user/building backend (#476) 
* Refactor buildings API for async/await, types

* Return building data after update

* Refactor users API for await, TS types

* Refactor building service to remove repetition

As part of this refactor, these changes in functionality were made:
- tx isolation lvl for save/like/unlike building is always serializable
- both reverse and forward patch updated for like/unlike
- comparing old and new data uses == instead of ===
 (this is because the new data even for numbers comes in as string)
- the checking of no data change in case of building unlike was fixed
 (didn't work because it re-used code for like which is different)

* Improve param order, docs for updateBuildingData
 2019-10-21 15:19:35 +01:00
Maciej Ziarkowski
f8c10c622f Allow discard edits, activate save button on edit 2019-10-21 11:20:10 +01:00
Maciej Ziarkowski
dced56d004 Move to onChange/onLike handlers only, add types 2019-10-18 15:06:50 +01:00
Maciej Ziarkowski
f54fcf0cc4 Improve types for Building across app 2019-10-17 17:38:44 +01:00
Maciej Ziarkowski
c2396e8881 Remove old TODO comments 2019-10-17 17:07:34 +01:00
Maciej Ziarkowski
b6b87c8304 Process input value inside TextboxDataEntry 2019-10-17 17:00:01 +01:00
Maciej Ziarkowski
0e1aca0e9e Fix DataEntry errors 2019-10-17 16:15:28 +01:00
Maciej Ziarkowski
e1e1bc7aa5 Process input inside SelectDataEntry 2019-10-17 15:32:41 +01:00
Maciej Ziarkowski
7c042dd58e Process input value inside CheckboxDataEntry 2019-10-17 14:38:52 +01:00
Maciej Ziarkowski
ca4750b0be Process input value inside DataEntry 2019-10-17 13:15:48 +01:00
Maciej Ziarkowski
7e9cc4cde4 Parse numbers in NumericDataEntry 2019-10-16 21:16:10 +01:00
Maciej Ziarkowski
b489b15d8f Remove static ID from like checkbox 2019-10-16 20:34:29 +01:00
Maciej Ziarkowski
9d4d24aefc Fix label click on like checkbox with non-uniq id 
The label for the like checkbox was not clickable because the ID #like
was not unique on the website. The ID has been changed to like_check
to avoid that.
 2019-10-16 13:30:59 +01:00
Maciej Ziarkowski
f189ae603e Clear all state fields on select change 2019-10-16 13:11:25 +01:00
Maciej Ziarkowski
b81d49df43 Store only current edits in data container state 2019-10-15 19:16:48 +01:00
Maciej Ziarkowski
0a1b41cc07 Add DataTitle types 2019-10-15 15:44:22 +01:00
Maciej Ziarkowski
f498f4730b Fix view/edit route redirect 2019-10-15 14:53:01 +01:00
Maciej Ziarkowski
3b8594a604 Improve scroll area UI 2019-10-15 14:38:07 +01:00
Maciej Ziarkowski
3a35f5dab5 Type, simplify, fix data containers 
This contains a couple fixes for minor bugs
that were discovered after adding static types
to the category data editing code.
The other changes are mostly refactoring and styling
 2019-10-15 14:37:23 +01:00
Maciej Ziarkowski
ce473cb453 Fix checkbox inputs 2019-10-15 13:20:09 +01:00
Maciej Ziarkowski
4cd21088ce Add field groups to Size (storeys expanded) 2019-10-09 14:12:19 +01:00
Maciej Ziarkowski
38d84ff5ce Rewrite DataEntryGroup with hooks, child count 2019-10-09 12:52:38 +01:00
Maciej Ziarkowski
0240e94adc Allow zoom level 19 with OS basemap interpolation 2019-10-08 17:40:30 +01:00
Maciej Ziarkowski
354d8a6f96 Add data entry groups to planning category 2019-10-08 14:20:43 +01:00
Maciej Ziarkowski
4320e20952 Add DataEntryGroup component 2019-10-08 14:20:22 +01:00
Maciej Ziarkowski
27ba5310bb Cache base layers but don't clear on bbox clear 2019-10-07 17:27:22 +01:00
Maciej Ziarkowski
ed999e1311 Use gravity instead of top/left for tile composite 2019-10-07 17:01:41 +01:00
Maciej Ziarkowski
14b79ce891 Simplify tile stitching with sharp 
The new method uses the composite() method of sharp
to reduce the number of times a PNG buffer is created.
The number could be further reduced from two to one,
if the issue #1908 from lovell/sharp is resolved so that
composite and resize can be chained without an
intermediate call to .png().toBuffer()
 2019-10-07 16:21:36 +01:00
Maciej Ziarkowski
5417b5c8b6 Use functions instead of classes in tile rendering 2019-10-07 13:34:22 +01:00
Tom Russell
98a826179c Fix link to Streetscape Wix page (URL is /greenery) 2019-10-04 15:00:29 +01:00
mz8i
c0f2c75ca8
Merge branch 'master' into fix/multi-edit 2019-10-03 15:29:33 +01:00
Maciej Ziarkowski
dd7d66e5fc Add OS map data and UPRN licencing 2019-10-03 14:55:54 +01:00
Maciej Ziarkowski
2a395d5f2e Update Open Graph website description text 2019-10-03 13:24:48 +01:00
Maciej Ziarkowski
d3cc69fda6 Add square logo for social sharing image 2019-10-03 13:19:44 +01:00
Tom Russell
67114ebd88 Add attribution note to contact page 2019-10-03 07:50:04 +01:00
Tom Russell
386fb22c10 Link contact email as mailto 2019-10-03 07:49:49 +01:00
Tom Russell
bcfd89196c Add licensing/attribution note to downloads page 2019-10-03 07:39:13 +01:00
Tom Russell
8e3d3c5622 Add reference links to agreements on account page 2019-10-03 07:36:17 +01:00
Tom Russell
f100e7b751 Add attribution note to welcome box 2019-10-03 07:32:54 +01:00
Tom Russell
860bb0b237 Enable copying dates 2019-10-02 22:35:57 +01:00
Tom Russell
173d5128ef Update multi-edit style 
Drop unused code paths which relied on shared
config data structure.

Present simplified key/value data entries

Use category colour in header
 2019-10-02 22:33:42 +01:00
Tom Russell
7899588f87 Fix multi-edit shouldn't deselect building 
If a user is in multi-edit mode and clicks where there is no building,
this should be a no-op.

Previous behaviour would clear the building and incidentally the
URL query string, losing selected attributes to copy, and triggering
URL-parsing error (caught as of fa785a7).
 2019-10-02 22:17:37 +01:00
Tom Russell
fa785a726c Add JSON.parse error-handling when parsing from URL 2019-10-02 22:13:34 +01:00
Maciej Ziarkowski
40891cd4ce Add Sustainability DEC description to legend 2019-10-02 19:41:53 +01:00
Maciej Ziarkowski
564640d94b Add data accuracy agreement 2019-10-02 19:26:18 +01:00
Maciej Ziarkowski
2eddd8ac3d Amend login/signup format, add email notice 2019-10-02 19:17:25 +01:00
Maciej Ziarkowski
8eb0923098 Move Save button to top of edit view 2019-10-02 19:16:55 +01:00
Maciej Ziarkowski
d408978165 Move download links towards end of header 2019-10-02 19:16:05 +01:00
Maciej Ziarkowski
c1b7cfa644 Amend welcome text 2019-10-02 18:40:42 +01:00
Maciej Ziarkowski
1f5abba409 Add Contact page 2019-10-02 18:38:12 +01:00
mz8i
64dc5bb334
Merge pull request #448 from tomalrussell/fix/minor-text 
Fix/minor text
 2019-10-02 16:51:40 +01:00
mz8i
13495ab495
Fix/map update (#450) 
* Move building deselect logic from map-app to mapp

* Use building_id instead of ref_toid in handleClick
 2019-10-02 16:47:45 +01:00
mz8i
e7b7e3fe67
Feature/misc ui fixes (#449) 
* Re-style category links, remove More button

* Fix colour, order and text of categories

* Increase legend max height
 2019-10-02 16:28:11 +01:00
Tom Russell
d6a6bf4fb0 Update privacy policy with password reset emails 2019-10-02 15:28:18 +01:00
Tom Russell
c43651830a Remove 'draft' note from privacy policy 2019-10-02 15:27:55 +01:00
Tom Russell
48fa3fc3ad Remove 'draft' note from contributor agreement 2019-10-02 15:27:21 +01:00
Tom Russell
bc53605f3f Handle inactive/no-building view/edit combinations 2019-10-02 15:15:13 +01:00
Tom Russell
b1941ae358 Drop colouring-may-be-slow message 2019-10-02 15:14:47 +01:00
Tom Russell
91a29affb3 Add text around GItHub link 2019-10-02 15:07:12 +01:00
Tom Russell
fb9952b2a6 Fix typo 2019-10-02 15:06:55 +01:00
Tom Russell
7dc286bdbe Disable Height to eaves (re-enable after db field) 2019-10-02 15:06:10 +01:00
mz8i
606a36ce6c
Activate type category and colour map (#446) 2019-10-02 14:34:44 +01:00
mz8i
fa089f10e1
Feature/435 activate sustainability (#445) 
* Add colour scale definition for sustainability DEC

* Add sustainability DEC data render definition

* Activate sustainability category
 2019-10-02 13:32:00 +01:00
Tom Russell
0954f5aa36
Merge pull request #444 from tomalrussell/fix/selectbox 
Fix SelectDataEntry
 2019-10-02 12:32:37 +01:00
Tom Russell
34fb8a62c7 Fix propTypes name for onChange in MultiDataEntry 2019-10-02 12:28:35 +01:00
Tom Russell
1043d0e7a9 Fix onChange handler for select data entry 
E.g. in Age > Source of Information, allows selecting
data.
 2019-10-02 12:28:19 +01:00
Tom Russell
9ba928b5e1 Run onLike when checking/unchecking like building 2019-10-02 12:19:42 +01:00
Tom Russell
b755b99040 Name building_like consistently in Like container 2019-10-02 12:18:22 +01:00
Tom Russell
1612b66062 Pass building_like down to data components 2019-10-02 12:18:02 +01:00
mz8i
ecc928b910
Use tile scale cache suffix for scale above 1 only (#440) 
The tile params formatting is used for caching.
Don't add the @1x suffix for scale 1, in order to
re-use old cache from before retina tiles were enabled
 2019-10-01 17:03:08 +01:00
Maciej Ziarkowski
5f4a939a51 Add downloads link to header 2019-10-01 14:57:23 +01:00
Maciej Ziarkowski
6614cdfb4b Handle case of no extracts available 2019-10-01 14:46:28 +01:00
Maciej Ziarkowski
844bedc596 Move data extracts to new folder structure 2019-09-30 16:03:16 +01:00
Maciej Ziarkowski
6783a00e21 Merge branch 'develop' into feature/342-bulk-extract 2019-09-30 15:06:01 +01:00
mz8i
dafd43b64e
Merge pull request #428 from mz8i/feature/414-reorganise-categories 
Feature 414: reorganise categories
 2019-09-30 14:38:35 +01:00
mz8i
a83a027f14
Merge pull request #423 from mz8i/feature/tile-server-refactor 
Tile server refactor, highlight colour, retina tiles
 2019-09-30 14:29:21 +01:00
mz8i
0a5c14762e
Merge pull request #424 from mz8i/feature/286-validate-username 
Feature 286: validate username
 2019-09-30 12:43:36 +01:00
mz8i
8be81b3999
Merge pull request #426 from mz8i/feature/412-semantic-tags 
Feature 412: semantic tags
 2019-09-30 12:41:34 +01:00
mz8i
da4f998fb0
Merge pull request #417 from mz8i/feature/mobile-ui 
UI/UX Improvements
 2019-09-30 12:23:46 +01:00
mz8i
37278fd639
Merge pull request #418 from mz8i/feature/415-no-password-log 
Prevent logging passwords in failed login attempts
 2019-09-30 12:07:46 +01:00
Maciej Ziarkowski
9de8113e20 Add web app manifest and icons 2019-09-18 18:43:21 +01:00
Maciej Ziarkowski
6f113282ad Add html form validation to sign up form 2019-09-18 15:20:56 +01:00
Maciej Ziarkowski
e2e37d88b8 Set max pass length to 128 
OWASP Authentication cheatsheet says 128 is typical max password length
It suggests to not set it too low to let users use complex passwords
 2019-09-18 15:17:22 +01:00
Maciej Ziarkowski
8d28d1be66 Reposition legend expand button 2019-09-18 14:52:21 +01:00
Maciej Ziarkowski
33dc30612b Collapse header when clicking on link 2019-09-18 14:33:23 +01:00
Maciej Ziarkowski
3ba8cdd7a4 Merge branch 'feature/mobile-ui' into feature/tile-server-refactor 2019-09-18 12:38:52 +01:00
Maciej Ziarkowski
60ce7eea12 Change overflow from scroll to auto 2019-09-18 12:38:11 +01:00
Tom Russell
a022d90e59
Merge branch 'develop' into feature/view_edit_refactor 2019-09-17 21:25:50 +01:00
Maciej Ziarkowski
269e6ba989 Add tileset param validation in tile server 2019-09-17 18:35:05 +01:00
Maciej Ziarkowski
2b1b553a41 Enable highlight colour, retina tiles in frontend 2019-09-17 18:21:51 +01:00
Maciej Ziarkowski
fe3f02bd85 Allow missing base layer query param for highlight 2019-09-17 18:19:21 +01:00
Maciej Ziarkowski
9fd690c1ac Update cache invalidation mechanism 2019-09-17 18:12:18 +01:00
Maciej Ziarkowski
5adb8e6146 Use new renderers in tile server 2019-09-17 18:11:42 +01:00
Maciej Ziarkowski
ef4d46e36b Add asyncController 2019-09-17 18:05:05 +01:00
Maciej Ziarkowski
5995adeb88 Add data and rendering definition 2019-09-17 18:03:20 +01:00
Maciej Ziarkowski
ae0202d6da Add blank, branching renderers 2019-09-17 18:01:48 +01:00
Maciej Ziarkowski
472e91f275 Add cached renderer 2019-09-17 18:01:23 +01:00
Maciej Ziarkowski
70c05071a8 Add windowed renderer 2019-09-17 18:01:09 +01:00
Maciej Ziarkowski
4b0d51dd80 Add stitch renderer 2019-09-17 18:00:49 +01:00
Maciej Ziarkowski
bd467ceb3b Add data source renderer 2019-09-17 17:59:20 +01:00
Maciej Ziarkowski
5cfa487844 Add tile cache 2019-09-17 17:58:27 +01:00
Maciej Ziarkowski
de34280a2e Add tile server utilities 2019-09-17 17:54:35 +01:00
Maciej Ziarkowski
bb6966dccb Add tile server types 2019-09-17 17:50:46 +01:00
Maciej Ziarkowski
31efae3885 Add username and password validation 2019-09-11 16:28:05 +01:00
Maciej Ziarkowski
bc060bb666 Allow custom highlight colour based on data layer 2019-09-10 16:58:14 +01:00
Maciej Ziarkowski
d14c4ce671 Prevent logging passwords in failed login attempts 2019-09-10 15:38:01 +01:00