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

1754 Commits

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