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

850 Commits

Author SHA1 Message Date
Maciej Ziarkowski
305f2f1671 Refactor map app with hooks and separated config 2021-02-24 07:49:56 +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
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
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
2d6a18f81b Add verification for Facade Data, thread info through frontend 2020-08-04 15:54:49 +01: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
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
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
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
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
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
88d1032e13 Rename field to revision_timestamp in edit history 2020-01-23 10:31:20 +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
9cba25405a Activate height to apex colour map 2020-01-16 14:52:10 +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
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
00c77bfca7 Merge branch 'develop' into feature/api-helpers 2020-01-02 15:44:35 +00:00
Maciej Ziarkowski
beea6675cb Remove null-conditional operator 2020-01-02 12:23:12 +00: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
529ce96e42 Add current land use frontend (read-only) 2019-12-03 18:17:04 +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
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
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
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
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
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
175d3236eb Organise imports in frontend and API 2019-11-07 07:45: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
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
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
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
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
Maciej Ziarkowski
6f113282ad Add html form validation to sign up form 2019-09-18 15:20:56 +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
Maciej Ziarkowski
2b1b553a41 Enable highlight colour, retina tiles in frontend 2019-09-17 18:21:51 +01:00
Maciej Ziarkowski
456514ec51 Upgrade react-router-dom and fix map path 2019-09-10 15:07:27 +01:00
Maciej Ziarkowski
46a5cdd658 Change greenery to streetscape 2019-09-10 15:05:35 +01:00
Maciej Ziarkowski
7be25e22a7 Add comment to type declaration file 2019-09-10 12:26:11 +01:00
Maciej Ziarkowski
f5e21e5c1f Always show highlight layer on top of map 2019-09-09 18:14:51 +01:00
Maciej Ziarkowski
56662c38bf Display data extracts in <ul> 2019-09-09 13:29:05 +01:00
Maciej Ziarkowski
556269661a Restore empty prefix for AttributionControl 
Without this, the attribution control shows a link to Leaflet website
 2019-09-09 12:35:03 +01:00
Maciej Ziarkowski
f69a0ef90f Update links to map views 2019-09-09 01:11:45 +01:00
Maciej Ziarkowski
4bfee10508 Allow no selection in categories/building-view 2019-09-09 01:10:52 +01:00
Maciej Ziarkowski
b9648c47af Rework split between app/map-app/map 2019-09-09 01:09:05 +01:00
Maciej Ziarkowski
6625099c03 Remove isBuilding prop from SearchBox 2019-09-09 00:44:26 +01:00
Maciej Ziarkowski
c710b3c59c Make all static pages scrollable 2019-09-06 19:12:01 +01:00
Maciej Ziarkowski
b438871de7 ALlow scroll on jumbotron welcome 2019-09-05 13:33:48 +01:00
Maciej Ziarkowski
ee1e64c185 Refactor and restyle logo 2019-09-05 13:33:20 +01:00
Maciej Ziarkowski
7fbb3b21f9 Restyle main layout 2019-09-04 20:47:40 +01:00
Maciej Ziarkowski
fce0987c3d Restyle legend 2019-09-04 20:47:29 +01:00
Maciej Ziarkowski
05238b5963 Restyle map and controls 2019-09-04 17:18:45 +01:00
Maciej Ziarkowski
ef218009d6 Restyle sidebar 2019-09-04 17:08:53 +01:00
Maciej Ziarkowski
6422be118d Reorganise/restyle header 2019-09-04 17:04:07 +01:00
Maciej Ziarkowski
ceec91670d Add types for react-leaflet-universal 2019-09-04 15:05:41 +01:00
Maciej Ziarkowski
3724d74217 Add data extracts frontend 2019-08-30 13:45:55 +01:00
Tom Russell
065a49c7c5 Fix multi-entry 2019-08-23 17:46:22 +01:00
Tom Russell
541a307b99 Unpack building edit to data-components with mode 2019-08-23 17:35:17 +01:00
Tom Russell
b44b43bc31 Include view icon link 2019-08-23 14:56:29 +01:00
Tom Russell
dd8f7072ed Fix dropped ref to fields-config 
MultiEdit will need revisiting to use data components and validate.
 2019-08-23 14:18:08 +01:00
Tom Russell
616bc676a3 Move modal to components, password pages to user 2019-08-23 14:16:40 +01:00
Tom Russell
7d3e59a0ed Use Fragment instead of dl wrapper 2019-08-23 14:09:23 +01:00
Tom Russell
51d8ac3ed7 Fold edit-handling functionality into data-container 
The intention is to wrap components using withCopyEdit and to use
a 'mode' prop to control view/edit/copy/paste mode.

Next steps to unpack form field data components and update in eaech
category container.
 2019-08-23 12:59:50 +01:00
Tom Russell
5060628937 Drop fields-config.json 2019-08-23 12:58:40 +01:00
Tom Russell
f3e583ee30 Like view-only entry 2019-08-23 12:58:40 +01:00
Tom Russell
3cda6b7513 Planning view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
97ed3f6e1f Construction view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
9ec27caa79 Size view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
68f96dff11 Type view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
f05c1b5552 Use view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
a9cd7a58ea Location view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
4fcc256f16 Team view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
b6ae8f4a55 Sustainability view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
3dff7cf34b Greenery view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
19d08c9c97 Community view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
f3fb8f12e0 Fix back button spacing 2019-08-23 12:58:40 +01:00
Tom Russell
8d7f80ed90 Age data fields - view only 2019-08-23 12:58:40 +01:00
Tom Russell
f26aa19051 Sketch out view-only data components 2019-08-23 12:58:40 +01:00
Tom Russell
1997c34470 Avoid dependency loop 
- building-view contained BuildingVIew and withCopyEdit
- and imported each data-container
- which each imported withCopyEdit to create their data-container

seemed okay from ts/webpack dev environment
but failed in jest test
 2019-08-23 12:58:40 +01:00
Tom Russell
22db157e6e Create (empty) DataContainers for each category 
Fields/children will be written as components, rather than generated declaratively.

BuildingEdit will be folded into the withCopyEdit higher-order-component,
hopefully removing some duplicated structure and functionality.
 2019-08-23 12:58:40 +01:00
Tom Russell
c7b7174f55 Fix Sidebar use in multi-edit 2019-08-23 12:56:22 +01:00
Tom Russell
a3254544e7 Pull BuildingNotFound out of view/edit 2019-08-23 12:56:22 +01:00
Tom Russell
566b738f91 Fix building edit details on props change 
- EditForm owns form state
- fully uncontrolled component
- when props change (e.g. when clicking on another building) the
  component should completely re-render
 2019-08-23 12:56:22 +01:00
Tom Russell
44bd5e67d1 Simplify sidebar container - no title 2019-08-23 12:56:22 +01:00
Tom Russell
1ab015e4df Fix duplicate slug 2019-08-23 12:56:22 +01:00
Tom Russell
7301d6efda Fix category block width 2019-08-23 12:56:22 +01:00
Tom Russell
ae0d7855f7 Style edit/view section header 2019-08-23 12:56:22 +01:00
Tom Russell
dec4801688 Category sidebar block styles 2019-08-23 12:56:22 +01:00
Tom Russell
94d158c59e Pull out categories.css 2019-08-23 12:56:22 +01:00
Tom Russell
1c265b828d Declarative categories list 2019-08-23 12:56:22 +01:00
Tom Russell
43f239c853 Render single section in view/edit 2019-08-23 12:56:22 +01:00
Tom Russell
99456e2431 Move building (sidebar) and map components to nested dirs 2019-08-23 12:56:22 +01:00
Tom Russell
f8f2b5e3e8 Collect user pages in nested subdirectory 2019-08-23 12:56:22 +01:00
Tom Russell
b0f9aa3900 DRYer logo 2019-08-23 12:55:15 +01:00
Tom Russell
b0bfe70e9d Move common components to nested directory 2019-08-23 12:55:15 +01:00
Tom Russell
fefdab7ab4 Move frontend pages to nested directory 2019-08-23 12:54:21 +01:00
Tom Russell
a5447e6ee3 Use React.FunctionComponent when typing 2019-08-23 12:52:25 +01:00
Tom Russell
a35289d9b8
Merge branch 'master' into feature/63-delete-account-frontend 2019-08-23 12:42:03 +01:00
Maciej Ziarkowski
a3ab275378 Remove nested state from ForgottenPassword 2019-08-22 14:48:51 +01:00
Maciej Ziarkowski
072128268c Add frontend for forgotten password 2019-08-22 14:40:38 +01:00
Maciej Ziarkowski
2791e7673d Rename tsx file to follow naming convention 2019-08-22 10:48:37 +01:00
Maciej Ziarkowski
28ffdcf19e Improve modal popup CSS 2019-08-16 15:40:38 +01:00
Maciej Ziarkowski
4ad62eb196 Add simple CSS to show/hide modal 2019-08-16 15:20:54 +01:00
Maciej Ziarkowski
423f35958d Add delete account action to my-account page 2019-08-16 13:21:12 +01:00
Maciej Ziarkowski
d54cc5df41 Add ConfirmationModal component 2019-08-16 13:20:44 +01:00
Maciej Ziarkowski
8b78a74874 Remove unnecessary form action/method 
The forms calling the API had an unnecessary form action and method.
This is because the forms have an onSubmit hook calling preventDefault.
The attributes were removed to avoid confusion.
 2019-08-15 12:19:43 +01:00
Maciej Ziarkowski
2c9b5ea3d8 Modify routes, refactor API structure 2019-08-14 14:05:49 +01:00
mz8i
47f4cacb3f Add draft privacy policy 
Closes #323 via #381
 2019-08-13 21:20:20 +01:00
mz8i
f359d1c2d9 Add contributor agreement 
Closes #317 via #382
 2019-08-13 21:17:39 +01:00
Tom Russell
7d7c22ba98 Return empty string (not null) if user doesn't like building 
Towards #364
 2019-08-12 22:04:45 +01:00
Tom Russell
00bc2ef722
Merge pull request #378 from mz8i/feature/372-fix-info-links 
Fix info links
 2019-08-12 21:41:59 +01:00
Maciej Ziarkowski
3cb853b90d Change energy to sustainability 2019-08-12 17:57:01 +01:00
Maciej Ziarkowski
822217e594 Fix info links 2019-08-12 16:46:45 +01:00
Maciej Ziarkowski
4421930942 Squash TypeScript errors and fix bugs 
Most errors highglighted by TS were due to a lack of type definitions
and were ignored by settings types to `any`.
Some minor bugs were resolved where the fix was obvious.
TODO marks left where `any` needs to be later removed or bugfix verified
 2019-08-09 18:49:43 +01:00
Maciej Ziarkowski
c92c4cded3 Setup TS build (failing), rename files to .ts/.tsx 
The TypeScript build currently runs but fails for a number of files.
This commit only contains rename operations on the source files.
 2019-08-09 15:44:11 +01:00
Tom Russell
87b5fd03f7 Render multi-edit data entries like view 
Could factor out and/or combine DataEntry/MultiDataEntry for better reuse
 2019-08-06 22:13:12 +01:00
Tom Russell
ae7ae7f255 Print data from textbox as entered 
Preserve whitespace
 2019-08-06 22:12:09 +01:00
Tom Russell
fb8b5e0b6f Allow copy MultiDataEntry from view 2019-08-06 22:11:17 +01:00
Tom Russell
eebd8fbcbf Fix checkbox position on login 2019-08-06 20:51:31 +01:00
Tom Russell
b8039d734a Fix search button on mobile 2019-08-06 20:47:02 +01:00
Tom Russell
ce10a2adc4 Enable multi-copy for edit 2019-08-06 20:47:02 +01:00
Tom Russell
4a185b372e Enable multi-copy from building view 2019-08-06 20:47:02 +01:00
Tom Russell
00687dbaed Switch to JSON in URL for copy 
In preparation for multi-attribute copy.
 2019-08-06 20:47:02 +01:00
Tom Russell
95853adc57 Fix category colours 2019-07-07 19:30:00 +01:00
Tom Russell
94494f0ea2 Reorder categories 2019-07-07 19:29:51 +01:00
Tom Russell
2d4666f62f Rework categories/titles/links 2019-07-07 19:21:08 +01:00
Tom Russell
010b5151b5 Fix typo 2019-07-07 19:20:28 +01:00
Tom Russell
4939e9af72 Add link to draft data ethics page 2019-07-07 19:20:17 +01:00
Tom Russell
ca4710eb9b Use innerWidth in js media-query-alike test 2019-07-07 19:20:04 +01:00
Tom Russell
3e143b1165 Scope search-box CSS to search box only 2019-07-07 19:19:34 +01:00
Tom Russell
1ffb5b185a Merge branch 'feature/search_postcode_on_mobile' 2019-07-07 18:10:56 +01:00
Tom Russell
b4a210fe54 Merge branch 'feature/legend_mobile' 2019-07-07 18:10:32 +01:00
Tom Russell
b7410fd2a9 Merge remote-tracking branch 'origin/front_end/simple_fixes' 2019-07-07 18:09:53 +01:00
dominic
2fe6e5c778
Update fields-config.json 
Fixes #261
 2019-07-04 12:45:36 +01:00
Martin-dJ
bdd4f0750b Changes to address issue #276 Search postcode on mobile 2019-06-19 10:35:03 +00:00
Martin-dJ
b783e8f1b5 Changes to legend.css to improve legend position on mobile (issue #274) 2019-06-11 17:18:34 +00:00
Martin-dJ
8b99b61d85 Initial attempt to address issue #274 Legend should not obscure map on mobile 2019-06-06 16:35:30 +00:00
Tom Russell
46c864f78d Multi-like layout 2019-05-28 21:18:36 +01:00