Commit Graph

1867 Commits

Author SHA1 Message Date
Mike Simpson
ff4299e677 Changes to Dynamic Classification 2023-07-26 15:43:49 +01:00
Mike Simpson
348971257f Brighter colours
Concerned that the darker colours were not bright enough to stand out against the black background
2023-07-26 15:39:13 +01:00
Mike Simpson
30300a76cb Changed in the wrong file! 2023-07-26 15:36:01 +01:00
Mike Simpson
81072ff1c9 Land Uses in Alphabetical Order
Temporary partial fix for #1194
2023-07-26 15:31:45 +01:00
Mike Simpson
06de97145e Revert changes to Basic Typology Classification
Key to be different from dropdown text
2023-07-26 15:30:56 +01:00
Mike Simpson
75fe7dda4c Remove 'under development' text 2023-07-26 14:41:34 +01:00
Mike Simpson
5018a8e9ef Changes to Basic Typology Classification
#1212
2023-07-26 14:05:04 +01:00
Mike Simpson
214b82c465 Changes to Dynamic classification subcategory 2023-07-26 13:54:57 +01:00
Mike Simpson
b55617aaae Add label pointing to Age data
#1212
2023-07-26 13:46:42 +01:00
Mike Simpson
5e1db5a589 Changes to Architectural Styles
as requested in #1212
2023-07-26 13:34:32 +01:00
Mike Simpson
b9e9db4bc2 Tweak key text size
#1212
2023-07-25 17:06:38 +01:00
Mike Simpson
79adb2d49d New Keys for Typology category
- Keys for all subcategories (except original building use)
- Buttons to change key/visible layer

Re: Issue #1212
2023-07-25 17:05:51 +01:00
dependabot[bot]
a970fe3d1e
Bump word-wrap from 1.2.3 to 1.2.4 in /app
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-19 06:36:12 +00:00
Mike Simpson
49ab1c6836 Typology Section Updates
#1151
2023-07-18 12:32:44 +01:00
Mike Simpson
6617c284e7
Merge pull request #1207 from colouring-cities/interface/ui-tweaks
Interface/UI tweaks
2023-07-18 10:30:18 +01:00
Mike Simpson
ba0661bb88
Merge pull request #1206 from colouring-cities/dependabot/npm_and_yarn/app/semver-5.7.2
Bump semver from 5.7.1 to 5.7.2 in /app
2023-07-18 10:27:52 +01:00
Mike Simpson
bcb0229ca7 Updates to Planning/Heritage Data Fields
#1188
2023-07-14 16:07:44 +01:00
Mike Simpson
8cab9bbe2c Add standard source types (below historical ones)
#1193
2023-07-14 14:30:50 +01:00
Mike Simpson
85b0821490 Add link to Open Manual (Configurable)
Each project should configure this to point to their page on the open manual. (i.e. https://github.com/colouring-cities/manual/wiki/M3.-COLOURING-BRITAIN)
2023-07-14 13:35:53 +01:00
dependabot[bot]
0cb0e946e6
Bump semver from 5.7.1 to 5.7.2 in /app
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-11 13:35:37 +00:00
dependabot[bot]
d79d9e91e3
Bump tough-cookie from 4.0.0 to 4.1.3 in /app
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.0.0...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-09 10:14:28 +00:00
Mike Simpson
4be3b02e08 Add Synthetic Data to Common Source Types 2023-07-07 13:14:03 +01:00
Mike Simpson
9b73dd5e62 Activate fields in Planning Section
- Year of Completion #1197
- Incomplete/missing data #1198
2023-06-29 16:54:17 +01:00
Mike Simpson
1e41cc2e11 Green roof & solar panels 2023-06-29 15:21:20 +01:00
Mike Simpson
b44738e627 Change to logical/boolean questions 2023-06-29 14:51:31 +01:00
Mike Simpson
39d3031c64 Streetscape -> StreetContext 2023-06-29 14:41:15 +01:00
Mike Simpson
621601745b Remove HR 2023-06-29 14:39:18 +01:00
Mike Simpson
3057d4fdc8 Typo fix 2023-06-29 14:37:11 +01:00
Mike Simpson
11258132e5 Remove placeholder field 2023-06-29 14:31:21 +01:00
Mike Simpson
fae06c6910 "Domestic" -> "Residential" 2023-06-29 14:30:32 +01:00
Mike Simpson
8b38f7a076 Team update
- Remove unused data from "General info"
- Fix logic of boolean question
- Update hints etc.
2023-06-29 14:29:23 +01:00
Mike Simpson
64969ecb7e New links and bug fixes
- Add link to Discussions instead of the old forum
- Make sure external links are correctly flagged
- Make external links open in new tab
2023-06-29 13:52:11 +01:00
Mike Simpson
8edac435c1 Tweaks to common source types list 2023-06-29 13:51:15 +01:00
Mike Simpson
a765f94d20 Instruction text when editing 2023-06-29 13:50:49 +01:00
Mike Simpson
ff8618beb8 Calculate total floors
#1192
2023-06-29 11:09:12 +01:00
Mike Simpson
1708d6e5f0 Update menu links
See issue #1195
2023-06-29 10:53:17 +01:00
Mike Simpson
eb10575f36 Placeholders for possible new fields 2023-06-28 20:57:28 +01:00
Mike Simpson
dfb35a909f Placeholder for new field 2023-06-28 20:35:03 +01:00
Mike Simpson
d36b16d179 Add land parcel geometry link to Planning 2023-06-28 20:32:15 +01:00
Mike Simpson
ad77c80a4e Working tweak 2023-06-28 17:18:27 +01:00
Mike Simpson
392e9ced3d Add links as an alternative to free-text names (Team) 2023-06-28 17:14:27 +01:00
Mike Simpson
fd1429e2da Disable free-text boxes on Team category
Edit Multi Data Entry to display something when editing and the box is disabled when it has no data.
2023-06-28 16:40:45 +01:00
Mike Simpson
9f842dd445 Placeholder walkability index 2023-06-28 13:19:04 +01:00
Mike Simpson
0517222670 Add fields to Age and History 2023-06-28 13:16:11 +01:00
Mike Simpson
cc07121e08 Change domestic to residential
In interface but not in dropdowns/database yet
2023-06-28 10:21:35 +01:00
Mike Simpson
cfb441a273 Add tooltip to postcode 2023-06-28 10:11:12 +01:00
Mike Simpson
91eb5aeef8 Add alternative building footprint links (Location) 2023-06-27 19:47:40 +01:00
Mike Simpson
35611f87da Add Building Name link 2023-06-27 19:39:19 +01:00
Mike Simpson
e150b1b36f Change Land Use source to default source type 2023-06-27 16:48:33 +01:00
Mike Simpson
725d7710b9 Location category tweaks
- Add placeholder data fields
- Add Postcode Regex
- Add OSM ID Regex
- Allow Pattern Data Entry boxes to transform text (to force capitalise, for example)
- Add source links and update tooltips
- Cosmetic tweaks to CSS
2023-06-27 14:55:19 +01:00
Mike Simpson
b5103327c5 Tweaks (see #1186) 2023-06-23 22:25:35 +01:00
Mike Simpson
8b8c92afc3 Remove unnecessary(?) duplicate code
The code for the entire category is duplicated here. I did a side by side comparison, but could see no difference between the code in either part of the if statement, so I have removed one copy and tidied up the other.

#1155
2023-06-23 10:31:32 +01:00
Mike Simpson
e72d496e41 Fix categories menu resizing from Welcome to Category pages 2023-06-06 15:41:08 +01:00
Mike Simpson
0a38a3ec23 Revert for now 2023-06-06 15:03:22 +01:00
Mike Simpson
435d0cb2f3 Fix Key change buttons 2023-06-06 14:48:15 +01:00
Mike Simpson
2da2834a72 Fix historical maps (age and history)
Will now change key when switching between historical maps and default view (building age)
2023-06-06 13:54:42 +01:00
Mike Simpson
40285bef32 Remove unused code 2023-06-06 13:54:06 +01:00
Mike Simpson
355b1078c2 Fix Residential button toggle 2023-06-06 13:25:36 +01:00
Mike Simpson
afd4149021 Tweak Key text 2023-06-06 12:09:51 +01:00
Mike Simpson
d2c4c21280 Tweak data label 2023-06-06 12:09:41 +01:00
Mike Simpson
b6fad2774f Rename Subcategory 2023-06-06 12:08:59 +01:00
Mike Simpson
c8694ba0f5 Tweak logo to match new category layout 2023-05-31 21:37:02 +01:00
Mike Simpson
7b024ebb5c Activate fields on Age & History
See issue #1169
2023-05-31 21:36:53 +01:00
Mike Simpson
439e415c6e Changes for #1165 2023-05-31 21:05:02 +01:00
Mike Simpson
79918c7b9f OK, *this* is where the horizontal line is supposed to go!
Moved it so it is always visible, not just when you are editing
2023-05-31 12:53:18 +01:00
Mike Simpson
5efce50d4d Remove extraneous horizontal line
Added because it wasn't displaying, but it appears to have fixed itself *facepalm*
2023-05-31 12:18:34 +01:00
Mike Simpson
44ab9377dd Re-add missing horizontal line 2023-05-26 14:34:36 +01:00
Mike Simpson
e7b6b80938 Merge branch 'master' into feature/ui-refactor 2023-05-26 14:07:29 +01:00
Mateusz Konieczny
d5f0681e20 pass revisionId as needed 2023-05-25 13:08:03 +02:00
Mike Simpson
31c1c382f3 Remove Unused Retrofit fields 2023-05-24 15:43:15 +01:00
Mike Simpson
8487ce3afe Other Category Updates
- Consistent Construction Date between Age and Team categories
- Disable unused Verify buttons
- Add missing Verify buttons
- Add tooltips to Disaster section
- Add new fields to database
2023-05-24 14:53:14 +01:00
Mike Simpson
19c906fcc5 Size / Age & History Sources
Adding source link(s) field to activated data sources in the Size category and the Age & History category
2023-05-23 21:27:45 +01:00
Mike Simpson
4c32710358 Add "Common Source Types" list
- This will be the default source type for all fields, unless they need custom data. Then we can manage and edit this list in multiple places
- Use in Location and Land Use pages
2023-05-23 15:13:23 +01:00
Mike Simpson
4e348e7b54 Location + Land Use Sources
- Add sources to multiple fields on Location + Land Use Categories
- Use data-fields-config properly instead of hard-coding some values
2023-05-19 11:55:32 +01:00
Mike Simpson
715cdfaa02 More tweaks, mainly for consistency 2023-05-18 21:06:27 +01:00
Mike Simpson
79dec38f9f Add placeholder for Solar Panels data 2023-05-18 21:06:03 +01:00
Mike Simpson
38d53f26c8 Sidebar Tweaks
Add horizontal line at bottom
Change style of horizontal likes in menu
Remove minimum height (now all subcategories are closed by default)
2023-05-18 11:31:37 +01:00
Mike Simpson
6398426254 Change red layer buttons to blue 2023-05-18 11:16:18 +01:00
Mike Simpson
2ae1ff4d9a Adjust <hr> spacing
Less space at the top (under save edits button)
More space when used as a divider in the main menu
2023-05-18 10:12:57 +01:00
Mike Simpson
13cd09c727 Consistent capitalisation on sub-categories/labels 2023-05-17 15:46:48 +01:00
Mike Simpson
fdecc457c4 Fix for text scrolling behind the "save edits" box 2023-05-17 15:34:32 +01:00
Mike Simpson
71d21fb616 Fix bug where "save edits" box gets drawn over category title box 2023-05-17 15:31:43 +01:00
Mike Simpson
a26b4f8d86 Run "npx browserslist@latest --update-db"
It's been nagging us to do this for ages!
2023-05-16 17:37:30 +01:00
Mike Simpson
3332395351 Update URLs and Slugs to match category titles 2023-05-16 17:36:13 +01:00
Mike Simpson
5297f153e1 Rename files to match category titles 2023-05-16 17:16:20 +01:00
Mike Simpson
d14dea3d1a More UI Tweaks
Mainly to improve consistency and readability across all categories/pages
Discussed in meeting with Polly 16/05
2023-05-16 17:08:21 +01:00
Mike Simpson
f43e5f60fe WIP Various tweaks to category pages
As discussed with Polly on 09/05/2023
2023-05-12 16:43:20 +01:00
Mike Simpson
0a24d60c43 Tweaks to data fields
Changes to wording and localisations using cc-config
2023-05-12 16:41:53 +01:00
Mike Simpson
664cceec56 Add tooltips to year fields 2023-05-12 16:41:17 +01:00
Mike Simpson
42d42d7306 Add Category descriptions 2023-05-12 16:39:49 +01:00
Mike Simpson
e4026acef3 Make 'Age & History' Display on two lines 2023-05-12 16:39:02 +01:00
Mike Simpson
29522d2ce7 Starting to add some localisation 2023-05-12 16:38:39 +01:00
Mike Simpson
2c266d0c28 Merge branch 'feature/disaster-management' into feature/ui-refactor 2023-05-11 22:13:24 +01:00
Mike Simpson
2f60ec72ae Merge Local and Incoming Changes 2023-05-09 09:30:14 +01:00
Mike Simpson
3e431dbd5f Tweaks to label, as requested 2023-05-05 13:53:34 +01:00
Mike Simpson
8f9590adb6 WIP Disaster Start/End Dates 2023-04-21 13:41:03 +01:00
Mike Simpson
906ebd7431 Add Disaster Management section to Resilience Category 2023-04-17 21:48:21 +01:00
Mike Simpson
24705ece30 Update Land Use Key
Change order and rename "Domestic Building" option
2023-04-14 12:57:09 +01:00
Mike Simpson
8d15cf8adf Merge branch 'colouring-core' 2023-04-13 21:17:22 +01:00
Mike Simpson
a5c7e223dc Update cc-config.json 2023-04-13 21:16:46 +01:00
Mike Simpson
6dd8bed440
Merge branch 'master' into master 2023-04-13 15:00:08 +01:00
Mike Simpson
0c3562e9fd Tweaks to Welcome Text
As requested by Polly
#1116
2023-04-12 22:04:36 +01:00
dependabot[bot]
7432dbf1ed
Bump follow-redirects from 1.14.7 to 1.15.2 in /app
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.15.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-12 20:23:09 +00:00
Mike Simpson
d0c9806775
Merge pull request #1125 from colouring-cities/dependabot/npm_and_yarn/app/webpack-5.76.0
Bump webpack from 5.24.0 to 5.76.0 in /app
2023-04-12 21:22:38 +01:00
Mike Simpson
0b9c8dbe2c
Merge pull request #1123 from colouring-cities/dependabot/npm_and_yarn/app/url-parse-1.5.10
Bump url-parse from 1.5.4 to 1.5.10 in /app
2023-04-12 21:22:26 +01:00
Mike Simpson
67d1442206
Merge branch 'colouring-cities:master' into master 2023-04-06 15:51:45 +01:00
Mike Simpson
90af39dfaf Update historic maps to show Survival Status 2023-04-06 15:22:15 +01:00
Mike Simpson
07cb6b4846 Add Survival Source 2023-04-06 15:21:59 +01:00
Mike Simpson
d92456cdae Big Fix for Survival Status on some buildings 2023-04-06 15:21:41 +01:00
Mike Simpson
8418b5f6c0 WIP - Survival Status data saving
Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
2023-04-05 15:13:48 +01:00
dependabot[bot]
a468cd12e2
Bump webpack from 5.24.0 to 5.76.0 in /app
Bumps [webpack](https://github.com/webpack/webpack) from 5.24.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.24.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-14 15:24:15 +00:00
dependabot[bot]
49eca09d51
Bump url-parse from 1.5.4 to 1.5.10 in /app
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:42:49 +00:00
dependabot[bot]
233c4ef277
Bump ansi-regex from 4.1.0 to 5.0.1 in /app
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:40:36 +00:00
Mike Simpson
b34b1bdae4
Merge pull request #1118 from colouring-cities/dependabot/npm_and_yarn/app/async-2.6.4
Bump async from 2.6.3 to 2.6.4 in /app
2023-03-10 16:39:36 +00:00
Mike Simpson
2892dae4bc
Merge pull request #1121 from colouring-cities/dependabot/npm_and_yarn/app/sharp-0.30.5
Bump sharp from 0.28.3 to 0.30.5 in /app
2023-03-10 16:39:28 +00:00
Mike Simpson
6fc902ae12
Merge pull request #1120 from colouring-cities/dependabot/npm_and_yarn/app/eventsource-1.1.2
Bump eventsource from 1.1.0 to 1.1.2 in /app
2023-03-10 16:39:14 +00:00
Mike Simpson
fa18db2882
Merge pull request #1119 from colouring-cities/dependabot/npm_and_yarn/app/terser-4.8.1
Bump terser from 4.8.0 to 4.8.1 in /app
2023-03-10 16:38:29 +00:00
dependabot[bot]
e9cf78d583
Bump sharp from 0.28.3 to 0.30.5 in /app
Bumps [sharp](https://github.com/lovell/sharp) from 0.28.3 to 0.30.5.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.28.3...v0.30.5)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:46 +00:00
dependabot[bot]
f8ff1bb63c
Bump eventsource from 1.1.0 to 1.1.2 in /app
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:38 +00:00
dependabot[bot]
aca897cfe5
Bump terser from 4.8.0 to 4.8.1 in /app
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:32 +00:00
dependabot[bot]
2283bbb96a
Bump async from 2.6.3 to 2.6.4 in /app
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-10 16:34:28 +00:00
Mike Simpson
7aa106624d
Merge pull request #1108 from colouring-cities/dependabot/npm_and_yarn/app/json5-1.0.2
Bump json5 from 1.0.1 to 1.0.2 in /app
2023-03-10 16:33:59 +00:00
Mike Simpson
75dc274251
Merge pull request #1109 from colouring-cities/dependabot/npm_and_yarn/app/qs-and-body-parser-and-express-6.11.0
Bump qs, body-parser and express in /app
2023-03-10 16:33:49 +00:00
Mike Simpson
484a0f0c82
Merge pull request #1110 from colouring-cities/dependabot/npm_and_yarn/app/decode-uri-component-0.2.2
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
2023-03-10 16:33:44 +00:00
Mike Simpson
a9b70788da
Merge pull request #1111 from colouring-cities/dependabot/npm_and_yarn/app/loader-utils-1.4.2
Bump loader-utils from 1.4.0 to 1.4.2 in /app
2023-03-10 16:33:37 +00:00
Mike Simpson
ec7a515e8b
Merge pull request #1113 from colouring-cities/dependabot/npm_and_yarn/app/minimist-1.2.8
Bump minimist from 1.2.5 to 1.2.8 in /app
2023-03-10 16:33:32 +00:00
traveller195
4dcd3de93a
change data definiton for tile mapstyle of 'location' and 'team'
using Subquery/ nested SQL Qquery to only load those buildings, having at least a few collected data. The benefit is, that the mapstyle is not different for nodata buildings comparing different data categories. Now, if you compare nodata buildings in 'team' or 'location' with others, the stroke width is larger than the normal map style... loading only builidings with data avoids this problem of different map styles. It is a better and more performant solution than changing it in polygon.xml
see also c80f243c0d
2023-03-08 15:30:39 +01:00
dependabot[bot]
52f06fe896
Bump minimist from 1.2.5 to 1.2.8 in /app
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-04 02:50:10 +00:00
dependabot[bot]
507a61faf3
Bump loader-utils from 1.4.0 to 1.4.2 in /app
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:56:00 +00:00
dependabot[bot]
30a16632ba
Bump qs, body-parser and express in /app
Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [body-parser](https://github.com/expressjs/body-parser) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.9.6 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.11.0)

Updates `body-parser` from 1.19.1 to 1.20.1
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.1...1.20.1)

Updates `express` from 4.17.2 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
- dependency-name: body-parser
  dependency-type: direct:production
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
e8ffd5ef3c
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:59 +00:00
dependabot[bot]
5e42236ee2
Bump json5 from 1.0.1 to 1.0.2 in /app
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-28 11:55:46 +00:00
Mike Simpson
2f21ef0020
Merge pull request #1098 from colouring-cities/tweaks/ui
Rename Size and Form Category
2023-02-24 09:45:33 +00:00
Mike Simpson
42578c0686 Rename Size and Form Category 2023-02-17 15:13:53 +00:00
Mateusz Konieczny
b19ada700b fix typo: maybe rented -> may be rented
fixes #1078
2023-02-17 10:21:48 +01:00
Mike Simpson
4c4cfdc145 Merge remote-tracking branch 'upstream/master' 2023-02-15 16:53:07 +00:00
Mateusz Konieczny
fa9e81d281 Button style unification for user-survey questions 2023-02-15 17:14:51 +01:00
Mike Simpson
fc2cc07a1c
Merge pull request #1089 from colouring-cities/colouring-core-fixes
Colouring core fixes
2023-02-15 15:55:32 +00:00
Mike Simpson
4a0e65f8c4
Merge pull request #1081 from matkoniecz/feature/core-18-domestic-likes
Rework likes and upgrades to community section, ask is building domestic, deduplicate landuse section
2023-02-15 09:14:02 +00:00
Mateusz Konieczny
d0cd948991 tweak labels as requested 2023-02-15 09:46:08 +01:00
Mateusz Konieczny
58e5e359a9 fix font colour of inline map buttons 2023-02-15 08:25:33 +01:00
Mateusz Konieczny
0f62cad9db buttons always have enabled/disabled state
fixes #1085
2023-02-15 08:25:06 +01:00
Mateusz Konieczny
741df74c7f local significance/interest labels 2023-02-15 07:44:35 +01:00
Mateusz Konieczny
7c8834947e tweak button text 2023-02-15 07:44:08 +01:00
Mateusz Konieczny
62fbd4378e drop dead code 2023-02-15 07:43:46 +01:00
Mike Simpson
2681b4b5e5
Merge pull request #1082 from matkoniecz/feature/allow-multiline-in-section-headers
make data entry group work with long titles
2023-02-14 14:04:30 +00:00
Mike Simpson
db76a30ec5 Update GitHub URLs 2023-02-14 13:23:35 +00:00
Mateusz Konieczny
f3bc1c9e58 unify labels
previously other had year, this had date despite asking for a year
2023-02-14 13:06:48 +01:00
Mateusz Konieczny
5edf6d4b1f remove no longer needed code 2023-02-09 22:56:37 +01:00
Mateusz Konieczny
7d9580ae17 new more descriptive map buttons 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
18023e786a remove switcher for a primary map style 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
86d60058e1 add horizontal lines splitting different sections 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
e4500ba025 change instruction as instructed 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
cd92cb7ed7 shorten header descriptions 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
04d09c1f39 tweak question as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8603940964 rearrange section structure in Community
no reintended for now to keep things nicely mergable/diffable
2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8894fc167c tweak the tile as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
c74d358c33 remove 'is domestic' question form community and hide liking individual buildings 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
aab44869f8 fix button code 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
fe87fa62e6 make data entry group work with long titles
may have some unexpected side-effects but testing has not revealed any
2023-02-09 22:49:47 +01:00
Mike Simpson
dd17436a53
Update cc-config.json 2023-02-09 11:24:27 +00:00
Mike Simpson
6bc16e5e2d Colouring London Config Settings 2023-02-09 11:23:35 +00:00
Mike Simpson
cd6cfb1130 Generify Config Data for new Colouring Core Branch 2023-02-09 10:47:17 +00:00
Mike Simpson
d63da083e0 Add Project-specific Privacy Policy Info to Config 2023-02-08 12:04:33 +00:00
Mike Simpson
47deb9b12a Correct GitHub URL 2023-02-08 10:58:24 +00:00
Mike Simpson
3c0157d0ea Merge branch 'master' into colouring-core 2023-02-08 10:54:04 +00:00
Mateusz Konieczny
fec74c4a84 prevent duplication in landuse code 2023-02-08 10:28:58 +01:00
Mateusz Konieczny
8f7eb6bf81 use more clear naming variant 2023-02-07 13:09:16 +01:00
Mateusz Konieczny
83847d75b9 fix typology likes detection 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
037eced6f1 fix whitespace 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
26a330f743 likes typology display 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
5431f8528e better buttons on the map in community section
enable map button for domestic status
show like button when relevant
2023-02-07 11:42:05 +01:00
Mateusz Konieczny
cee0c16edf add new map style for domestic status 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
df07a3bf1d add work from home explanation 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
e3e9e83632 allow mixed answer for domestic use 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
621a5b67db tweak questions and add new ones on what is worth keeping 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
4b4fe20281 use yes only interface for worth keeping ones 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
2356548aad rename question
per https://github.com/colouring-cities/colouring-core/issues/18#issuecomment-1413641393
2023-02-07 11:42:05 +01:00
Mateusz Konieczny
ae0e0bb2b6 Add question whether building is domestic. 2023-02-07 11:42:01 +01:00
Mateusz Konieczny
5bde854045 remove box about a new feature 2023-02-07 10:32:31 +01:00
Mike Simpson
7aebd77f10 Merge branch 'master' into colouring-core 2023-02-03 11:28:45 +00:00
Mike Simpson
6dd356bbeb
Merge pull request #1076 from matkoniecz/fix/1065-move-the
exclude the from the link
2023-02-03 10:59:26 +00:00
Mike Simpson
43b9c650a7 Additional Tweak
See #1074
2023-02-03 10:55:22 +00:00
Mateusz Konieczny
372873b97a exclude the from the link
apply https://github.com/colouring-cities/colouring-london/issues/1065#issuecomment-1413639850
2023-02-02 15:17:05 +01:00
Mike Simpson
a43c0593fe Various tweaks requested by Polly
Changes to subcategories, wording and typo fixes discussed in a meeting with Polly on 02/02. #1074
2023-02-02 13:02:05 +00:00
Mike Simpson
3c3ffc76b5
Merge pull request #1072 from matkoniecz/feature/1071-more-ca-info
Provide more instruction for user when editing CA and fix review button
2023-02-02 12:30:14 +00:00
Mike Simpson
994d9de0ac
Merge pull request #1070 from matkoniecz/fix/again
Group of changes based on feedback from meeting preparations
2023-02-02 12:29:22 +00:00
Mateusz Konieczny
1499534f9e provide requested disclaimer
fixes #1065
2023-02-02 13:10:02 +01:00
Mateusz Konieczny
24818a83ec More instruction about CA, fix the review button
fixes #1071
2023-02-02 08:08:41 +01:00
Mateusz Konieczny
b8349a391c be less optimistic 2023-01-24 12:00:08 +01:00
Mateusz Konieczny
cec81583ac new colouring for Withdrawn 2023-01-24 10:56:09 +01:00
Mateusz Konieczny
418b03ada1 new Withdrawn styling 2023-01-24 10:43:21 +01:00
Mateusz Konieczny
ad51f3433e new wording for active application info 2023-01-24 10:35:46 +01:00
Mateusz Konieczny
4a61f19103 Revert "unroll layer option on using buttons"
This reverts commit 5a59815234.
2023-01-24 10:35:41 +01:00
Mateusz Konieczny
5a59815234 unroll layer option on using buttons 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
e7d3bdc784 mention where more specific sources are 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
63e22f46b6 add one more link to datahub 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
9868a700f8 rewrite explanation info for current applications 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
8c9f62b51e mention CA short name 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
f262aedb89 better coloring for formerly pink buttons
fixes #1064
2023-01-23 14:44:37 +01:00