Commit Graph

1182 Commits

Author SHA1 Message Date
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