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

1760 Commits

Author SHA1 Message Date
Mateusz Konieczny
f2078aecb0 remove not needed TODO 2022-11-02 10:38:42 +01:00
Mateusz Konieczny
32076a9012 drop linking as we have no link to share 2022-11-01 20:18:21 +01:00
Mateusz Konieczny
ce339ea339 More verbose legend as requested 2022-10-31 12:34:44 +01:00
Mateusz Konieczny
0ba4d4f734 be more clear why data is missing 2022-10-31 12:34:19 +01:00
Mateusz Konieczny
1c210fb8d6 smarter order in legend list 2022-10-31 11:53:34 +01:00
Mateusz Konieczny
28285fe4ef actually link data 2022-10-31 10:32:37 +01:00
Mateusz Konieczny
4ebce23156 handle multiple applications 2022-10-31 10:20:41 +01:00
Mateusz Konieczny
0f689217c3 change data source 2022-10-31 10:09:12 +01:00
Mateusz Konieczny
d1cc8c7a16 more consistent headers 2022-10-31 07:08:31 +01:00
Mateusz Konieczny
2d6907281f temporary removal of outdated group 2022-10-20 21:39:03 +02:00
Mateusz Konieczny
b582a40df2 show planning application map in both planning and community 2022-10-05 20:06:55 +02:00
Mateusz Konieczny
80aeaf6dac make application more visible on map, drop debug styling for unknown status objects 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
205580d7fe better display as unusual data in planning view 
applications with unandled statuses are shown
not available application id is not shown as unknown anymore
 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a98b7c0b17 drop checkox 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5626de53c2 tweak wording 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
6ffe655706 remove props.building.planning_portal_link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
c3fd10cd5a planning application link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
0d0cdc501a move areas checkbox out of green box 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
db6dde1194 apply draft styling for disclaimer: note, it needs to be done properly 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5eb2c54f06 tweak disclaimer and source info presentation 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
5e8766d0b8 fix misplaced verification button 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a28d009b23 italics, TODO HACK FIXME done it properly 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
d5e3c1feac tweak phrasing for source info 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
d75b18be66 rearrange source and status info order 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
03b8a92ae8 experimental hack 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
39190f7712 start showing registration date 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
e3ef25aa0c aply interface rewrite draft 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
966ba81f7f tweak link 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
317a28ce60 fix line wrapping 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
08eb0d38b4 fix syntax 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
c2fbe305f7 fix typo quote 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
a2ec8a7152 tweak disclaimeer text 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
90dae39f12 tweak wording of disclaimer 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
4110d2624b hot fix previous one 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
1b1bd5b139 move planning_portal_link to top 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
186d414d55 tweak wording again 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
305b7441ba tweak wording 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
9c0b961d7a link Community section from Planning section 2022-10-05 19:56:25 +02:00
Mateusz Konieczny
0d853f8e6e repeat community_expected_planning_application in planning section 2022-10-05 19:56:20 +02:00
Mateusz Konieczny
3f7c7d5d6e draft of interface 2022-10-05 19:55:18 +02:00
Mateusz Konieczny
1ad5128874 tweak text again 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
fa8bbcf54e rephrase valid_date 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
b4bcf0988f rearrange entries in green box 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
f13ac7d4a9 Rejected vs Refused 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
9d08619a61 show title properly 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
68f56214c6 take title out of the infobox 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
20083a4b63 make places with applications more visible on lower zoom levels 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
def260e584 support unknown status 2022-10-05 19:54:39 +02:00
Mateusz Konieczny
5a06e37ec6 change documentation link 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
4085735d38 temporary form of displaying checkbox with url in the title 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
54e0615b74 New disclaimer text, DRY 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
0bbf4dcdce improve styling 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
fa71dae61f Use more delicate colours in planning layer. 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
d2d54e6c94 Tweak layout of green box listing 2022-10-05 19:52:45 +02:00
Mateusz Konieczny
8cbb3cd84b Display official planning data. 2022-10-05 19:52:14 +02:00
Mateusz Konieczny
852454d527 tweak note about missing email 
fixes #942
 2022-10-05 17:48:56 +02:00
Mateusz Konieczny
8781a263c8 use less cryptic placeholder 
https://github.com/colouring-cities/colouring-london/issues/942#issuecomment-1257203358
 2022-10-05 17:47:35 +02:00
Mike Simpson
2bdbbce8d2
Merge pull request #947 from colouring-cities/add-newcastle-logo 
Add Newcastle University Logo
 2022-10-04 13:46:25 +01:00
Mike Simpson
ae46f3559c
Merge pull request #941 from matkoniecz/feature/matching-forms 
More uniform form style
 2022-10-03 09:45:08 +01:00
Mike Simpson
0a28a882b0
Merge pull request #946 from matkoniecz/feature/redesign_designation_protection_menu 
redesign designation/protection menu
 2022-10-03 09:44:04 +01:00
Mateusz Konieczny
50cecf36bb add conservation area id 2022-10-03 08:04:26 +02:00
Mike Simpson
9ccf2c7ffb Add Newcastle University Logo 2022-09-28 12:58:59 +01:00
Mateusz Konieczny
6c29c36b3a add coverage note 2022-09-27 11:15:55 +02:00
Mateusz Konieczny
f5bcb7e6da change hint to 'Please add relevant link here' 2022-09-26 10:00:54 +02:00
Mateusz Konieczny
886f548713 fix off by one error in username legth limit 2022-09-25 15:39:54 +02:00
Mateusz Konieczny
69087a1f32 reorder protected items 
fixes #939
 2022-09-25 00:57:58 +02:00
Mateusz Konieczny
aa04cda117 Revert "reorder legend entries to match order in interface" 
This reverts commit b80cdb23b4.
 2022-09-25 00:01:18 +02:00
Mateusz Konieczny
84fc857355 Shared form style 
fixes #937
 2022-09-24 23:41:10 +02:00
Mateusz Konieczny
cea4bad4e4 proper input form for UNESCO WHS 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
b80cdb23b4 reorder legend entries to match order in interface 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
5b4c0be1e5 tweak special input field further 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
0e1d81f41e use proper form for the id input 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
e9579070f5 get rid of defunct and not needed import 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
cd52a4e494 mark URL entry as URL 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
4fb388ea92 add visualisation for more types of data being used 2022-09-24 12:57:22 +02:00
Mateusz Konieczny
20f99e9103 Redesign interface listing protection 
Per @polly64 checkbox fields were removed and switch was made to using links as both as input method and for providing source.

It is no longer possible to just claim that something is listed/featured, entering data will now be also faster
 2022-09-24 12:57:17 +02:00
Mateusz Konieczny
cbd99f49f3 intendation to follow new nesting 2022-09-24 12:57:17 +02:00
Mateusz Konieczny
4d0ca9434f Introduce nested groups 2022-09-24 12:57:17 +02:00
Ed Chalstrey
3cdaa72bd0 fix spacing 2022-08-16 16:09:14 +01:00
Ed Chalstrey
cde0dd3ecf spaces 2022-08-16 16:08:03 +01:00
Ed Chalstrey
8f35ca73ce re-jig para 2022-08-16 16:07:20 +01:00
Ed Chalstrey
2f61a70225 abbreviate CCRP 2022-08-16 11:29:38 +01:00
Ed Chalstrey
e7c531fc68 simplify 2022-08-16 11:26:52 +01:00
Ed Chalstrey
76d28d5d2d draft para 2022-08-16 11:25:05 +01:00
Ed Chalstrey
dd69627671 Revert "remove padding" 
This reverts commit 949a2a0486.
 2022-08-11 10:06:13 +01:00
Ed Chalstrey
949a2a0486 remove padding 2022-08-11 10:01:31 +01:00
Ed Chalstrey
6b18a58bde move EditHistoryLatest to section-body 2022-08-09 15:48:22 +01:00
Ed Chalstrey
01178dd46c Revert "move EditHistoryLatest outside section" 
This reverts commit 2e17f25285.
 2022-08-09 15:45:37 +01:00
Ed Chalstrey
2e17f25285 move EditHistoryLatest outside section 2022-08-09 15:44:38 +01:00
Ed Chalstrey
404f944c8e remove edit date from age specifically 2022-08-09 15:42:30 +01:00
Ed Chalstrey
dc30bc4384 add EditHistoryLatest for all categories 2022-08-09 15:40:59 +01:00
Ed Chalstrey
149cf0bdff remove div wrapper 2022-08-09 15:35:18 +01:00
Ed Chalstrey
59da16fe02 update text 2022-08-09 15:29:46 +01:00
Ed Chalstrey
f62b82685f remove font specs 2022-08-09 15:28:39 +01:00
Ed Chalstrey
fa88bad32f try suppressing subsequent list items 2022-08-09 15:27:33 +01:00
Ed Chalstrey
85322ef16d try <ul> instead 2022-08-09 15:17:40 +01:00
Ed Chalstrey
5643b27637 remove p 2022-08-09 15:15:44 +01:00
Ed Chalstrey
9863e99cb6 single <p> for latest edit 2022-08-09 15:14:18 +01:00
Ed Chalstrey
0b9598f47b remove edit hist title 2022-08-09 15:09:07 +01:00
Ed Chalstrey
a8e2399924 fix const name 2022-08-09 15:06:57 +01:00
Ed Chalstrey
03d4dab8fb fix import 2022-08-09 15:06:12 +01:00
Ed Chalstrey
e573574d5c add EditHistoryLatest 2022-08-09 15:05:36 +01:00
Ed Chalstrey
3270804b1b add props.building to EditHistory 2022-08-09 14:54:27 +01:00
Ed Chalstrey
eb41f9cfb3 fix EditHistory path 2022-08-09 14:52:08 +01:00
Ed Chalstrey
b4a521675a revert cee05b5979 2022-08-09 14:50:26 +01:00
Ed Chalstrey
292c75238c add EditHistory to Age 2022-08-09 14:49:19 +01:00
Ed Chalstrey
cee05b5979 add BuildingEditSummaryBrief to Age category 2022-08-09 14:09:59 +01:00
Ed Chalstrey
b2373c6abb widen section-header-actions 2022-08-09 13:38:02 +01:00
Ed Chalstrey
96df9517d4 change to "Edit History" 2022-08-09 10:14:01 +01:00
Ed Chalstrey
42d659e607 fix planning_nhle_link 2022-07-25 11:41:08 +01:00
Ed Chalstrey
3b016dfd43 remove tooltip does not exist 2022-07-25 11:36:22 +01:00
Ed Chalstrey
66b281df37 use MultiDataEntry for planning_nhle_link 2022-07-25 11:35:24 +01:00
Ed Chalstrey
ebdc5aaa46 fix slug 2022-07-25 11:08:43 +01:00
Ed Chalstrey
ab4212ab1c un-disable 2022-07-25 11:02:12 +01:00
Ed Chalstrey
dc2d026f7f add planning_nhle_link 2022-07-25 11:00:09 +01:00
Ed Chalstrey
4ea5952b8f add verification buttons 2022-07-25 10:32:26 +01:00
Ed Chalstrey
6961c7aaa0 amend question 2022-07-25 10:20:47 +01:00
Ed Chalstrey
92f69eb7a5 make planning fields editable 2022-07-25 10:11:36 +01:00
Ed Chalstrey
7bea8a572a un-disable features 2022-07-25 10:04:04 +01:00
Ed Chalstrey
6ec5e6e1e2
Merge pull request #879 from colouring-cities/fix/842 
Fix/842
 2022-07-25 09:34:38 +01:00
Ed Chalstrey
a4ba0795bf
Merge pull request #878 from colouring-cities/fix/855 
Fix counting verifications
 2022-07-25 09:24:51 +01:00
Ed Chalstrey
c1313abb3b fix mistake 2022-07-22 16:24:00 +01:00
Ed Chalstrey
4c0e036e94 add landowner and landowner_source_link 2022-07-22 16:16:53 +01:00
Tom Russell
5be87921fb Pass setError callback in login form 
Login failures (incorrect username or
password) were silently failing, with
no error message displayed.
 2022-07-22 16:11:40 +01:00
Ed Chalstrey
e00621df41 add LogicalDataEntryYesOnly 2022-07-22 16:06:59 +01:00
Tom Russell
187dc20baa Handle isLoading state in private routes 
Additional check for isLoading to handle
redirect after sign-up.
 2022-07-22 16:05:20 +01:00
Ed Chalstrey
813e7440e8 "Engineer/ Engineering firm" 2022-07-22 15:58:04 +01:00
Ed Chalstrey
e30e984541 change "Private company" to "Commercial" 2022-07-22 15:57:05 +01:00
Tom Russell
e478e182a5 More robust check for location state 
Testing 'string' in var fails if var is
not an object, throwing uncaught
error and leaving a white screen on login.
 2022-07-22 15:52:16 +01:00
Tom Russell
c625754d1b Fix counting verifications 2022-07-22 15:44:40 +01:00
Ed Chalstrey
75c73a6b93 rename "Current Use" category "Land Use" 2022-07-22 13:27:59 +01:00
Ed Chalstrey
58f1d84188 set other category link fields to be limited to urls 2022-07-07 10:25:13 +01:00
Ed Chalstrey
a669621cb3 limit location to being url 2022-07-07 10:23:29 +01:00
Ed Chalstrey
c8139f2d73 change building name to building info link 2022-07-07 10:13:00 +01:00
Ed Chalstrey
858d4408ea restrict location_street and location_line_two to 30 chars 2022-07-06 15:28:33 +01:00
Ed Chalstrey
d64444bd74 fix error 2022-07-05 16:35:48 +01:00
Ed Chalstrey
a17a1820e5 add verification 2022-07-05 16:32:00 +01:00
Ed Chalstrey
c3323d9531 un-disable 2022-07-05 16:29:30 +01:00
Ed Chalstrey
e97b94bded remove info box 2022-07-05 16:22:49 +01:00
Ed Chalstrey
c026bed54d allow edits location fields 2022-07-05 16:16:25 +01:00
Mateusz Konieczny
5d3fc148e0 add announcement about planning 2022-07-04 19:14:40 +02:00
Mateusz Konieczny
3cb5ee5dca Allow community to mark expected applications 2022-07-04 11:40:14 +02:00
Mateusz Konieczny
8ced4e8017 upgrade mini-css-extract-plugin 
following setup-dev-environment.md was running into problem of broken dependencies with webpack4 and webpack5 being required at the same time
updating this dependency is safe according to https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md#0120-2020-10-07 changelog
 2022-06-27 21:17:58 +02:00
Ed Chalstrey
61166726c3 Revert "2nd attempt remove copy tool from community opinions" 
This reverts commit a960bc7cb5.
 2022-06-24 15:54:25 +01:00
Ed Chalstrey
a960bc7cb5 2nd attempt remove copy tool from community opinions 2022-06-24 15:51:36 +01:00
Ed Chalstrey
f2bc5d65ae restore copy for community_like 2022-06-24 15:40:39 +01:00
Ed Chalstrey
8f4a36fbb6 fix prev commit 2022-06-24 15:38:18 +01:00
Ed Chalstrey
cc989664d0 remove copt tool from community opinions 2022-06-24 15:34:30 +01:00
Ed Chalstrey
f2848140e0 blacklist community keys 2022-06-24 15:32:01 +01:00
Ed Chalstrey
673a59df6f finish prev commit 2022-06-24 15:24:18 +01:00
Ed Chalstrey
63cfb8219d add copy tool where missing from community category 2022-06-24 15:23:17 +01:00
Ed Chalstrey
36f86216e6 blacklist more planning keys 2022-06-24 15:15:39 +01:00
Ed Chalstrey
9885bf4b73 add planning_in_list to blackListedKeys 2022-06-24 15:12:13 +01:00
Ed Chalstrey
8d9f319aea don't copy certain keys for current use 2022-06-24 15:01:37 +01:00
Ed Chalstrey
455a22fc13 fix prev commit 2022-06-24 14:27:12 +01:00
Ed Chalstrey
96df75e1cb handle unusual case of Team having a non ccategory field 2022-06-24 14:25:43 +01:00
Ed Chalstrey
3320614176 add fieldName block var 2022-06-24 14:19:37 +01:00
Ed Chalstrey
593be69514 Merge branch 'master' into copy-tool-enable 2022-06-24 14:09:33 +01:00
Ed Chalstrey
8e6f8d9d3e rename 2022-06-24 09:37:03 +01:00
Ed Chalstrey
e853365ec0 rename 2022-06-24 09:23:52 +01:00
Ed Chalstrey
3318f0e21d only copy keys that are not blank 2022-06-23 15:51:10 +01:00
Ed Chalstrey
52a5a22967 only copy keys from the chosen category by default 2022-06-23 10:53:39 +01:00
Ed Chalstrey
bfe519d7fe fix prev commit properly 2022-06-23 10:39:55 +01:00
Ed Chalstrey
b333351350 fix prev commit 2022-06-23 10:39:09 +01:00
Ed Chalstrey
56db0c58df set all copyapble keys to true by default 2022-06-23 10:38:22 +01:00
Ed Chalstrey
42aa1f6ed0 import datafields 2022-06-23 10:20:25 +01:00
Ed Chalstrey
86c535d27b switch to a const for defaultCopyProps 2022-06-20 16:04:43 +01:00
Ed Chalstrey
f2a7f86d92 initialise CopyProps rather than CopyControlProps 2022-06-20 16:02:45 +01:00
Ed Chalstrey
05ee54f5c1 add undefined as default for toggleCopying 2022-06-20 15:43:32 +01:00
Ed Chalstrey
54644c36d6 add blank string as default for data_string 2022-06-20 15:39:59 +01:00
Ed Chalstrey
9517553de9 add blank string as default for cat 2022-06-20 15:38:46 +01:00
Ed Chalstrey
36200044db attempt to set copy tool to checked by default 2022-06-20 15:36:26 +01:00
Ed Chalstrey
aa8649f710 add copy tool to missing community field 2022-06-20 13:38:32 +01:00
Ed Chalstrey
3882790706 set copyable = true for MultiDataEntry 2022-06-20 12:03:31 +01:00
Ed Chalstrey
5aa13e0e83 add copy tool Team fields 2022-06-20 11:52:57 +01:00
Ed Chalstrey
e1e8328c05 use date_year 2022-06-10 15:25:44 +01:00
Ed Chalstrey
1fdcee6814 finish prev commit 2022-06-10 14:46:56 +01:00
Ed Chalstrey
56abebf4de add team_info_count to deteermin colour 2022-06-10 14:45:39 +01:00
Ed Chalstrey
1642c2c8fb add team 2022-06-10 14:13:19 +01:00
Ed Chalstrey
691b68e128 test team colour scale (but using location vals for now) 2022-06-10 14:04:46 +01:00
Ed Chalstrey
3ef764dc75 add developer_name 2nd attempt 2022-06-10 13:38:54 +01:00
Ed Chalstrey
b950c8909f revert 68abacc685 2022-06-10 13:36:12 +01:00
Ed Chalstrey
b5812645d6 fix prev commit 2022-06-10 13:34:24 +01:00
Ed Chalstrey
68abacc685 add developer_name 2022-06-10 13:32:46 +01:00
Ed Chalstrey
0611eaa9ce add other_team and other_team_source_link 2022-06-10 13:13:23 +01:00
Ed Chalstrey
69f470552f remove non-existant tooltips 2022-06-10 11:39:30 +01:00
Ed Chalstrey
e5c0e4e0c0 add builder and builder_source_link 2022-06-10 11:37:52 +01:00
Ed Chalstrey
2f2c0b949f finish prev commit 2022-06-10 11:16:42 +01:00
Ed Chalstrey
d73e49a538 add developer_source_link 2022-06-10 11:14:45 +01:00
Ed Chalstrey
3cf2827f27 Architect/ architectural firm 2022-06-10 11:07:08 +01:00
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