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

512 Commits

Author SHA1 Message Date
Maciej Ziarkowski
bc76185613 Move css imports group to second place 2019-11-13 19:20:47 +00:00
Maciej Ziarkowski
70a24f6367 Adjust welcome text and link color 2019-11-13 19:10:02 +00:00
Maciej Ziarkowski
1241b24ba1 Add data accuracy text to welcome screen 2019-11-13 12:55:17 +00:00
Maciej Ziarkowski
529d535b6d Merge branch 'develop' into feature/sort-imports 2019-11-13 11:47:51 +00:00
Tom Russell
aeebd7ed36
Merge pull request #458 from tomalrussell/fix/375-attribution 
Highlight attribution requirements
 2019-11-12 11:00:19 +00:00
Tom Russell
215f6bdee0
Fix closing Link tag 2019-11-12 10:49:15 +00:00
Tom Russell
59ec2f7ecb
Merge branch 'master' into fix/375-attribution 2019-11-12 10:45:23 +00:00
Tom Russell
ba501dfc3c
Merge pull request #466 from mz8i/feature/72-increase-max-zoom 
Allow zoom level 19 with OS basemap interpolation
 2019-11-12 10:43:40 +00:00
Maciej Ziarkowski
739bcad08a Lint semicolons 2019-11-07 09:13:30 +01:00
Maciej Ziarkowski
b95185d9dd Lint newline at end of file 2019-11-07 08:00:14 +00:00
Maciej Ziarkowski
175d3236eb Organise imports in frontend and API 2019-11-07 07:45:19 +00:00
mz8i
6a42961eaf
Merge pull request #489 from mz8i/feature/generate-prop-types 
Auto-generate propTypes
 2019-11-06 20:01:05 +00:00
Maciej Ziarkowski
ffcf31cb34 Format boolean values in edit history 2019-11-06 15:39:44 +00:00
Maciej Ziarkowski
daf36c9750 Add propTypes generation, remove manual propTypes 2019-11-05 20:13:10 +00:00
mz8i
bc0cd575e0
Merge pull request #479 from mz8i/feature/189-increase-likes 
Feature 189: Adjust likes colour scale and legend
 2019-10-31 16:30:08 +00:00
Maciej Ziarkowski
bf1a8def6e Revise like bins and colour scale 2019-10-31 13:22:34 +00:00
Maciej Ziarkowski
5406b60416 Improve edit history styling 2019-10-30 13:29:02 +00:00
Maciej Ziarkowski
09b84f5b84 Add white background on edit history header 2019-10-30 12:35:23 +00:00
Maciej Ziarkowski
740b788246 Only accept view/edit modes for building view 2019-10-30 12:28:10 +00:00
mz8i
06eb4e53ed
Merge branch 'develop' into feature/84-show-edit-history 2019-10-29 17:58:01 +00:00
mz8i
cf18e5bb70
Merge branch 'develop' into feature/data-container-state 2019-10-29 17:34:27 +00:00
Tom Russell
c18851b3eb Remove unused 'configuration' field in size (#457) 
Closes #409

Building attachment/configuration is now in type
 2019-10-29 17:20:05 +00:00
mz8i
25029ef153
Load max revision ID on start (#485) 
* Load max revision ID on start

* Update revision ID upon mounting MapApp
 2019-10-29 16:56:49 +00:00
mz8i
997e92d27d
Add GLA boundary to map (#464) 2019-10-28 16:48:59 +00:00
mz8i
5d3eff4800
Branding adjustments (#471) 
* Synchronise category colours with WIX page version

* Display static colourful logo on map pages
 2019-10-28 16:46:22 +00:00
Maciej Ziarkowski
c2ea90a372 Fix typo in likes legend 2019-10-28 16:07:22 +00:00
Maciej Ziarkowski
3cecb62993 Adjust likes colour scale and legend 2019-10-28 15:55:40 +00:00
Maciej Ziarkowski
86b252f186 Add field labels to multi edit view 2019-10-25 18:07:24 +01:00
Maciej Ziarkowski
09c343f91d Move all field titles/tooltips to data_fields.ts 2019-10-25 17:43:39 +01:00
Maciej Ziarkowski
0f88627ab2 Update code documentation 2019-10-24 15:57:09 +01:00
Maciej Ziarkowski
8bc56fbbe2 Add edit history frontend routing 2019-10-24 12:20:48 +01:00
Maciej Ziarkowski
2e47d85faa Add edit history components 2019-10-24 12:19:54 +01:00
Maciej Ziarkowski
946209282c Use fields info in age container 2019-10-24 12:16:23 +01:00
Maciej Ziarkowski
3892191144 Add data fields definition, populate Age and Like 2019-10-24 12:15:41 +01:00
Maciej Ziarkowski
d70f341448 Move buttons code out from ContainerHeader 2019-10-24 12:13:07 +01:00
Maciej Ziarkowski
f8c10c622f Allow discard edits, activate save button on edit 2019-10-21 11:20:10 +01:00
Maciej Ziarkowski
dced56d004 Move to onChange/onLike handlers only, add types 2019-10-18 15:06:50 +01:00
Maciej Ziarkowski
f54fcf0cc4 Improve types for Building across app 2019-10-17 17:38:44 +01:00
Maciej Ziarkowski
c2396e8881 Remove old TODO comments 2019-10-17 17:07:34 +01:00
Maciej Ziarkowski
b6b87c8304 Process input value inside TextboxDataEntry 2019-10-17 17:00:01 +01:00
Maciej Ziarkowski
0e1aca0e9e Fix DataEntry errors 2019-10-17 16:15:28 +01:00
Maciej Ziarkowski
e1e1bc7aa5 Process input inside SelectDataEntry 2019-10-17 15:32:41 +01:00
Maciej Ziarkowski
7c042dd58e Process input value inside CheckboxDataEntry 2019-10-17 14:38:52 +01:00
Maciej Ziarkowski
ca4750b0be Process input value inside DataEntry 2019-10-17 13:15:48 +01:00
Maciej Ziarkowski
7e9cc4cde4 Parse numbers in NumericDataEntry 2019-10-16 21:16:10 +01:00
Maciej Ziarkowski
b489b15d8f Remove static ID from like checkbox 2019-10-16 20:34:29 +01:00
Maciej Ziarkowski
9d4d24aefc Fix label click on like checkbox with non-uniq id 
The label for the like checkbox was not clickable because the ID #like
was not unique on the website. The ID has been changed to like_check
to avoid that.
 2019-10-16 13:30:59 +01:00
Maciej Ziarkowski
f189ae603e Clear all state fields on select change 2019-10-16 13:11:25 +01:00
Maciej Ziarkowski
b81d49df43 Store only current edits in data container state 2019-10-15 19:16:48 +01:00
Maciej Ziarkowski
0a1b41cc07 Add DataTitle types 2019-10-15 15:44:22 +01:00
Maciej Ziarkowski
f498f4730b Fix view/edit route redirect 2019-10-15 14:53:01 +01:00
Maciej Ziarkowski
3b8594a604 Improve scroll area UI 2019-10-15 14:38:07 +01:00
Maciej Ziarkowski
3a35f5dab5 Type, simplify, fix data containers 
This contains a couple fixes for minor bugs
that were discovered after adding static types
to the category data editing code.
The other changes are mostly refactoring and styling
 2019-10-15 14:37:23 +01:00
Maciej Ziarkowski
ce473cb453 Fix checkbox inputs 2019-10-15 13:20:09 +01:00
Maciej Ziarkowski
4cd21088ce Add field groups to Size (storeys expanded) 2019-10-09 14:12:19 +01:00
Maciej Ziarkowski
38d84ff5ce Rewrite DataEntryGroup with hooks, child count 2019-10-09 12:52:38 +01:00
Maciej Ziarkowski
0240e94adc Allow zoom level 19 with OS basemap interpolation 2019-10-08 17:40:30 +01:00
Maciej Ziarkowski
354d8a6f96 Add data entry groups to planning category 2019-10-08 14:20:43 +01:00
Maciej Ziarkowski
4320e20952 Add DataEntryGroup component 2019-10-08 14:20:22 +01:00
Tom Russell
98a826179c Fix link to Streetscape Wix page (URL is /greenery) 2019-10-04 15:00:29 +01:00
mz8i
c0f2c75ca8
Merge branch 'master' into fix/multi-edit 2019-10-03 15:29:33 +01:00
Maciej Ziarkowski
dd7d66e5fc Add OS map data and UPRN licencing 2019-10-03 14:55:54 +01:00
Tom Russell
67114ebd88 Add attribution note to contact page 2019-10-03 07:50:04 +01:00
Tom Russell
386fb22c10 Link contact email as mailto 2019-10-03 07:49:49 +01:00
Tom Russell
bcfd89196c Add licensing/attribution note to downloads page 2019-10-03 07:39:13 +01:00
Tom Russell
8e3d3c5622 Add reference links to agreements on account page 2019-10-03 07:36:17 +01:00
Tom Russell
f100e7b751 Add attribution note to welcome box 2019-10-03 07:32:54 +01:00
Tom Russell
860bb0b237 Enable copying dates 2019-10-02 22:35:57 +01:00
Tom Russell
173d5128ef Update multi-edit style 
Drop unused code paths which relied on shared
config data structure.

Present simplified key/value data entries

Use category colour in header
 2019-10-02 22:33:42 +01:00
Tom Russell
7899588f87 Fix multi-edit shouldn't deselect building 
If a user is in multi-edit mode and clicks where there is no building,
this should be a no-op.

Previous behaviour would clear the building and incidentally the
URL query string, losing selected attributes to copy, and triggering
URL-parsing error (caught as of fa785a7).
 2019-10-02 22:17:37 +01:00
Tom Russell
fa785a726c Add JSON.parse error-handling when parsing from URL 2019-10-02 22:13:34 +01:00
Maciej Ziarkowski
40891cd4ce Add Sustainability DEC description to legend 2019-10-02 19:41:53 +01:00
Maciej Ziarkowski
564640d94b Add data accuracy agreement 2019-10-02 19:26:18 +01:00
Maciej Ziarkowski
2eddd8ac3d Amend login/signup format, add email notice 2019-10-02 19:17:25 +01:00
Maciej Ziarkowski
8eb0923098 Move Save button to top of edit view 2019-10-02 19:16:55 +01:00
Maciej Ziarkowski
d408978165 Move download links towards end of header 2019-10-02 19:16:05 +01:00
Maciej Ziarkowski
c1b7cfa644 Amend welcome text 2019-10-02 18:40:42 +01:00
Maciej Ziarkowski
1f5abba409 Add Contact page 2019-10-02 18:38:12 +01:00
mz8i
64dc5bb334
Merge pull request #448 from tomalrussell/fix/minor-text 
Fix/minor text
 2019-10-02 16:51:40 +01:00
mz8i
13495ab495
Fix/map update (#450) 
* Move building deselect logic from map-app to mapp

* Use building_id instead of ref_toid in handleClick
 2019-10-02 16:47:45 +01:00
mz8i
e7b7e3fe67
Feature/misc ui fixes (#449) 
* Re-style category links, remove More button

* Fix colour, order and text of categories

* Increase legend max height
 2019-10-02 16:28:11 +01:00
Tom Russell
d6a6bf4fb0 Update privacy policy with password reset emails 2019-10-02 15:28:18 +01:00
Tom Russell
c43651830a Remove 'draft' note from privacy policy 2019-10-02 15:27:55 +01:00
Tom Russell
48fa3fc3ad Remove 'draft' note from contributor agreement 2019-10-02 15:27:21 +01:00
Tom Russell
bc53605f3f Handle inactive/no-building view/edit combinations 2019-10-02 15:15:13 +01:00
Tom Russell
b1941ae358 Drop colouring-may-be-slow message 2019-10-02 15:14:47 +01:00
Tom Russell
91a29affb3 Add text around GItHub link 2019-10-02 15:07:12 +01:00
Tom Russell
fb9952b2a6 Fix typo 2019-10-02 15:06:55 +01:00
Tom Russell
7dc286bdbe Disable Height to eaves (re-enable after db field) 2019-10-02 15:06:10 +01:00
mz8i
606a36ce6c
Activate type category and colour map (#446) 2019-10-02 14:34:44 +01:00
mz8i
fa089f10e1
Feature/435 activate sustainability (#445) 
* Add colour scale definition for sustainability DEC

* Add sustainability DEC data render definition

* Activate sustainability category
 2019-10-02 13:32:00 +01:00
Tom Russell
0954f5aa36
Merge pull request #444 from tomalrussell/fix/selectbox 
Fix SelectDataEntry
 2019-10-02 12:32:37 +01:00
Tom Russell
34fb8a62c7 Fix propTypes name for onChange in MultiDataEntry 2019-10-02 12:28:35 +01:00
Tom Russell
1043d0e7a9 Fix onChange handler for select data entry 
E.g. in Age > Source of Information, allows selecting
data.
 2019-10-02 12:28:19 +01:00
Tom Russell
9ba928b5e1 Run onLike when checking/unchecking like building 2019-10-02 12:19:42 +01:00
Tom Russell
b755b99040 Name building_like consistently in Like container 2019-10-02 12:18:22 +01:00
Tom Russell
1612b66062 Pass building_like down to data components 2019-10-02 12:18:02 +01:00
Maciej Ziarkowski
5f4a939a51 Add downloads link to header 2019-10-01 14:57:23 +01:00
Maciej Ziarkowski
6614cdfb4b Handle case of no extracts available 2019-10-01 14:46:28 +01:00
Maciej Ziarkowski
844bedc596 Move data extracts to new folder structure 2019-09-30 16:03:16 +01:00
Maciej Ziarkowski
6783a00e21 Merge branch 'develop' into feature/342-bulk-extract 2019-09-30 15:06:01 +01:00
mz8i
dafd43b64e
Merge pull request #428 from mz8i/feature/414-reorganise-categories 
Feature 414: reorganise categories
 2019-09-30 14:38:35 +01:00
mz8i
a83a027f14
Merge pull request #423 from mz8i/feature/tile-server-refactor 
Tile server refactor, highlight colour, retina tiles
 2019-09-30 14:29:21 +01:00
mz8i
0a5c14762e
Merge pull request #424 from mz8i/feature/286-validate-username 
Feature 286: validate username
 2019-09-30 12:43:36 +01:00
Maciej Ziarkowski
6f113282ad Add html form validation to sign up form 2019-09-18 15:20:56 +01:00
Maciej Ziarkowski
8d28d1be66 Reposition legend expand button 2019-09-18 14:52:21 +01:00
Maciej Ziarkowski
33dc30612b Collapse header when clicking on link 2019-09-18 14:33:23 +01:00
Maciej Ziarkowski
3ba8cdd7a4 Merge branch 'feature/mobile-ui' into feature/tile-server-refactor 2019-09-18 12:38:52 +01:00
Maciej Ziarkowski
60ce7eea12 Change overflow from scroll to auto 2019-09-18 12:38:11 +01:00
Maciej Ziarkowski
2b1b553a41 Enable highlight colour, retina tiles in frontend 2019-09-17 18:21:51 +01:00
Maciej Ziarkowski
456514ec51 Upgrade react-router-dom and fix map path 2019-09-10 15:07:27 +01:00
Maciej Ziarkowski
46a5cdd658 Change greenery to streetscape 2019-09-10 15:05:35 +01:00
Maciej Ziarkowski
7be25e22a7 Add comment to type declaration file 2019-09-10 12:26:11 +01:00
Maciej Ziarkowski
f5e21e5c1f Always show highlight layer on top of map 2019-09-09 18:14:51 +01:00
Maciej Ziarkowski
56662c38bf Display data extracts in <ul> 2019-09-09 13:29:05 +01:00
Maciej Ziarkowski
556269661a Restore empty prefix for AttributionControl 
Without this, the attribution control shows a link to Leaflet website
 2019-09-09 12:35:03 +01:00
Maciej Ziarkowski
f69a0ef90f Update links to map views 2019-09-09 01:11:45 +01:00
Maciej Ziarkowski
4bfee10508 Allow no selection in categories/building-view 2019-09-09 01:10:52 +01:00
Maciej Ziarkowski
b9648c47af Rework split between app/map-app/map 2019-09-09 01:09:05 +01:00
Maciej Ziarkowski
6625099c03 Remove isBuilding prop from SearchBox 2019-09-09 00:44:26 +01:00
Maciej Ziarkowski
c710b3c59c Make all static pages scrollable 2019-09-06 19:12:01 +01:00
Maciej Ziarkowski
b438871de7 ALlow scroll on jumbotron welcome 2019-09-05 13:33:48 +01:00
Maciej Ziarkowski
ee1e64c185 Refactor and restyle logo 2019-09-05 13:33:20 +01:00
Maciej Ziarkowski
7fbb3b21f9 Restyle main layout 2019-09-04 20:47:40 +01:00
Maciej Ziarkowski
fce0987c3d Restyle legend 2019-09-04 20:47:29 +01:00
Maciej Ziarkowski
05238b5963 Restyle map and controls 2019-09-04 17:18:45 +01:00
Maciej Ziarkowski
ef218009d6 Restyle sidebar 2019-09-04 17:08:53 +01:00
Maciej Ziarkowski
6422be118d Reorganise/restyle header 2019-09-04 17:04:07 +01:00
Maciej Ziarkowski
ceec91670d Add types for react-leaflet-universal 2019-09-04 15:05:41 +01:00
Maciej Ziarkowski
3724d74217 Add data extracts frontend 2019-08-30 13:45:55 +01:00
Tom Russell
065a49c7c5 Fix multi-entry 2019-08-23 17:46:22 +01:00
Tom Russell
541a307b99 Unpack building edit to data-components with mode 2019-08-23 17:35:17 +01:00
Tom Russell
b44b43bc31 Include view icon link 2019-08-23 14:56:29 +01:00
Tom Russell
dd8f7072ed Fix dropped ref to fields-config 
MultiEdit will need revisiting to use data components and validate.
 2019-08-23 14:18:08 +01:00
Tom Russell
616bc676a3 Move modal to components, password pages to user 2019-08-23 14:16:40 +01:00
Tom Russell
7d3e59a0ed Use Fragment instead of dl wrapper 2019-08-23 14:09:23 +01:00
Tom Russell
51d8ac3ed7 Fold edit-handling functionality into data-container 
The intention is to wrap components using withCopyEdit and to use
a 'mode' prop to control view/edit/copy/paste mode.

Next steps to unpack form field data components and update in eaech
category container.
 2019-08-23 12:59:50 +01:00
Tom Russell
5060628937 Drop fields-config.json 2019-08-23 12:58:40 +01:00
Tom Russell
f3e583ee30 Like view-only entry 2019-08-23 12:58:40 +01:00
Tom Russell
3cda6b7513 Planning view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
97ed3f6e1f Construction view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
9ec27caa79 Size view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
68f96dff11 Type view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
f05c1b5552 Use view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
a9cd7a58ea Location view-only entries 2019-08-23 12:58:40 +01:00
Tom Russell
4fcc256f16 Team view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
b6ae8f4a55 Sustainability view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
3dff7cf34b Greenery view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
19d08c9c97 Community view-only notes 2019-08-23 12:58:40 +01:00
Tom Russell
f3fb8f12e0 Fix back button spacing 2019-08-23 12:58:40 +01:00