Commit Graph

1870 Commits

Author SHA1 Message Date
Ed Chalstrey
26f79f3351 religious body 2022-06-10 11:06:20 +01:00
Ed Chalstrey
b3ca4fef88 reintroduce designers field 2022-06-06 15:41:39 +01:00
Ed Chalstrey
8fca3bc8d8 completely remove problematic field 2022-06-06 15:33:30 +01:00
Ed Chalstrey
1d187c2b87 try again building_designers MultiDataEntry 2022-06-06 15:23:00 +01:00
Ed Chalstrey
0a9d4c3ba8 rename designers to building_designers 2022-06-06 15:02:16 +01:00
Ed Chalstrey
a34a2c6d66 remove duplications 2022-06-06 14:54:45 +01:00
Ed Chalstrey
2b53dbabe9 rename to has_extension in dataFields 2022-06-06 14:40:51 +01:00
Ed Chalstrey
ce340d7d54 change title for extension_year 2022-06-06 14:35:19 +01:00
Ed Chalstrey
06cb9fc1cb Revert "change title for has_extension"
This reverts commit 38744273c9.
2022-06-06 14:34:00 +01:00
Ed Chalstrey
ee530502ff rearrange so date_year 2022-06-06 14:33:02 +01:00
Ed Chalstrey
38744273c9 change title for has_extension 2022-06-06 14:31:14 +01:00
Ed Chalstrey
66462fefac switch has_extension to LogicalDataEntry 2022-06-06 14:29:35 +01:00
Ed Chalstrey
d031239245 change logic to use has_extension 2022-06-06 14:24:16 +01:00
Ed Chalstrey
b59e811412 change to has_extension bool 2022-06-06 14:20:27 +01:00
Ed Chalstrey
a01a5673af make is_extension editable 2022-06-06 14:04:00 +01:00
Ed Chalstrey
0cf4660952 add is_extension to dataFields 2022-06-06 14:03:02 +01:00
Ed Chalstrey
0dcad9d36f Revert "restore exception validation logic with proper operator"
This reverts commit 40fbc1d223.
2022-06-06 14:02:11 +01:00
Ed Chalstrey
40fbc1d223 restore exception validation logic with proper operator 2022-06-06 13:32:31 +01:00
Ed Chalstrey
7dae80e73a remove breaking logic 2022-06-06 13:27:33 +01:00
Ed Chalstrey
87e93cd193 update dataFields 2022-06-06 13:16:53 +01:00
Ed Chalstrey
631bcc78aa add exception to validation in right place 2022-06-06 12:04:31 +01:00
Ed Chalstrey
ff283f2ea1 Revert "add exception to validation"
This reverts commit be00d24bfa.
2022-06-06 12:03:54 +01:00
Ed Chalstrey
be00d24bfa add exception to validation 2022-06-06 12:01:20 +01:00
Ed Chalstrey
147fcd0253 fix mistake 2022-06-06 11:22:01 +01:00
Ed Chalstrey
43a6cff4da add extra verify buttons 2022-06-06 11:14:21 +01:00
Ed Chalstrey
dbcd3ecdd9 add awards_source_link 2022-06-06 10:53:17 +01:00
Ed Chalstrey
e47d1fa691 add extra tags 2022-06-06 10:46:34 +01:00
Ed Chalstrey
3ed3d6f689 Revert "remove <form>"
This reverts commit 7d0889cc4b.
2022-06-06 10:45:03 +01:00
Ed Chalstrey
7d0889cc4b remove <form> 2022-06-06 10:41:31 +01:00
Ed Chalstrey
d639006da4 restore logic 2022-06-06 10:40:01 +01:00
Ed Chalstrey
7aa7f81ffe Revert "2nd container test"
This reverts commit a2d1ec41cf.
2022-06-06 10:31:43 +01:00
Ed Chalstrey
a2d1ec41cf 2nd container test 2022-06-06 10:30:11 +01:00
Ed Chalstrey
7077ab26b1 remove logic 2022-06-06 10:29:09 +01:00
Ed Chalstrey
0bcb13e54f Revert "add Fragment inside extension logic"
This reverts commit f748948e95.
2022-06-06 10:22:40 +01:00
Ed Chalstrey
f748948e95 add Fragment inside extension logic 2022-06-06 10:20:44 +01:00
Ed Chalstrey
8af1f03176 revert last 2 commits 2022-06-06 10:19:24 +01:00
Ed Chalstrey
23e45032cb remove commented code last commit 2022-06-06 10:17:05 +01:00
Ed Chalstrey
77140ae019 remove conditional logic 2022-06-06 10:16:08 +01:00
Ed Chalstrey
c126400cdc remove <fragment> entirely 2022-06-06 10:14:27 +01:00
Ed Chalstrey
d332cc03b4 single fragment with internal logic 2022-06-06 10:11:30 +01:00
Ed Chalstrey
591ad5b188 Revert "split Fragments"
This reverts commit 0ab06f6f5d.
2022-06-06 09:59:20 +01:00
Ed Chalstrey
0ab06f6f5d split Fragments 2022-06-06 09:57:10 +01:00
Ed Chalstrey
e244826422 fix last commit dont use "this" 2022-06-06 09:53:47 +01:00
Ed Chalstrey
e48414d647 refactor logic to use <form> 2022-06-06 09:52:50 +01:00
Ed Chalstrey
2b24d49333 clarification suggestion 2022-06-01 16:41:10 +01:00
Ed Chalstrey
3c02aa1652 add designer_awards yes/no 2022-06-01 16:39:08 +01:00
Ed Chalstrey
226910d3d6 add lead_designer_type 2022-06-01 16:32:39 +01:00
Ed Chalstrey
24f153db4e finish prev commit 2022-06-01 16:27:08 +01:00
Ed Chalstrey
ee70071ce5 add designers_source_link 2022-06-01 16:25:20 +01:00
Ed Chalstrey
5e23f7b98d add verification button designers 2022-06-01 16:17:23 +01:00
Ed Chalstrey
0955611061 set max length as longest human name 2022-06-01 16:12:19 +01:00
Ed Chalstrey
fa9bf39450 import MultiDataEntry 2022-06-01 16:02:11 +01:00
Ed Chalstrey
61b2a40345 add a maxLength designers 2022-06-01 16:01:09 +01:00
Ed Chalstrey
663a910cc1 add designers 2022-06-01 15:54:01 +01:00
Ed Chalstrey
29a0eb1919 fix category 2022-06-01 15:49:27 +01:00
Ed Chalstrey
d2f315716e add blank example developer_type 2022-06-01 15:03:57 +01:00
Ed Chalstrey
50621b48b0 add developer_type 2022-06-01 15:01:22 +01:00
Ed Chalstrey
d2c725859c rename year_work_carried_out to extension_year 2022-06-01 14:30:31 +01:00
Ed Chalstrey
e80d19a27c add verification buttons 2022-06-01 14:29:06 +01:00
Ed Chalstrey
bacaf77686 move is_extension example to items 2022-06-01 14:25:13 +01:00
Ed Chalstrey
e0cdfb5664 add example value to year_work_carried_out 2022-06-01 14:21:23 +01:00
Ed Chalstrey
3716e0fc95 rename work_carried_out to year_work_carried_out 2022-06-01 14:19:42 +01:00
Ed Chalstrey
14fd83b7ee add extension logic 2022-06-01 14:17:17 +01:00
Ed Chalstrey
2d65372a56 add logic based on is_extension 2022-06-01 14:08:46 +01:00
Ed Chalstrey
6a7bfdf5e7 add tooltip for work_carried_out 2022-06-01 11:40:52 +01:00
Ed Chalstrey
7e5df0a850 remove tooltip 2022-06-01 11:37:39 +01:00
Ed Chalstrey
92fcc44fc9 enable date_year to be edited via Planning 2022-06-01 11:35:58 +01:00
Ed Chalstrey
1dbd4f2964 addd currentYear var 2022-06-01 11:29:59 +01:00
Ed Chalstrey
1adfc5f106 upddate work_carried_out 2022-06-01 11:27:25 +01:00
Ed Chalstrey
63eb2c3bb7 import NumericDataEntry 2022-06-01 11:15:19 +01:00
Ed Chalstrey
8923213f7c add work_carried_out field 2022-06-01 11:12:49 +01:00
Ed Chalstrey
3b42d1b8ef just one additional item 2022-06-01 10:59:26 +01:00
Ed Chalstrey
a283e755e9 activate 2022-06-01 10:55:46 +01:00
Ed Chalstrey
47ea1440ca remove bullet points 2022-06-01 10:51:24 +01:00
Ed Chalstrey
7f6becafc2 import SelectDataEntry 2022-06-01 10:36:47 +01:00
Ed Chalstrey
3c18b98740 import datafields team 2022-06-01 10:35:35 +01:00
Ed Chalstrey
562d17c3ed add is_extension 2022-06-01 10:29:57 +01:00
Ed Chalstrey
41ad098514 change categories intro 2022-06-01 10:27:35 +01:00
Ed Chalstrey
d0782053df fix mistake on use 2022-06-01 10:05:53 +01:00
Ed Chalstrey
91242f3584 remove msg 2022-06-01 09:48:11 +01:00
Ed Chalstrey
fff8a1bc92 remove backend verification field change 2022-05-27 14:51:31 +01:00
Ed Chalstrey
14129abb92 allow current_landuse_verified 2022-05-27 14:41:04 +01:00
Ed Chalstrey
cb3d51ceca 'current_landuse_verified': true when slug == 'current_landuse_group' 2022-05-27 11:30:48 +01:00
Ed Chalstrey
30774e2a24 remove changes to onVerify 2022-05-27 11:22:42 +01:00
Ed Chalstrey
1d9b3bef13 Revert "remove changes related to Current Use verification button"
This reverts commit ed5cd0b9fa.
2022-05-26 15:33:38 +01:00
Ed Chalstrey
a5259fed35 Revert "finish removing current use verification changes"
This reverts commit 1bfcc0682b.
2022-05-26 15:33:11 +01:00
Ed Chalstrey
31d2df911e Revert "verify planning_live_application"
This reverts commit d1d02b7c73.
2022-05-26 15:04:26 +01:00
Ed Chalstrey
ad7459749d Revert "verify planning_live_application"
This reverts commit f3f711fb70.
2022-05-26 15:03:58 +01:00
Ed Chalstrey
f3f711fb70 verify planning_live_application 2022-05-26 15:02:15 +01:00
Ed Chalstrey
d1d02b7c73 verify planning_live_application 2022-05-26 14:59:03 +01:00
Ed Chalstrey
ee6a7681a2 add verification for date_link 2022-05-26 14:50:04 +01:00
Ed Chalstrey
89932d404b add verification facade_year 2022-05-26 14:45:22 +01:00
Ed Chalstrey
1bfcc0682b finish removing current use verification changes 2022-05-26 14:37:58 +01:00
Ed Chalstrey
ee57b62965 Merge branch 'master' into activate-all-verification-buttons 2022-05-26 14:36:31 +01:00
Ed Chalstrey
ed5cd0b9fa remove changes related to Current Use verification button 2022-05-26 14:35:24 +01:00
Ed Chalstrey
a5af9369be Revert "make Turing logo bigger"
This reverts commit c3c48f6d93.
2022-05-26 11:51:06 +01:00
Ed Chalstrey
c3c48f6d93 make Turing logo bigger 2022-05-26 11:47:50 +01:00
Ed Chalstrey
ba247e5df5 even smaller 2022-05-26 11:44:18 +01:00
Ed Chalstrey
6a6ed45b65 less blurry 2022-05-26 11:35:28 +01:00
Ed Chalstrey
9de67c8473 shrink image even more 2022-05-26 11:32:31 +01:00
Ed Chalstrey
549fc5bd51 shrink image more 2022-05-26 11:30:08 +01:00
Ed Chalstrey
1272e2d2c2 shrink image 2022-05-26 11:25:20 +01:00
Ed Chalstrey
a3fc7dc256 change loughborough logo 2022-05-26 11:10:17 +01:00
Ed Chalstrey
9257f588ba add loughborough logo 2022-05-26 09:47:28 +01:00
Ed Chalstrey
ed966cea1e remove hack doesn't work 2022-05-23 16:03:51 +01:00
Ed Chalstrey
01ee3777eb fix path to App for hack 2022-05-23 15:55:54 +01:00
Ed Chalstrey
9120267118 import MemoryRouter for hack 2022-05-23 15:54:12 +01:00
Ed Chalstrey
ee2583bf1a import App for hack 2022-05-23 15:53:14 +01:00
Ed Chalstrey
06d10dc9ef hack 2022-05-23 15:50:18 +01:00
Ed Chalstrey
0d1d57eaa4 attempt only refresh on current use verification button pressed 2022-05-23 11:57:07 +01:00
Ed Chalstrey
f37ee00dac add current_landuse_verified to data-fields-config 2022-05-23 11:53:08 +01:00
Ed Chalstrey
9600669c5e Revert "fake_slug hack"
This reverts commit 1763af155e.
2022-05-23 11:46:37 +01:00
Ed Chalstrey
1763af155e fake_slug hack 2022-05-23 11:34:15 +01:00
Ed Chalstrey
a378f61a53 try swapping current_landuse_group for date_year hack 2022-05-23 11:14:27 +01:00
Ed Chalstrey
b5804c1f1c Revert "attempt ignoring error"
This reverts commit fb319cd2f1.
2022-05-23 10:45:52 +01:00
Ed Chalstrey
fb319cd2f1 attempt ignoring error 2022-05-23 10:36:37 +01:00
Ed Chalstrey
f4ca5ccd62 restore original "edits" dict 2022-05-23 10:17:34 +01:00
Ed Chalstrey
6d38ce7d3f try setting state to buildingEdits: {} 2022-05-23 09:59:15 +01:00
Ed Chalstrey
97219998b9 try setting state to reload 2022-05-23 09:43:25 +01:00
Ed Chalstrey
2801782151 restore original "edits" dict 2022-05-20 11:42:14 +01:00
Ed Chalstrey
bb9d1468cc refactor const edits 2022-05-19 16:54:24 +01:00
Ed Chalstrey
b512c58f90 fix bool 2022-05-19 16:35:52 +01:00
Ed Chalstrey
48673e3dbd special handleVerify for current_landuse_group verification 2022-05-19 16:33:50 +01:00
Ed Chalstrey
39e7ac8b39 Revert "change slug value to null"
This reverts commit 999c42dcd3.
2022-05-19 16:26:06 +01:00
Ed Chalstrey
999c42dcd3 change slug value to null 2022-05-19 16:24:39 +01:00
Ed Chalstrey
3b3fc12e93 update all calls to onVerify 2022-05-19 16:05:55 +01:00
Ed Chalstrey
ccc8bae992 finish prev commit 2022-05-19 15:52:46 +01:00
Ed Chalstrey
5c3d5a3741 add null value as default to onVerify 2022-05-19 15:49:05 +01:00
Ed Chalstrey
62421d60d3 update VerificationProps 2022-05-19 15:43:45 +01:00
Ed Chalstrey
b8d9c12a1b handleVerify does same as handleSaveChange 2022-05-19 15:38:32 +01:00
Ed Chalstrey
d809f22573 doSubmit on handleVerify 2022-05-19 14:13:12 +01:00
Ed Chalstrey
f67c2b4149 add console log 2022-05-19 13:38:08 +01:00
Ed Chalstrey
df9766aebb verify community_public_ownership_sources 2022-05-19 13:14:08 +01:00
Ed Chalstrey
18bcb68965 import verification construction 2022-05-19 13:06:15 +01:00
Ed Chalstrey
3ba9d0b5ef add verification buttons construction 2022-05-19 13:04:53 +01:00
Ed Chalstrey
7ac1ab66a8 add more verification buttons 2022-05-19 12:58:54 +01:00
Ed Chalstrey
c7ff672e3b add verify button ref_osm_id 2022-05-19 12:56:31 +01:00
Ed Chalstrey
9febf6a21e add veriification current_landuse_link 2022-05-19 11:37:06 +01:00
Ed Chalstrey
4c0a5d0475 add verification to other side of if statement 2022-05-19 11:34:56 +01:00
Ed Chalstrey
fee86c1ee3 fix verify button current_landuse_source 2022-05-19 11:32:31 +01:00
Ed Chalstrey
bf8800930d verify current_landuse_source 2022-05-19 11:18:17 +01:00
Ed Chalstrey
71b09c72f2 finish prev commit 2022-05-19 11:01:26 +01:00
Ed Chalstrey
dafd6d0468 add separated buttons to Age 2022-05-19 11:00:22 +01:00
Ed Chalstrey
2b7fd00d64 fix v buttons again - separate them 2022-05-19 10:58:09 +01:00
Ed Chalstrey
59dfaa7802 fix veriification buttons 2022-05-19 10:53:57 +01:00
Ed Chalstrey
0540d2514a use props.allow_verify 2022-05-19 10:51:20 +01:00
Ed Chalstrey
3b5ca75eef refactor date verification buttons 2022-05-19 10:48:53 +01:00
Ed Chalstrey
66c08a0da2 allow verify dates 2022-05-19 10:44:48 +01:00
Ed Chalstrey
07aeaf5cbd Revert "fix"
This reverts commit 66ecd2b619.
2022-05-19 10:40:12 +01:00
Ed Chalstrey
66ecd2b619 fix 2022-05-19 10:39:11 +01:00
Ed Chalstrey
485190842f refactor dates verification 2022-05-19 10:35:13 +01:00
Ed Chalstrey
252d7ba214 remove commented 2022-05-19 10:31:48 +01:00
Ed Chalstrey
ba2b4b52ae verfication for each year box 2022-05-19 10:28:51 +01:00
Ed Chalstrey
fec9134d1d add verification date_year 2022-05-19 10:20:18 +01:00
Ed Chalstrey
a6bd0917fb verify date source 2022-05-19 09:55:58 +01:00
Ed Chalstrey
00f3c40ded add verification date_source 2022-05-13 15:24:13 +01:00
Ed Chalstrey
e05dd03b23 remive duplicate 2022-05-12 16:41:20 +01:00
Ed Chalstrey
8e21bf2982 update placeholder to use example for current use 2022-05-12 16:37:15 +01:00
Ed Chalstrey
fc16d10e8e fix placeholder age 2022-05-12 16:36:14 +01:00
Ed Chalstrey
8bfcf2349d Revert "revert pointless placeholder changes"
This reverts commit 694335cf3b.
2022-05-12 16:34:16 +01:00
Ed Chalstrey
b46f637911 set up current_landuse_source like date_source 2022-05-12 16:30:55 +01:00
Ed Chalstrey
694335cf3b revert pointless placeholder changes 2022-05-12 16:19:03 +01:00
Ed Chalstrey
dbf747d366 turn off link box whe null 2022-05-12 16:17:57 +01:00
Ed Chalstrey
a312a8c0b7 switch N/A for blank 2022-05-12 16:13:29 +01:00
Ed Chalstrey
121437d5cc make link not appear for N/A 2022-05-12 16:13:06 +01:00
Ed Chalstrey
43c34b8ad9 make default dataFields.date_source.example "N/A" 2022-05-12 16:09:17 +01:00
Ed Chalstrey
8bc77b38b3 fix if statement 2022-05-12 15:57:46 +01:00
Ed Chalstrey
6f6e8e098a fix duplicate attributes same name 2022-05-12 15:56:31 +01:00
Ed Chalstrey
70c537c078 pre-populate with example 2022-05-12 15:53:15 +01:00
Ed Chalstrey
a82918d7a1 Merge branch 'source-details-edits-2' into source-details-edits-3 2022-05-12 15:48:19 +01:00
Ed Chalstrey
394266cf2c get deafult value for date_source 2022-05-12 15:17:00 +01:00
Ed Chalstrey
e0f11299c6 remove comment 2022-05-05 16:40:08 +01:00
Ed Chalstrey
0ae4602c89 rename 2022-05-05 16:37:41 +01:00
Ed Chalstrey
251a01e4f3 remove current_landuse_source_detail text box not needed 2022-05-05 16:33:57 +01:00
Ed Chalstrey
adb4bfa904 update current_landuse_group before return in removeBuildingUserVerifiedAttribute 2022-05-05 15:29:48 +01:00
Ed Chalstrey
e923c249db update legend 2022-05-05 15:08:38 +01:00
Ed Chalstrey
66085bf67e remove rogue quote 2022-05-05 14:11:17 +01:00
Ed Chalstrey
c8ab93ab9f add current_landuse_verified to dataDefinition 2022-05-05 13:56:00 +01:00
Ed Chalstrey
7a0228bed1 un-verify in buildings table too 2022-05-05 13:23:49 +01:00
Ed Chalstrey
63c190c981 set buildings table to current_landuse_group = True when verify clicked 2022-05-05 13:22:05 +01:00
Ed Chalstrey
2025a286ed update polygon colour for current use verified 2022-05-05 11:59:36 +01:00
Ed Chalstrey
5d5f4c71df update dataFields with new current use fields 2022-04-29 14:34:11 +01:00
Ed Chalstrey
be0c149133 fix titles 2022-04-29 11:53:34 +01:00
Ed Chalstrey
db4870208c update slugs 2022-04-29 11:52:11 +01:00
Ed Chalstrey
d0f9817d1e fix tooltips 2022-04-29 11:49:46 +01:00
Ed Chalstrey
6fd0a313db change current_landuse_source source options 2022-04-29 11:34:32 +01:00
Ed Chalstrey
0c0b994985 fix props values 2022-04-29 11:24:54 +01:00
Ed Chalstrey
9aff1efb0a fix props values 2022-04-29 11:19:08 +01:00
Ed Chalstrey
fd2d0f0800 change props values 2022-04-29 11:13:29 +01:00
Ed Chalstrey
2aa89856d1 correct import statements 2022-04-29 11:09:25 +01:00
Ed Chalstrey
146759b341 add current_landuse_source data field 2022-04-29 11:00:56 +01:00
Ed Chalstrey
2476cc2c1e copy source fields from age to current use and update slugs 2022-04-29 10:57:37 +01:00
Ed Chalstrey
0220547d53 modify buildings query to ignore demolished 2022-04-22 13:54:21 +01:00
Ed Chalstrey
d73a526835 refactor query to 3 way join 2022-04-21 16:48:35 +01:00
Ed Chalstrey
ac82c33bcb refactor attempt 2022-04-21 16:29:34 +01:00
Ed Chalstrey
121f1ae13f only modify query when table is buildings 2022-04-21 16:22:25 +01:00
Ed Chalstrey
322df6df53 more generic way to not display demolished buildings 2022-04-21 16:12:45 +01:00
Ed Chalstrey
6bfbff7a58 un-demolished buildings only 2022-04-21 15:24:46 +01:00
Tom Russell
98ce36b287
Add direct link to "blog" category in forum 2022-03-28 14:23:06 +01:00
Mateusz Konieczny
8c56d20638
Merge pull request #791 from colouring-cities/feature/generify-number-range
move number range to data components
2022-03-12 12:48:03 +01:00
Ed Chalstrey
e100dd5c7d
Merge pull request #776 from colouring-cities/docs-vagrant
Fully document setup of a working CL development environment
2022-03-01 10:21:43 +00:00
Mateusz Konieczny
6a386ed465 Final resolve of duplication
that is why PR reviews are nice
2022-02-23 09:51:01 +01:00
Mateusz Konieczny
4aa9df1427 move number range to data components 2022-02-23 09:25:23 +01:00
Mateusz Konieczny
594cae1e0b Hide now duplicated question 2022-02-23 00:57:12 +01:00
Mateusz Konieczny
e3a6a3e40a prevent some self-contradictions 2022-02-23 00:44:42 +01:00
Mateusz Konieczny
abc3ea3cc5 Ask about community activities in building
fixes #774
2022-02-23 00:22:22 +01:00
Mateusz Konieczny
3274ecd024
Merge pull request #783 from colouring-cities/feature/better-label
Replace State-owned by Government-owned
2022-02-22 20:38:58 +01:00
Mateusz Konieczny
22501850be Tweak colour of garden buildings
https://github.com/colouring-cities/colouring-london/pull/782#issuecomment-1047876471
2022-02-22 20:27:43 +01:00
Mateusz Konieczny
273936de06
Merge pull request #782 from colouring-cities/feature/special-colors-for-special-residential
Special colors for hotels/garden buildings
2022-02-22 13:40:52 +01:00
Mateusz Konieczny
07165361b3 List earlier date earlier than upper date 2022-02-17 10:50:31 +01:00
Mateusz Konieczny
d7def11d4f Replace State-owned by Government-owned
part of #734
2022-02-16 16:08:29 +01:00
Mateusz Konieczny
05bb5f36ae New message in Team view 2022-02-16 14:46:54 +01:00
Mateusz Konieczny
3b25d7f36e Special colors for hotels/garden buildings
part of #724
2022-02-15 19:57:25 +01:00
Mateusz Konieczny
bba80f4511 Allow multiline legend entries
text will pleasantly flow on right side rather than appearing under icon
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
fe94a51da4 Modify already commited migration
this avoids confusing migration in repository that could damage data, as meaning of the data in database mismatched decription
2022-02-14 13:36:19 +01:00
Mateusz Konieczny
a08da58ad3 Undo accidental bump of mapnik version 2022-02-14 13:36:19 +01:00
Mateusz Konieczny
9ba7e04f91 Improve name of unclassified 2022-02-14 13:36:19 +01:00
Tom Russell
4e40b31bac Fix for compilation error
ERROR in src/frontend/route.tsx:36:25
TS2339: Property 'from' does not exist on type '{}'.
2022-02-02 15:06:57 +00:00
Tom Russell
593e3a1f26 Possibly-working npm module state 2022-02-02 15:06:16 +00:00
Mateusz Konieczny
598ab0fa2a Refine secondary construction materials title
requested in #727
2022-02-02 11:31:53 +01:00
Mateusz Konieczny
867c6312b0 Rename construction system
requested in #727
2022-02-02 11:26:06 +01:00
Mateusz Konieczny
ae39bc8066 Flip colors of wood and other natural material
requested in #727
2022-02-02 11:24:23 +01:00
Mateusz Konieczny
09b9a4f2ce
Merge pull request #771 from colouring-cities/feature/reword-local-asset
Feature/reword local asset
2022-02-01 17:06:12 +01:00
Mateusz Konieczny
19f358b890
Merge pull request #769 from colouring-cities/feature/hide-likes
hide likes
2022-02-01 17:05:18 +01:00
Mateusz Konieczny
fdd600467b Change community_activities title
requested in #734
2022-02-01 12:47:16 +01:00
Mateusz Konieczny
aae71d76af Better describe section in Community
better describe section about community use
2022-02-01 12:43:28 +01:00
Mateusz Konieczny
032e02ebd2 Modify phrasing for locally significant building
third part of #734
2022-02-01 12:38:50 +01:00
Mateusz Konieczny
482678b44f Eliminate dead code 2022-02-01 12:33:11 +01:00
Mateusz Konieczny
db64f40708 Restore labels in the history menu 2022-01-31 17:59:10 +01:00
Mateusz Konieczny
ee16977b66 Hide prominent display of likes counts
it remains accessible from map (approximate values) and from history tag of given object
removal is motivated by desire to avoid misleading "0 people likes this building" - true about database state but not true about world in general
exact phrasing is also a bit problematic in general
2022-01-31 17:56:28 +01:00
Mateusz Konieczny
e8ff5df818
Merge pull request #711 from colouring-cities/feature/new-building-types
Feature/new building types
2022-01-18 18:35:12 +01:00
Mateusz Konieczny
c30c3b6e1c Finish rename 2022-01-18 10:33:58 +01:00
Mateusz Konieczny
08807b2654 Enable hiding legend also on a large screens 2022-01-14 06:11:28 +01:00
Mateusz Konieczny
e12b544503
Merge pull request #708 from colouring-london/feature/more-confetti
Adding more confetti, as requested
2022-01-13 15:47:20 +01:00
Mateusz Konieczny
1bf1edd2ae Add ability to mark buildings as unknown
Also, make residential a bit stronger.
2022-01-11 17:51:07 +01:00
Mateusz Konieczny
e2c9fd4073 Adding more confetti, as requested 2022-01-10 14:21:03 +01:00
Mateusz Konieczny
12290c09b6
Merge pull request #700 from colouring-london/feature/new_lockfile
Update lockfile version to 2
2021-12-12 18:29:04 +01:00
Mateusz Konieczny
5ed0b261ae Set night mode as a default 2021-12-09 17:39:00 +01:00
Mateusz Konieczny
7fea5abc7f Update lockfile version to 2
See https://github.blog/2021-02-02-npm-7-is-now-generally-available/#changes-to-the-lockfile

This was triggered by updating caniuse

Which was in turn caused by following

> Run npx browserslist@latest --update-db

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

* Simplify map data queries

* Fix typo in updated construction layer query

* Enable data tile caching switch for development

* Enable turning tile cache off

* Use render time variables for highlight tiles

* Create building numbers map layer

* Create database view for simpler map queries

* Decrease min zoom for numbers layer

* Add building outlines to all map layers

* Adjust building numbers style and zoom level

* Revert "Create database view for simpler map queries"

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

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

Cannot find module 'babel-runtime/helpers/extends'
Require stack:
- /app/node_modules/react-leaflet-universal/dist/decorator.js
- /app/node_modules/react-leaflet-universal/dist/index.js
- /app/build/server.js
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:966:15)
    at Function.Module._load (internal/modules/cjs/loader.js:842:27)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
    at require (internal/modules/cjs/helpers.js:72:18)
    at Object.<anonymous> (/home/tom/projects/colouring-london/colouring-london/app/node_modules/react-leaflet-universal/dist/decorator.js:7:17)
    at Module._compile (internal/modules/cjs/loader.js:1138:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1158:10)
    at Module.load (internal/modules/cjs/loader.js:986:32)
    at Function.Module._load (internal/modules/cjs/loader.js:879:14)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
2020-06-18 11:39:02 +01:00
Tom Russell
1731969f87 Bump node packages 2020-06-18 11:10:10 +01:00
Tom Russell
210f57f6fa Add link to new content page 2020-05-14 17:24:34 +01:00
Tom Russell
ebe1e3f264 Disable secondary materials for now 2020-05-04 14:24:53 +01:00
Tom Russell
d1c42a40a6 Rename construction migration to 017, fix tile definition
Note that enum types need to be cast to ::text for mapnik
rules to work as expected.
2020-04-17 17:01:21 +01:00
Tom Russell
c20ea2bbb0 Knock out showcase link, fix leaderboard 2020-04-09 16:58:59 +01:00
Tom Russell
c4ffdf4db9 Tidy up initial basic leaderboard 2020-04-09 16:52:41 +01:00
Tom Russell
a2393a019a Tweak welcome text 2020-04-09 16:10:07 +01:00
Tom Russell
f4d18f7bda Move welcome float to sidebar 2020-04-09 15:57:17 +01:00
Tom Russell
3649f92d4c Fix compile errors by casting variables pulled from query strings 2020-04-09 15:44:11 +01:00
Tom Russell
3c2ecbd76e Fix showing maps for likes 2020-04-09 15:23:50 +01:00
Tom Russell
8dc4a387a8 Set razzle to use eslint, drop tslint.json 2020-04-09 15:09:34 +01:00
Tom Russell
ab3f0c4ce2 Move linting to use eslint (drop deprecated tslint) 2020-04-09 14:32:58 +01:00
Tom Russell
fa527f0f95 Bump npm packages 2020-04-09 14:08:18 +01:00
Tom Russell
b901e392bb
Merge branch 'master' into feature/menu-sidebar 2020-04-09 13:30:03 +01:00
Tom Russell
97953db742
Merge branch 'master' into develop 2020-04-09 13:26:36 +01:00
Tom Russell
218155ccdd
Merge pull request #573 from mz8i/feature/538-planning-update
Feature 538: planning update
2020-04-09 13:22:15 +01:00
Tom Russell
2696820ff5
Merge pull request #586 from colouring-london/feature/568-activate-construction
Feature/568 activate construction
2020-04-09 11:28:20 +01:00
Tom Russell
bb73419caa
Merge pull request #591 from colouring-london/develop
Point tsconfig to client and server TS files only
2020-04-09 10:52:54 +01:00
Tom Russell
b782f36230
Merge pull request #535 from colouring-london/feature/initial_leaderboard
Implementation of basic leaderboard
2020-04-09 10:33:23 +01:00
MeldaS
32bfb490be Modify files for adding colouring map attribute 2020-04-01 12:18:44 +01:00
MeldaS
e503ee4dcc Modify files for adding construction attributes 2020-04-01 12:18:19 +01:00
Maciej Ziarkowski
7b09fe6f84 Update land use hints 2020-03-27 15:23:57 +00:00
Maciej Ziarkowski
a5f29c6aad Improve multi entry + autofill UI 2020-03-27 14:32:19 +00:00
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
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
Tom Russell
5c1f6c0239 Update npm packages 2019-12-10 11:50:47 +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
4d8e084a35 Generate propTypes in all build types 2019-11-06 14:50:43 +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
0abff2e5c1 Define example highlight styles 2019-09-17 18:20:23 +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
6a009873dd Update packages, add types 2019-09-17 17:53:58 +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
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
b2cf80cb2b Add Facebook and Twitter metadata 2019-09-10 12:23:41 +01:00
Maciej Ziarkowski
f5e21e5c1f Always show highlight layer on top of map 2019-09-09 18:14:51 +01:00
Maciej Ziarkowski
0f30573180 Add comments to non-obvious code 2019-09-09 15:17:44 +01:00
Maciej Ziarkowski
7491d2aa1c Unify imports/export 2019-09-09 15:17:24 +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
5daf0796d1 Split server from frontend route 2019-09-06 19:13:45 +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
Tom Russell
1c1e8df704
Merge pull request #402 from mz8i/feature/61-forgotten-password
Introduce env variable for webapp origin
2019-08-30 13:59:38 +01:00
Maciej Ziarkowski
3724d74217 Add data extracts frontend 2019-08-30 13:45:55 +01:00
Maciej Ziarkowski
3494b13dd4 Add first TSLint rule 2019-08-29 17:54:50 +01:00
Maciej Ziarkowski
6733d02876 Add data extract controllers and routes 2019-08-29 17:54:08 +01:00
Maciej Ziarkowski
1008c09905 Add data extract service 2019-08-29 17:53:48 +01:00
Maciej Ziarkowski
9e62d4c114 Move asyncController calls to controller files 2019-08-29 17:52:30 +01:00
dependabot[bot]
ac233dced1
Bump connect-pg-simple from 5.0.0 to 6.0.1 in /app
Bumps [connect-pg-simple](https://github.com/voxpelli/node-connect-pg-simple) from 5.0.0 to 6.0.1.
- [Release notes](https://github.com/voxpelli/node-connect-pg-simple/releases)
- [Changelog](https://github.com/voxpelli/node-connect-pg-simple/blob/master/CHANGELOG.md)
- [Commits](https://github.com/voxpelli/node-connect-pg-simple/compare/v5.0.0...v6.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-27 09:55:24 +00:00
Tom Russell
065a49c7c5 Fix multi-entry 2019-08-23 17:46:22 +01:00
Tom Russell
5d08c492f0 Bump npm versions 2019-08-23 17:38:38 +01:00
Tom Russell
b76eb35ade Drop user routes from api.ts 2019-08-23 17:38: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
7cc358dcb7 Introduce env variable for webapp origin 2019-08-22 15:56:04 +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
6d4c514c00 Remove always failing error commited accidentally 2019-08-22 10:29:40 +01:00
Maciej Ziarkowski
2622269f77 Add global error handler 2019-08-21 14:47:44 +01:00
Maciej Ziarkowski
4d27c3b889 Add controller and route for password reset 2019-08-21 14:47:23 +01:00
Maciej Ziarkowski
fc2666364d Add backend services for password reset 2019-08-21 14:46:14 +01:00
Maciej Ziarkowski
4259778224 Add email service and config template 2019-08-21 14:42:27 +01:00
Maciej Ziarkowski
54bd565cc8 Split /users into routes/controller/service 2019-08-19 14:31:35 +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
90da2a1522 Add user delete API endpoint
The deleted user username will be changed to 'deleted_'
plus the 13 initial characters of the standard format user_id.
Email, hashed password and API key are all cleared for the user.
The endpoint is currently only available through /api/users/me
and only allows a logged-in user to delete their own account.
2019-08-16 11:12:18 +01:00
mz8i
b5b72e7152
Switch from express app to router in API
Co-Authored-By: Tom Russell <tomalrussell@gmail.com>
2019-08-16 10:57:15 +01:00
Maciej Ziarkowski
185a94b5cb Add user delete API endpoint
The deleted user username will be changed to 'deleted_'
plus the 13 initial characters of the standard format user_id.
Email, hashed password and API key are all cleared for the user.
The endpoint is currently only available through /api/users/me
and only allows a logged-in user to delete their own account.
2019-08-15 16:12:01 +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
6f4dfa2227 Handle invalid URLs with the frontend 404 page 2019-08-14 14:17:47 +01:00
Maciej Ziarkowski
be564dccea Add JSON API 404 handler 2019-08-14 14:13:14 +01:00
Maciej Ziarkowski
2c9b5ea3d8 Modify routes, refactor API structure 2019-08-14 14:05:49 +01:00
Maciej Ziarkowski
021578a2d8 Merge branch 'master' into feature/383-refactor-routes 2019-08-14 13:28:21 +01:00
Maciej Ziarkowski
a2394ef962 Move JSON API into its own directory 2019-08-14 10:54:13 +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
6cfd12e638 Minor updates to npm packages 2019-08-12 21:57:44 +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
7b0d305ba7 Fix ES to TS module import errors 2019-08-12 10:24:38 +01:00
Maciej Ziarkowski
fb70b2bf64 Configure Jest for TS 2019-08-12 10:24:08 +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
60d573526e Bump npm versions 2019-07-30 12:20:36 +01:00
dependabot[bot]
3f4a20a226
Bump lodash-es from 4.17.10 to 4.17.14 in /app
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.10 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.14)

Signed-off-by: dependabot[bot] <support@github.com>
2019-07-11 10:35:07 +00:00
Tom Russell
79b43680e1 Bump npm packages 2019-07-07 19:42:49 +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
12f31bc585 Merge branch 'feature/show_edit_history' 2019-07-07 18:12:10 +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
Tom Russell
39be3507a2 Include edit history in building data from API 2019-06-07 14:01:48 +01: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
Tom Russell
64b50c02d2 Set up section header for multi 2019-05-27 21:28:47 +01:00
Tom Russell
c02839d46a Pass through disabled prop 2019-05-27 21:28:31 +01:00
Tom Russell
1ad7e1de4d Fix transaction mode for likes 2019-05-27 21:28:19 +01:00
Tom Russell
04d50a9181 Hide copy link only when field is disabled 2019-05-27 20:54:43 +01:00
Tom Russell
51ef47e50a Fix prop-types 2019-05-27 20:28:28 +01:00
Tom Russell
8aeb92705b Coerce revision id to number 2019-05-27 20:22:41 +01:00
Tom Russell
0008bbb860 Lint whitespace, case, prop-types 2019-05-27 20:13:43 +01:00
Tom Russell
426c7ff9f6 Click 'Copy' to move to quick/multi edit
- works with single values
- leans on server-side validation
- special case for likes (like +1 only)
- positioning of 'Copy' link not quite right against 'Hint'
- puts like/update fetch call in App component
2019-05-27 20:02:19 +01:00
Tom Russell
c03f716a28 Match multi-edit categories 2019-05-27 19:54:38 +01:00
Tom Russell
f34c31a0e8 Add query-string for URL ?a=b parsing 2019-05-27 19:54:14 +01:00
Tom Russell
0685cbf136 Cat: use match params where possible 2019-05-27 19:51:16 +01:00
Tom Russell
60371afd03 Sketch out hardcoded multi-edit 2019-05-27 19:51:15 +01:00
Tom Russell
06c63c7272 Lint prefer-const 2019-05-27 18:35:12 +01:00
Tom Russell
f6e933ff8f Lint empty lines 2019-05-27 18:33:36 +01:00
Tom Russell
9b96872922 Lint prop-types, camelCase 2019-05-27 18:26:29 +01:00
Tom Russell
aef53a0ae0 Lint multi-spaces 2019-05-27 16:46:54 +01:00
Tom Russell
af9c23d883 Lint 4-space indent 2019-05-27 16:39:16 +01:00
Tom Russell
907afa29f0 Lint single quotes 2019-05-27 16:31:48 +01:00
Tom Russell
e540003e2f Lint no-unused 2019-05-27 16:25:31 +01:00
Tom Russell
0ec551c14e Lint HTML escapes 2019-05-27 16:23:58 +01:00
Tom Russell
ebc662280c Lint curly braces 2019-05-27 16:20:00 +01:00
Tom Russell
59f69d0012 Merge branch 'feature/menu_expand_collapse_on_mobile' 2019-05-27 16:13:29 +01:00
Tom Russell
07662c1eb0 Configure eslint
- run from `app` using `npx eslint .`
2019-05-27 16:13:11 +01:00
Tom Russell
495663f164 Upgrade npm packages (razzle to 3.0.0) 2019-05-27 16:12:48 +01:00
Tom Russell
942349f5c1 Whitespace in header.js 2019-05-27 16:12:01 +01:00
Tom Russell
ec1a682b8a Left-align mobile menu 2019-05-27 16:11:43 +01:00
Martin-dJ
5b1aff4ba7 Implementation for: Hide or shrink theme switch button on mobile #273 2019-05-23 15:01:00 +00:00
Martin-dJ
97b03f973a Initial attempt to implement: Main menu expand/collapse on mobile #272 2019-05-23 13:41:20 +00:00
Tom Russell
d60712fca4 Smaller text, more bullet spacing
Closes #256
2019-05-02 19:28:34 +01:00
Tom Russell
d4667f5ca0 Fix storeys legend en-dashes 2019-05-02 19:26:59 +01:00
Tom Russell
39fe444395 Merge Use and Type, adding Ownership
Closes #241
2019-05-02 19:26:45 +01:00
Tom Russell
dda11fbbb0 Remove repeated subcategory under demolition, fixes #259 2019-05-02 19:06:40 +01:00
Tom Russell
ae6f5a0d61
Merge pull request #258 from tomalrussell/feature/logo-style
Feature/logo style
2019-05-02 18:54:39 +01:00
Tom Russell
00a9b6ab30 Legend logo to top of box 2019-04-28 15:57:30 +01:00
Tom Russell
1c58a3b5f4 Tighter header/logo 2019-04-28 15:57:21 +01:00
Tom Russell
d6e37d75a3 Match animated logo colours with sections 2019-04-28 15:05:48 +01:00
Tom Russell
4362c9c947 Rewrite cache to allow expiry, use promises
- tileserver changes use of cache (slightly simplified from callbacks)
- cache methods return promises
- add 'remove' method to cache, with remove_all_at_bbox helper
- from api/building.js, call remove after successful db updates
2019-04-27 15:56:16 +01:00
Tom Russell
cfc00f348b Brief header note on tile.tileserver 2019-04-27 13:36:17 +01:00
Tom Russell
4c9a37c831 Check exten when rendering highlight tiles 2019-04-27 13:35:51 +01:00
Tom Russell
0709deae83 Return 1px transparent empty tile 2019-04-27 13:35:11 +01:00
Tom Russell
c45394cbb2 Add doc note on mapnik styles in tiles.tile 2019-04-27 13:26:03 +01:00
Tom Russell
b997c4dce4 Add note comment on hot module reloading 2019-04-27 13:25:08 +01:00
Tom Russell
a04aed0d67 Add function docs for parse utils 2019-04-27 13:24:50 +01:00
Tom Russell
47f8109d34 Fix welcome text, logo spacing 2019-04-18 17:41:20 +01:00
Tom Russell
4283a2bdd6
Merge pull request #248 from tomalrussell/feature/frontend_updates
Feature/frontend updates
2019-04-18 17:19:34 +01:00
Tom Russell
b1c4f2d9a9
Merge pull request #253 from tomalrussell/feature/swap_positions_on_navbar
Feature/swap positions on navbar
2019-04-18 17:19:16 +01:00
Tom Russell
fbd33ee02e Sidebar list alignment, font size 2019-04-18 17:13:49 +01:00
Tom Russell
7d261b18ef Fix building-edit lint/warnings 2019-04-18 17:07:13 +01:00
Tom Russell
7553fcf597 Drop client-side console.log 2019-04-18 17:07:00 +01:00
Martin-dJ
ce4892bee4 Fix for issue #144 Reduce number of classes for 'Number of storeys' legend 2019-04-16 14:33:07 +00:00
Martin-dJ
a6892fbda9 Tidied up indentation in header.js (cosmetic change) 2019-04-10 13:48:51 +00:00
Martin-dJ
e6cfb08cb4 Fix for issue #146 Swap position of 'More about' with 'Building categories' & rename latter 2019-04-10 13:17:58 +00:00
Tom Russell
e491b6718d Longer label for like-me check 2019-04-09 09:37:28 +01:00
Tom Russell
ce014ccdd7 Add titles for more categories 2019-04-09 09:37:28 +01:00
Tom Russell
9217a21282 Show list of fields in overview 2019-04-09 09:37:28 +01:00