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

804 Commits

Author SHA1 Message Date
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
8019e77200 Organise imports in tileserver 2019-11-07 07:48:51 +00:00
Maciej Ziarkowski
175d3236eb Organise imports in frontend and API 2019-11-07 07:45:19 +00:00
mz8i
24b8b13ad6
Merge pull request #463 from mz8i/feature/simplify-tile-renderer 
Simplify tile renderer, improve stitching and caching
 2019-11-07 07:35: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
4d8e084a35 Generate propTypes in all build types 2019-11-06 14:50:43 +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
ab04483479 Sort edit history from new to old 2019-10-24 12:05:52 +01:00
Maciej Ziarkowski
aa59067d9e Add edit history route/controller 2019-10-21 16:29:44 +01:00
mz8i
c63f42f921
Refactor types and await for user/building backend (#476) 
* Refactor buildings API for async/await, types

* Return building data after update

* Refactor users API for await, TS types

* Refactor building service to remove repetition

As part of this refactor, these changes in functionality were made:
- tx isolation lvl for save/like/unlike building is always serializable
- both reverse and forward patch updated for like/unlike
- comparing old and new data uses == instead of ===
 (this is because the new data even for numbers comes in as string)
- the checking of no data change in case of building unlike was fixed
 (didn't work because it re-used code for like which is different)

* Improve param order, docs for updateBuildingData
 2019-10-21 15:19:35 +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
Maciej Ziarkowski
27ba5310bb Cache base layers but don't clear on bbox clear 2019-10-07 17:27:22 +01:00
Maciej Ziarkowski
ed999e1311 Use gravity instead of top/left for tile composite 2019-10-07 17:01:41 +01:00
Maciej Ziarkowski
14b79ce891 Simplify tile stitching with sharp 
The new method uses the composite() method of sharp
to reduce the number of times a PNG buffer is created.
The number could be further reduced from two to one,
if the issue #1908 from lovell/sharp is resolved so that
composite and resize can be chained without an
intermediate call to .png().toBuffer()
 2019-10-07 16:21:36 +01:00
Maciej Ziarkowski
5417b5c8b6 Use functions instead of classes in tile rendering 2019-10-07 13:34: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
Maciej Ziarkowski
2a395d5f2e Update Open Graph website description text 2019-10-03 13:24:48 +01:00
Maciej Ziarkowski
d3cc69fda6 Add square logo for social sharing image 2019-10-03 13:19:44 +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
mz8i
ecc928b910
Use tile scale cache suffix for scale above 1 only (#440) 
The tile params formatting is used for caching.
Don't add the @1x suffix for scale 1, in order to
re-use old cache from before retina tiles were enabled
 2019-10-01 17:03:08 +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
mz8i
8be81b3999
Merge pull request #426 from mz8i/feature/412-semantic-tags 
Feature 412: semantic tags
 2019-09-30 12:41:34 +01:00
mz8i
da4f998fb0
Merge pull request #417 from mz8i/feature/mobile-ui 
UI/UX Improvements
 2019-09-30 12:23:46 +01:00
mz8i
37278fd639
Merge pull request #418 from mz8i/feature/415-no-password-log 
Prevent logging passwords in failed login attempts
 2019-09-30 12:07:46 +01:00
Maciej Ziarkowski
9de8113e20 Add web app manifest and icons 2019-09-18 18:43:21 +01:00
Maciej Ziarkowski
6f113282ad Add html form validation to sign up form 2019-09-18 15:20:56 +01:00
Maciej Ziarkowski
e2e37d88b8 Set max pass length to 128 
OWASP Authentication cheatsheet says 128 is typical max password length
It suggests to not set it too low to let users use complex passwords
 2019-09-18 15:17:22 +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
Tom Russell
a022d90e59
Merge branch 'develop' into feature/view_edit_refactor 2019-09-17 21:25:50 +01:00
Maciej Ziarkowski
269e6ba989 Add tileset param validation in tile server 2019-09-17 18:35:05 +01:00
Maciej Ziarkowski
2b1b553a41 Enable highlight colour, retina tiles in frontend 2019-09-17 18:21:51 +01:00
Maciej Ziarkowski
0abff2e5c1 Define example highlight styles 2019-09-17 18:20:23 +01:00
Maciej Ziarkowski
fe3f02bd85 Allow missing base layer query param for highlight 2019-09-17 18:19:21 +01:00
Maciej Ziarkowski
9fd690c1ac Update cache invalidation mechanism 2019-09-17 18:12:18 +01:00
Maciej Ziarkowski
5adb8e6146 Use new renderers in tile server 2019-09-17 18:11:42 +01:00
Maciej Ziarkowski
ef4d46e36b Add asyncController 2019-09-17 18:05:05 +01:00
Maciej Ziarkowski
5995adeb88 Add data and rendering definition 2019-09-17 18:03:20 +01:00
Maciej Ziarkowski
ae0202d6da Add blank, branching renderers 2019-09-17 18:01:48 +01:00
Maciej Ziarkowski
472e91f275 Add cached renderer 2019-09-17 18:01:23 +01:00
Maciej Ziarkowski
70c05071a8 Add windowed renderer 2019-09-17 18:01:09 +01:00
Maciej Ziarkowski
4b0d51dd80 Add stitch renderer 2019-09-17 18:00:49 +01:00
Maciej Ziarkowski
bd467ceb3b Add data source renderer 2019-09-17 17:59:20 +01:00
Maciej Ziarkowski
5cfa487844 Add tile cache 2019-09-17 17:58:27 +01:00
Maciej Ziarkowski
de34280a2e Add tile server utilities 2019-09-17 17:54:35 +01:00
Maciej Ziarkowski
6a009873dd Update packages, add types 2019-09-17 17:53:58 +01:00
Maciej Ziarkowski
bb6966dccb Add tile server types 2019-09-17 17:50:46 +01:00
Maciej Ziarkowski
31efae3885 Add username and password validation 2019-09-11 16:28:05 +01:00
Maciej Ziarkowski
bc060bb666 Allow custom highlight colour based on data layer 2019-09-10 16:58:14 +01:00
Maciej Ziarkowski
d14c4ce671 Prevent logging passwords in failed login attempts 2019-09-10 15:38:01 +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
b2cf80cb2b Add Facebook and Twitter metadata 2019-09-10 12:23:41 +01:00
Maciej Ziarkowski
f5e21e5c1f Always show highlight layer on top of map 2019-09-09 18:14:51 +01:00
Maciej Ziarkowski
0f30573180 Add comments to non-obvious code 2019-09-09 15:17:44 +01:00
Maciej Ziarkowski
7491d2aa1c Unify imports/export 2019-09-09 15:17:24 +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
5daf0796d1 Split server from frontend route 2019-09-06 19:13:45 +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
Tom Russell
1c1e8df704
Merge pull request #402 from mz8i/feature/61-forgotten-password 
Introduce env variable for webapp origin
 2019-08-30 13:59:38 +01:00
Maciej Ziarkowski
3724d74217 Add data extracts frontend 2019-08-30 13:45:55 +01:00
Maciej Ziarkowski
3494b13dd4 Add first TSLint rule 2019-08-29 17:54:50 +01:00
Maciej Ziarkowski
6733d02876 Add data extract controllers and routes 2019-08-29 17:54:08 +01:00
Maciej Ziarkowski
1008c09905 Add data extract service 2019-08-29 17:53:48 +01:00
Maciej Ziarkowski
9e62d4c114 Move asyncController calls to controller files 2019-08-29 17:52:30 +01:00
dependabot[bot]
ac233dced1
Bump connect-pg-simple from 5.0.0 to 6.0.1 in /app 
Bumps [connect-pg-simple](https://github.com/voxpelli/node-connect-pg-simple) from 5.0.0 to 6.0.1.
- [Release notes](https://github.com/voxpelli/node-connect-pg-simple/releases)
- [Changelog](https://github.com/voxpelli/node-connect-pg-simple/blob/master/CHANGELOG.md)
- [Commits](https://github.com/voxpelli/node-connect-pg-simple/compare/v5.0.0...v6.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-08-27 09:55:24 +00:00
Tom Russell
065a49c7c5 Fix multi-entry 2019-08-23 17:46:22 +01:00
Tom Russell
5d08c492f0 Bump npm versions 2019-08-23 17:38:38 +01:00
Tom Russell
b76eb35ade Drop user routes from api.ts 2019-08-23 17:38: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
Tom Russell
8d7f80ed90 Age data fields - view only 2019-08-23 12:58:40 +01:00
Tom Russell
f26aa19051 Sketch out view-only data components 2019-08-23 12:58:40 +01:00
Tom Russell
1997c34470 Avoid dependency loop 
- building-view contained BuildingVIew and withCopyEdit
- and imported each data-container
- which each imported withCopyEdit to create their data-container

seemed okay from ts/webpack dev environment
but failed in jest test
 2019-08-23 12:58:40 +01:00
Tom Russell
22db157e6e Create (empty) DataContainers for each category 
Fields/children will be written as components, rather than generated declaratively.

BuildingEdit will be folded into the withCopyEdit higher-order-component,
hopefully removing some duplicated structure and functionality.
 2019-08-23 12:58:40 +01:00
Tom Russell
c7b7174f55 Fix Sidebar use in multi-edit 2019-08-23 12:56:22 +01:00
Tom Russell
a3254544e7 Pull BuildingNotFound out of view/edit 2019-08-23 12:56:22 +01:00
Tom Russell
566b738f91 Fix building edit details on props change 
- EditForm owns form state
- fully uncontrolled component
- when props change (e.g. when clicking on another building) the
  component should completely re-render
 2019-08-23 12:56:22 +01:00
Tom Russell
44bd5e67d1 Simplify sidebar container - no title 2019-08-23 12:56:22 +01:00
Tom Russell
1ab015e4df Fix duplicate slug 2019-08-23 12:56:22 +01:00
Tom Russell
7301d6efda Fix category block width 2019-08-23 12:56:22 +01:00
Tom Russell
ae0d7855f7 Style edit/view section header 2019-08-23 12:56:22 +01:00
Tom Russell
dec4801688 Category sidebar block styles 2019-08-23 12:56:22 +01:00
Tom Russell
94d158c59e Pull out categories.css 2019-08-23 12:56:22 +01:00
Tom Russell
1c265b828d Declarative categories list 2019-08-23 12:56:22 +01:00
Tom Russell
43f239c853 Render single section in view/edit 2019-08-23 12:56:22 +01:00
Tom Russell
99456e2431 Move building (sidebar) and map components to nested dirs 2019-08-23 12:56:22 +01:00
Tom Russell
f8f2b5e3e8 Collect user pages in nested subdirectory 2019-08-23 12:56:22 +01:00
Tom Russell
b0f9aa3900 DRYer logo 2019-08-23 12:55:15 +01:00
Tom Russell
b0bfe70e9d Move common components to nested directory 2019-08-23 12:55:15 +01:00
Tom Russell
fefdab7ab4 Move frontend pages to nested directory 2019-08-23 12:54:21 +01:00
Tom Russell
a5447e6ee3 Use React.FunctionComponent when typing 2019-08-23 12:52:25 +01:00
Tom Russell
a35289d9b8
Merge branch 'master' into feature/63-delete-account-frontend 2019-08-23 12:42:03 +01:00
Maciej Ziarkowski
7cc358dcb7 Introduce env variable for webapp origin 2019-08-22 15:56:04 +01:00
Maciej Ziarkowski
a3ab275378 Remove nested state from ForgottenPassword 2019-08-22 14:48:51 +01:00
Maciej Ziarkowski
072128268c Add frontend for forgotten password 2019-08-22 14:40:38 +01:00
Maciej Ziarkowski
2791e7673d Rename tsx file to follow naming convention 2019-08-22 10:48:37 +01:00
Maciej Ziarkowski
6d4c514c00 Remove always failing error commited accidentally 2019-08-22 10:29:40 +01:00
Maciej Ziarkowski
2622269f77 Add global error handler 2019-08-21 14:47:44 +01:00
Maciej Ziarkowski
4d27c3b889 Add controller and route for password reset 2019-08-21 14:47:23 +01:00
Maciej Ziarkowski
fc2666364d Add backend services for password reset 2019-08-21 14:46:14 +01:00
Maciej Ziarkowski
4259778224 Add email service and config template 2019-08-21 14:42:27 +01:00
Maciej Ziarkowski
54bd565cc8 Split /users into routes/controller/service 2019-08-19 14:31:35 +01:00
Maciej Ziarkowski
28ffdcf19e Improve modal popup CSS 2019-08-16 15:40:38 +01:00
Maciej Ziarkowski
4ad62eb196 Add simple CSS to show/hide modal 2019-08-16 15:20:54 +01:00
Maciej Ziarkowski
423f35958d Add delete account action to my-account page 2019-08-16 13:21:12 +01:00
Maciej Ziarkowski
d54cc5df41 Add ConfirmationModal component 2019-08-16 13:20:44 +01:00
Maciej Ziarkowski
90da2a1522 Add user delete API endpoint 
The deleted user username will be changed to 'deleted_'
plus the 13 initial characters of the standard format user_id.
Email, hashed password and API key are all cleared for the user.
The endpoint is currently only available through /api/users/me
and only allows a logged-in user to delete their own account.
 2019-08-16 11:12:18 +01:00
mz8i
b5b72e7152
Switch from express app to router in API 
Co-Authored-By: Tom Russell <tomalrussell@gmail.com>
 2019-08-16 10:57:15 +01:00
Maciej Ziarkowski
185a94b5cb Add user delete API endpoint 
The deleted user username will be changed to 'deleted_'
plus the 13 initial characters of the standard format user_id.
Email, hashed password and API key are all cleared for the user.
The endpoint is currently only available through /api/users/me
and only allows a logged-in user to delete their own account.
 2019-08-15 16:12:01 +01:00
Maciej Ziarkowski
8b78a74874 Remove unnecessary form action/method 
The forms calling the API had an unnecessary form action and method.
This is because the forms have an onSubmit hook calling preventDefault.
The attributes were removed to avoid confusion.
 2019-08-15 12:19:43 +01:00
Maciej Ziarkowski
6f4dfa2227 Handle invalid URLs with the frontend 404 page 2019-08-14 14:17:47 +01:00
Maciej Ziarkowski
be564dccea Add JSON API 404 handler 2019-08-14 14:13:14 +01:00
Maciej Ziarkowski
2c9b5ea3d8 Modify routes, refactor API structure 2019-08-14 14:05:49 +01:00
Maciej Ziarkowski
021578a2d8 Merge branch 'master' into feature/383-refactor-routes 2019-08-14 13:28:21 +01:00
Maciej Ziarkowski
a2394ef962 Move JSON API into its own directory 2019-08-14 10:54:13 +01:00
mz8i
47f4cacb3f Add draft privacy policy 
Closes #323 via #381
 2019-08-13 21:20:20 +01:00
mz8i
f359d1c2d9 Add contributor agreement 
Closes #317 via #382
 2019-08-13 21:17:39 +01:00
Tom Russell
7d7c22ba98 Return empty string (not null) if user doesn't like building 
Towards #364
 2019-08-12 22:04:45 +01:00
Tom Russell
6cfd12e638 Minor updates to npm packages 2019-08-12 21:57:44 +01:00
Tom Russell
00bc2ef722
Merge pull request #378 from mz8i/feature/372-fix-info-links 
Fix info links
 2019-08-12 21:41:59 +01:00
Maciej Ziarkowski
3cb853b90d Change energy to sustainability 2019-08-12 17:57:01 +01:00
Maciej Ziarkowski
822217e594 Fix info links 2019-08-12 16:46:45 +01:00
Maciej Ziarkowski
7b0d305ba7 Fix ES to TS module import errors 2019-08-12 10:24:38 +01:00
Maciej Ziarkowski
fb70b2bf64 Configure Jest for TS 2019-08-12 10:24:08 +01:00
Maciej Ziarkowski
4421930942 Squash TypeScript errors and fix bugs 
Most errors highglighted by TS were due to a lack of type definitions
and were ignored by settings types to `any`.
Some minor bugs were resolved where the fix was obvious.
TODO marks left where `any` needs to be later removed or bugfix verified
 2019-08-09 18:49:43 +01:00
Maciej Ziarkowski
c92c4cded3 Setup TS build (failing), rename files to .ts/.tsx 
The TypeScript build currently runs but fails for a number of files.
This commit only contains rename operations on the source files.
 2019-08-09 15:44:11 +01:00
Tom Russell
87b5fd03f7 Render multi-edit data entries like view 
Could factor out and/or combine DataEntry/MultiDataEntry for better reuse
 2019-08-06 22:13:12 +01:00
Tom Russell
ae7ae7f255 Print data from textbox as entered 
Preserve whitespace
 2019-08-06 22:12:09 +01:00
Tom Russell
fb8b5e0b6f Allow copy MultiDataEntry from view 2019-08-06 22:11:17 +01:00
Tom Russell
eebd8fbcbf Fix checkbox position on login 2019-08-06 20:51:31 +01:00
Tom Russell
b8039d734a Fix search button on mobile 2019-08-06 20:47:02 +01:00
Tom Russell
ce10a2adc4 Enable multi-copy for edit 2019-08-06 20:47:02 +01:00
Tom Russell
4a185b372e Enable multi-copy from building view 2019-08-06 20:47:02 +01:00
Tom Russell
00687dbaed Switch to JSON in URL for copy 
In preparation for multi-attribute copy.
 2019-08-06 20:47:02 +01:00
Tom Russell
60d573526e Bump npm versions 2019-07-30 12:20:36 +01:00
dependabot[bot]
3f4a20a226
Bump lodash-es from 4.17.10 to 4.17.14 in /app 
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.10 to 4.17.14.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.14)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-11 10:35:07 +00:00
Tom Russell
79b43680e1 Bump npm packages 2019-07-07 19:42:49 +01:00
Tom Russell
95853adc57 Fix category colours 2019-07-07 19:30:00 +01:00
Tom Russell
94494f0ea2 Reorder categories 2019-07-07 19:29:51 +01:00
Tom Russell
2d4666f62f Rework categories/titles/links 2019-07-07 19:21:08 +01:00
Tom Russell
010b5151b5 Fix typo 2019-07-07 19:20:28 +01:00
Tom Russell
4939e9af72 Add link to draft data ethics page 2019-07-07 19:20:17 +01:00
Tom Russell
ca4710eb9b Use innerWidth in js media-query-alike test 2019-07-07 19:20:04 +01:00
Tom Russell
3e143b1165 Scope search-box CSS to search box only 2019-07-07 19:19:34 +01:00
Tom Russell
12f31bc585 Merge branch 'feature/show_edit_history' 2019-07-07 18:12:10 +01:00
Tom Russell
1ffb5b185a Merge branch 'feature/search_postcode_on_mobile' 2019-07-07 18:10:56 +01:00
Tom Russell
b4a210fe54 Merge branch 'feature/legend_mobile' 2019-07-07 18:10:32 +01:00
Tom Russell
b7410fd2a9 Merge remote-tracking branch 'origin/front_end/simple_fixes' 2019-07-07 18:09:53 +01:00
dominic
2fe6e5c778
Update fields-config.json 
Fixes #261
 2019-07-04 12:45:36 +01:00
Martin-dJ
bdd4f0750b Changes to address issue #276 Search postcode on mobile 2019-06-19 10:35:03 +00:00
Martin-dJ
b783e8f1b5 Changes to legend.css to improve legend position on mobile (issue #274) 2019-06-11 17:18:34 +00:00
Tom Russell
39be3507a2 Include edit history in building data from API 2019-06-07 14:01:48 +01:00
Martin-dJ
8b99b61d85 Initial attempt to address issue #274 Legend should not obscure map on mobile 2019-06-06 16:35:30 +00:00
Tom Russell
46c864f78d Multi-like layout 2019-05-28 21:18:36 +01:00
Tom Russell
64b50c02d2 Set up section header for multi 2019-05-27 21:28:47 +01:00
Tom Russell
c02839d46a Pass through disabled prop 2019-05-27 21:28:31 +01:00
Tom Russell
1ad7e1de4d Fix transaction mode for likes 2019-05-27 21:28:19 +01:00
Tom Russell
04d50a9181 Hide copy link only when field is disabled 2019-05-27 20:54:43 +01:00
Tom Russell
51ef47e50a Fix prop-types 2019-05-27 20:28:28 +01:00
Tom Russell
8aeb92705b Coerce revision id to number 2019-05-27 20:22:41 +01:00
Tom Russell
0008bbb860 Lint whitespace, case, prop-types 2019-05-27 20:13:43 +01:00
Tom Russell
426c7ff9f6 Click 'Copy' to move to quick/multi edit 
- works with single values
- leans on server-side validation
- special case for likes (like +1 only)
- positioning of 'Copy' link not quite right against 'Hint'
- puts like/update fetch call in App component
 2019-05-27 20:02:19 +01:00
Tom Russell
c03f716a28 Match multi-edit categories 2019-05-27 19:54:38 +01:00
Tom Russell
f34c31a0e8 Add query-string for URL ?a=b parsing 2019-05-27 19:54:14 +01:00
Tom Russell
0685cbf136 Cat: use match params where possible 2019-05-27 19:51:16 +01:00
Tom Russell
60371afd03 Sketch out hardcoded multi-edit 2019-05-27 19:51:15 +01:00
Tom Russell
06c63c7272 Lint prefer-const 2019-05-27 18:35:12 +01:00
Tom Russell
f6e933ff8f Lint empty lines 2019-05-27 18:33:36 +01:00
Tom Russell
9b96872922 Lint prop-types, camelCase 2019-05-27 18:26:29 +01:00
Tom Russell
aef53a0ae0 Lint multi-spaces 2019-05-27 16:46:54 +01:00
Tom Russell
af9c23d883 Lint 4-space indent 2019-05-27 16:39:16 +01:00
Tom Russell
907afa29f0 Lint single quotes 2019-05-27 16:31:48 +01:00
Tom Russell
e540003e2f Lint no-unused 2019-05-27 16:25:31 +01:00
Tom Russell
0ec551c14e Lint HTML escapes 2019-05-27 16:23:58 +01:00
Tom Russell
ebc662280c Lint curly braces 2019-05-27 16:20:00 +01:00