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

1194 Commits

Author SHA1 Message Date
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
Tom Russell
59f69d0012 Merge branch 'feature/menu_expand_collapse_on_mobile' 2019-05-27 16:13:29 +01:00
Tom Russell
07662c1eb0 Configure eslint 
- run from `app` using `npx eslint .`
 2019-05-27 16:13:11 +01:00
Tom Russell
495663f164 Upgrade npm packages (razzle to 3.0.0) 2019-05-27 16:12:48 +01:00
Tom Russell
942349f5c1 Whitespace in header.js 2019-05-27 16:12:01 +01:00
Tom Russell
ec1a682b8a Left-align mobile menu 2019-05-27 16:11:43 +01:00
Martin-dJ
5b1aff4ba7 Implementation for: Hide or shrink theme switch button on mobile #273 2019-05-23 15:01:00 +00:00
Martin-dJ
97b03f973a Initial attempt to implement: Main menu expand/collapse on mobile #272 2019-05-23 13:41:20 +00:00
Tom Russell
d60712fca4 Smaller text, more bullet spacing 
Closes #256
 2019-05-02 19:28:34 +01:00
Tom Russell
d4667f5ca0 Fix storeys legend en-dashes 2019-05-02 19:26:59 +01:00
Tom Russell
39fe444395 Merge Use and Type, adding Ownership 
Closes #241
 2019-05-02 19:26:45 +01:00
Tom Russell
dda11fbbb0 Remove repeated subcategory under demolition, fixes #259 2019-05-02 19:06:40 +01:00
Tom Russell
ae6f5a0d61
Merge pull request #258 from tomalrussell/feature/logo-style 
Feature/logo style
 2019-05-02 18:54:39 +01:00
Tom Russell
00a9b6ab30 Legend logo to top of box 2019-04-28 15:57:30 +01:00
Tom Russell
1c58a3b5f4 Tighter header/logo 2019-04-28 15:57:21 +01:00
Tom Russell
d6e37d75a3 Match animated logo colours with sections 2019-04-28 15:05:48 +01:00
Tom Russell
4362c9c947 Rewrite cache to allow expiry, use promises 
- tileserver changes use of cache (slightly simplified from callbacks)
- cache methods return promises
- add 'remove' method to cache, with remove_all_at_bbox helper
- from api/building.js, call remove after successful db updates
 2019-04-27 15:56:16 +01:00
Tom Russell
cfc00f348b Brief header note on tile.tileserver 2019-04-27 13:36:17 +01:00
Tom Russell
4c9a37c831 Check exten when rendering highlight tiles 2019-04-27 13:35:51 +01:00
Tom Russell
0709deae83 Return 1px transparent empty tile 2019-04-27 13:35:11 +01:00
Tom Russell
c45394cbb2 Add doc note on mapnik styles in tiles.tile 2019-04-27 13:26:03 +01:00
Tom Russell
b997c4dce4 Add note comment on hot module reloading 2019-04-27 13:25:08 +01:00
Tom Russell
a04aed0d67 Add function docs for parse utils 2019-04-27 13:24:50 +01:00
Tom Russell
47f8109d34 Fix welcome text, logo spacing 2019-04-18 17:41:20 +01:00
Tom Russell
4283a2bdd6
Merge pull request #248 from tomalrussell/feature/frontend_updates 
Feature/frontend updates
 2019-04-18 17:19:34 +01:00
Tom Russell
b1c4f2d9a9
Merge pull request #253 from tomalrussell/feature/swap_positions_on_navbar 
Feature/swap positions on navbar
 2019-04-18 17:19:16 +01:00
Tom Russell
fbd33ee02e Sidebar list alignment, font size 2019-04-18 17:13:49 +01:00
Tom Russell
7d261b18ef Fix building-edit lint/warnings 2019-04-18 17:07:13 +01:00
Tom Russell
7553fcf597 Drop client-side console.log 2019-04-18 17:07:00 +01:00
Martin-dJ
ce4892bee4 Fix for issue #144 Reduce number of classes for 'Number of storeys' legend 2019-04-16 14:33:07 +00:00
Martin-dJ
a6892fbda9 Tidied up indentation in header.js (cosmetic change) 2019-04-10 13:48:51 +00:00
Martin-dJ
e6cfb08cb4 Fix for issue #146 Swap position of 'More about' with 'Building categories' & rename latter 2019-04-10 13:17:58 +00:00
Tom Russell
e491b6718d Longer label for like-me check 2019-04-09 09:37:28 +01:00
Tom Russell
ce014ccdd7 Add titles for more categories 2019-04-09 09:37:28 +01:00
Tom Russell
9217a21282 Show list of fields in overview 2019-04-09 09:37:28 +01:00
Tom Russell
07904e354d Increase sidebar title size 2019-04-09 09:37:28 +01:00
Tom Russell
86a369f801 Sketch structure for year estimate 2019-04-09 09:37:28 +01:00
Tom Russell
4fbaa36328 Add logos to welcome 2019-04-09 09:37:28 +01:00
Tom Russell
7cc0ebdaee My account technical details section 2019-04-09 09:37:28 +01:00
Martin-dJ
150ee4f770 Fix for issue #198 enable postcode search to shut 2019-03-19 15:25:17 +00:00
Tom Russell
30bd2936a3
Merge pull request #225 from tomalrussell/feature/small_screen_legend_height 
Fix for issue #175-age key is jumping off page when looked at on smal…
 2019-03-18 20:08:36 +00:00
Tom Russell
f0df77405e
Merge pull request #226 from tomalrussell/feature/change_legend_size_shape 
Fix for issue #179-change legend on size and shape
 2019-03-18 20:05:38 +00:00
Tom Russell
03f6667d9e Add media queries to fix overlap at smaller heights 2019-03-18 20:04:00 +00:00
Tom Russell
d523e2b8a2 Fix return value of /building/<id>/like.json 
- update to fix log noise meant this was always returning true
 2019-03-18 19:51:55 +00:00
Martin-dJ
29f3bff0d5 Revised fix for issue #216 Reduce log noise (my previous attempt was incorrect). Switched to db.oneOrNone 2019-03-14 17:02:26 +00:00
Martin-dJ
c20a8aa97a Fix for issue #175-age key is jumping off page when looked at on small computer screen. Set max-height to 50 vh. 2019-03-14 14:39:23 +00:00
Martin-dJ
50813f8fc5 Fix for issue #179-change legend on size and shape 2019-03-14 13:38:27 +00:00
Martin-dJ
c83f2bc0c2 Attempt to fix issue #216-Reduce log noise 2019-03-14 12:32:49 +00:00
Tom Russell
5392ad0606 Render empty tiles outside of area of interest 2019-02-24 20:07:22 +00:00
Tom Russell
2d8b62fb84 Lint spacing 2019-02-24 19:28:11 +00:00
Tom Russell
4fc4d314fd Rewrite tileserver to use cache, stitch low-zoom tiles progressively 2019-02-24 19:23:59 +00:00
Tom Russell
65fd7c5f22 Improve cache logging, update ruleset 2019-02-24 19:23:21 +00:00
Tom Russell
a8485643e0 Add xyz method to tile 2019-02-24 19:23:00 +00:00
Tom Russell
669f8ceadb Simplify highlight style (geom only) 2019-02-24 19:22:18 +00:00
Tom Russell
38599cae9f Add sharp for image composite/resize 2019-02-24 19:20:47 +00:00
Tom Russell
77849531a6 Use node-fs package to patch fs.mkdir 2019-02-24 15:30:37 +00:00
Tom Russell
c5ebcd2df8 Sketch in cache 2019-02-24 15:15:52 +00:00
Tom Russell
af46067018 Push image encoding down to tile render, and do async 2019-02-24 13:49:16 +00:00
Tom Russell
228530cb88 Fix class/className in search-box 2019-02-24 13:34:57 +00:00
Tom Russell
de5ba78d3f Better split of responsibilities for tile routing/rendering 2019-02-24 13:34:40 +00:00
Tom Russell
961441c5c0 Move api/tiles modules to subfolders 2019-02-24 12:17:59 +00:00
Tom Russell
0249a50d8d Update npm packages 2019-02-23 11:37:53 +00:00
Tom Russell
f05fe3dba5 Add postcode search box 2019-02-11 09:04:19 +00:00
Tom Russell
2a676103ba Top-level docstring for app.js 2019-02-05 21:41:31 +00:00
Tom Russell
47381b959c Lint server.js 2019-02-05 21:41:15 +00:00
Tom Russell
af810a0b85 Location search endpoint 2019-02-05 13:37:44 +00:00
Tom Russell
d05e125810 Do more work in render_tile, test if should check cache 2019-01-22 22:37:44 +00:00
Tom Russell
7ca7fb59ac Shift legend/logo layout 2019-01-22 21:55:03 +00:00
Tom Russell
b504b8f5ae Nudge location colour scale darker 2019-01-22 21:46:07 +00:00
Tom Russell
3be82bdf11 Re-enable 'town' 2019-01-22 21:43:36 +00:00
Tom Russell
1b1a5d9163 Reverse location map colour scale 2019-01-22 21:40:35 +00:00
Tom Russell
84686d3481 Sidebar section header spacing 2019-01-22 21:25:42 +00:00
Tom Russell
45b716791b Legend style for desktop 2019-01-22 21:23:35 +00:00
Tom Russell
d276160ecd Legend - smaller patches, taller box 2019-01-22 19:43:53 +00:00
Tom Russell
dbcf4c306b Move 'more about' nav link 2019-01-22 19:40:55 +00:00
Tom Russell
6d054919f8 Restyle sidebar with colour 2019-01-22 19:39:27 +00:00
Tom Russell
d39d5a2e9f Add inactive notices/intro text 2019-01-22 19:39:16 +00:00
Tom Russell
3534257973 Experimental sidebar colours 2019-01-22 18:39:43 +00:00
Tom Russell
05f40dca28 Update razzle/react-dev-utils 2019-01-22 18:39:28 +00:00
Tom Russell
544f929fcd Drop unused react-transitions 2019-01-22 18:39:14 +00:00
Tom Russell
b11534f094 Include section-header classes 2019-01-22 18:36:36 +00:00
Tom Russell
0b598e318b Back from edit overview to view 2019-01-22 18:01:29 +00:00
Tom Russell
2d54a7061d Common format for empty string and bools 2019-01-22 17:56:28 +00:00
Tom Russell
d3907f7362 Unlike buildings 2019-01-22 17:52:32 +00:00
Tom Russell
efe05d4483 Like once only 2019-01-22 17:34:46 +00:00
Tom Russell
f6ccd51393 Include if current user likes building in view 2019-01-22 17:21:44 +00:00
Tom Russell
4f4d81ce65 GET liked status 2019-01-22 17:02:03 +00:00
Tom Russell
c067f87ad2 Catch like-twice error 2019-01-22 16:43:16 +00:00
Tom Russell
8c6a86bbec Hide 'Click...' notice on front page 2019-01-19 19:19:00 +00:00
Tom Russell
8e7eea1369 Add click a building... notice to map 2019-01-19 19:06:26 +00:00
Tom Russell
9d1094cdd5 Include text_multi with links in view 2019-01-19 18:47:08 +00:00
Tom Russell
9914df7925 Define conservation area as layer for planning views 2019-01-19 16:56:03 +00:00
Tom Russell
c46e59f19a Add conservation area route to tileserver 2019-01-19 16:55:30 +00:00
Tom Russell
fa53a2068e Define conservation area map style 2019-01-19 16:55:09 +00:00
Tom Russell
751b0d0480 Whitelist planning fields/drop location text 2019-01-19 16:54:53 +00:00
Tom Russell
0c8dc94cb1 Include checkbox for planning fields 2019-01-19 16:54:20 +00:00
Tom Russell
4e6d589891 Add planning fields to view/edit 2019-01-10 09:30:40 +00:00
Tom Russell
e01589b4e5 Disable text-based address fields 2018-12-11 17:36:08 +00:00
Tom Russell
9450f29449 Restrict rendered tiles to zoom ≥14 2018-12-05 20:39:16 +00:00
Tom Russell
ae4b1234e7 Show building outlines at high zoom 2018-12-05 20:35:44 +00:00
Tom Russell
5a5ad68e75 Like me legend and style 2018-12-05 20:30:29 +00:00
Tom Russell
31b1483141 Change 'like me' text 2018-12-05 20:24:30 +00:00
Tom Russell
d64deb9d83 Sidebar header spacing 2018-12-03 10:29:32 +00:00
Tom Russell
7e09c0507f Typography: glacial_cl for logotype only 2018-12-03 10:21:19 +00:00
Tom Russell
a35df52b75 Legend size and spacing 2018-12-03 10:21:00 +00:00
Tom Russell
368ccf1ef4 Sketch in legend 2018-12-03 09:35:14 +00:00
Tom Russell
dcf71f30ff Include data-intro 2018-12-03 09:19:13 +00:00
Tom Russell
13bc222561 Fix is_building/not found logic 2018-11-30 15:54:11 +00:00
Tom Russell
67dcad9b9a Front-end interface for age reference details and links 2018-11-30 15:53:55 +00:00
Tom Russell
92c93d1684 Fix internal links 2018-11-30 09:44:19 +00:00
Tom Russell
c41556b55e Fix pages.cl links 2018-11-30 09:38:37 +00:00
Tom Russell
ff0b3bdb91 Drop 'Cancel' 2018-11-30 09:29:16 +00:00
Tom Russell
446266b8b6 Factor out get_cat 2018-11-30 09:26:28 +00:00
Tom Russell
f3e09a283c Fix navigate-on-save 2018-11-30 09:16:04 +00:00
Tom Russell
613e4aedf4 Fix welcome link 2018-11-29 22:05:43 +00:00
Tom Russell
377149975b Sketch out new flow (with URL change) 2018-11-29 22:00:53 +00:00
Tom Russell
09b59dbf6d Fix shape/size link 2018-11-29 16:47:25 +00:00
Tom Russell
fe7f55ef67 InfoBox message on view maps sidebar 2018-11-21 22:20:08 +00:00
Tom Russell
447b5acf09 Redirect from edit if not logged in 2018-11-21 22:19:51 +00:00
Tom Russell
298c55038c Update welcome text 2018-11-21 22:19:27 +00:00
Tom Russell
bc1661dc76 Test yellow-red colour for likes 2018-11-21 22:06:22 +00:00
Tom Russell
f8e907f86d Show building numbers only at high zoom 
Closes #132

See https://wiki.openstreetmap.org/wiki/MinScaleDenominator
for scale<->zoom level conversion
 2018-11-21 22:05:40 +00:00
Tom Russell
d61f23cb5c Update storey to YlOrRd scheme (Closes #101) 2018-11-21 21:15:44 +00:00
Tom Russell
779b49514f Remove losing-edits notice, add links (Closes #111) 2018-11-21 21:08:55 +00:00
Tom Russell
5067027dd8 Update node packages 2018-11-20 20:24:49 +00:00
Tom Russell
bd22468b3c Fix more info in edit 2018-11-13 10:47:53 +00:00
Tom Russell
91528321bb Fix unused import 2018-11-13 10:45:35 +00:00
Tom Russell
723f0b14e8 Update main layout (no banner) 2018-11-13 10:44:51 +00:00
Tom Russell
cfa5fe6520 Change welcome-box size 2018-11-13 10:44:32 +00:00
Tom Russell
d73f45a4bc Fix more-info links 2018-11-13 10:44:12 +00:00
Tom Russell
5a6076e3d7 Don't import unused (EditIcon/BetaBanner) 2018-11-13 10:35:50 +00:00
Tom Russell
631a940a71 Change edit-building title 2018-11-13 10:31:11 +00:00
Tom Russell
4b110a129c Select building with categories closed 2018-11-13 10:30:12 +00:00
Tom Russell
7166606b43 Remove the blue edit button from view section 2018-11-13 10:20:06 +00:00
Tom Russell
6805e3fd8f Change view title to 'Data available for this building' 2018-11-13 10:18:41 +00:00
Tom Russell
3ec7be0477 Change section titles 
- 'Design and Build' to 'Construction'
- 'Energy' to 'Sustainability'
 2018-11-13 10:17:44 +00:00
Tom Russell
e1342a7d05 Add an 'edit' button on maps sidebar 2018-11-13 10:15:46 +00:00
Tom Russell
db23a4ed35 Change help to 'More info' and remove question mark and hover 2018-11-13 09:32:04 +00:00
Tom Russell
f3aa99f187 Change title to 'View Maps' 2018-11-13 09:30:36 +00:00
Tom Russell
e5ba09062b Change 'Edit maps' to 'Add/edit data' on tool bar 2018-11-13 09:28:55 +00:00
Tom Russell
ffcd8f17d5 Change landing page text 
[Closes #123]
 2018-11-13 09:27:57 +00:00
Tom Russell
a11d6f47f5 Remove beta banner 2018-11-13 09:24:36 +00:00
Tom Russell
1d7cf4c247 Use revision id in data-layer tile request 2018-10-25 22:23:54 +01:00
Tom Russell
024d29ca2c Ensure iterators have keys (uprns in building view) 2018-10-25 14:46:07 +01:00
Tom Russell
7b8b4226c9 Show UPRNs in building view 
- add /building/id/uprns.json endpoint
- hide children behind details

[Closes #83]
 2018-10-25 14:36:52 +01:00
Tom Russell
4934e0757b Drop ref_toid from updatable whitelist 2018-10-25 14:02:38 +01:00
Tom Russell
8283a9708e FIx homepage age colour bg 2018-10-25 14:02:10 +01:00
Tom Russell
967f519e8f TItle 'number of likes' 2018-10-25 13:49:33 +01:00
Tom Russell
6f326c70fd Fix showing zero values 2018-10-25 13:49:24 +01:00
Tom Russell
4c41b1fdba Fix class/className JSX 2018-10-25 13:49:02 +01:00
Tom Russell
0ee48597d8 Include likes map (orange if liked) 
[Closes #60]
 2018-10-25 13:48:48 +01:00
Tom Russell
6cc6630196 Enable like button (drop restriction on 1-per-user) 
[Closes #82]
 2018-10-25 13:34:54 +01:00
Tom Russell
b2dd5bd138 Add location map (count of data entries) 
Closes #43
Closes #96
 2018-10-25 12:39:41 +01:00
Tom Russell
35d2e8ffd8 Allow expand/collapse maps (fallback to 'base') 2018-10-25 12:15:19 +01:00
Tom Russell
7f8683a1b9 Auto-CAPS postcode input 
[Closes #78]
 2018-10-25 11:57:58 +01:00
Tom Russell
ca6992c8be Remove hyphen from empty data view 
[Closes #95]
 2018-10-25 11:52:11 +01:00
Tom Russell
80222a07e4 Add text to icon-buttons for clarity 
[Closes #94]
 2018-10-25 11:48:25 +01:00
Tom Russell
665b4f32ff Relabel view/edit pages to 'Building data' and add 'Edit maps' to header 
[Closes #88, #93]
 2018-10-25 11:18:42 +01:00
Tom Russell
3512ecfaed Add title attributes to section headers 
[See #91]
 2018-10-25 10:47:19 +01:00
Tom Russell
5661af9df4 Dark blue-grey on sidebar arrows 
[Closes #91]
 2018-10-25 10:36:27 +01:00
Tom Russell
304bc37a5d Lowercase field labels/headings 
[Closes #90]
 2018-10-25 10:23:56 +01:00
Tom Russell
bea4785285 Use triangles for sidebar sections 
[Closes #92]
 2018-10-25 10:22:35 +01:00
Tom Russell
3abbf4bbe8 Update base layers 
- simplify age render (no outline)
- base_light/base_night tiles
- cyan highlight

[Closes #50]
 2018-10-25 10:16:18 +01:00
Tom Russell
bed063f238 Change age colour scheme 
[Closes #89]
 2018-10-25 10:07:05 +01:00
Tom Russell
efd1d10908 Add source detail to whitelist 2018-10-21 20:47:59 +01:00
Tom Russell
2237cb8b35 Bump package-lock.json 2018-10-21 19:46:32 +00:00
Tom Russell
513c8c1a46 Limit edit-form state to its fields 2018-10-20 15:35:52 +01:00
Tom Russell
1b3fe36e05 Fix GET building by toid/uprn 2018-10-20 14:51:39 +01:00
Tom Russell
f460aaeef6 Allow POST to edit building with ?api_key=... 2018-10-20 12:59:17 +01:00
Tom Russell
ab2db30bc4 Allow requesting user API key 2018-10-20 12:21:11 +01:00
Tom Russell
daca8e46ee Split main.css to app/sidebar/transitions.css 2018-10-20 11:33:27 +01:00
Tom Russell
3085537f33 Add placeholder 
- Shows up as e.g. 'Building name (if any)'

Closes #79
 2018-10-05 22:47:37 +01:00
Tom Russell
4605cb68c9 Add lat/lng, OSM id 2018-10-05 22:43:29 +01:00
Tom Russell
436408f054 Add note that colouring may take a few seconds 2018-10-05 22:37:46 +01:00
Tom Russell
8c726859fa Work on maintaining map layers and cats over navigation 2018-10-05 22:20:02 +01:00
Tom Russell
220d167833 Only show edit form for current cat 2018-10-05 22:19:26 +01:00
Tom Russell
35cf0ff4ec Disable TOID input field 2018-10-05 21:45:40 +01:00
Tom Russell
6733be79c2 Delete stray console.log 2018-10-05 21:45:27 +01:00
Tom Russell
2b29d01a21 Relax revision-update check 2018-10-05 21:44:51 +01:00
Tom Russell
b438e885c0 Add "click map" hint; tweak labels 2018-10-05 21:05:49 +01:00
Tom Russell
9b1ad270f8 Commit fields-config.json for sidebar structure 2018-10-05 20:48:49 +01:00
Tom Russell
b716e8a509 Fix tooltips and linking 2018-10-05 18:41:12 +01:00
Tom Russell
3ea1e933ac Full-width section header link 2018-10-05 09:10:20 +01:00
Tom Russell
df91d98383 Sidebar header/section styles 2018-10-04 22:50:33 +01:00
Tom Russell
8c0452920d Typo contex(t) 2018-10-04 22:44:04 +01:00
Tom Russell
29783c9b33 Match building URLs with query strings 2018-10-04 22:43:50 +01:00
Tom Russell
002b6a4a80 Add query-string to package.json 2018-10-04 22:43:28 +01:00
Tom Russell
1ce5eb8f69 Factor building view/edit structure to shared config 2018-10-03 21:47:49 +01:00
Tom Russell
3539e1126c Refactor top-level routing 2018-10-03 21:47:18 +01:00
Tom Russell
14b8df3dd2 Drop unused Fragment reference 2018-10-02 21:48:27 +01:00
Tom Russell
c1f35b024b Link to pages from main nav 2018-10-02 21:48:13 +01:00
Tom Russell
84cfda5a58 Larger legend colour keys 2018-10-02 21:47:59 +01:00
Tom Russell
2e0ee04dce Update pages links 2018-10-02 21:25:46 +01:00
Tom Russell
fe8e6f7737 Add back buttons to sidebar header 2018-10-01 17:20:25 +01:00
Tom Russell
a012b24bd1 Use icon buttons for edit/info/tooltip 2018-10-01 16:59:39 +01:00
Tom Russell
86e30b1012 Add font-awesome icons 2018-10-01 15:20:45 +01:00
Tom Russell
f2d543f3c6 Allow default-width logo 2018-10-01 15:17:28 +01:00
Tom Russell
46d630711f Include all categories and form sections 
- coming soon if inactive [Closes #30]
- update section titles [Closes #52]
- add size fields [Closes #39]
 2018-10-01 12:45:33 +01:00
Tom Russell
f8201da283 Create component for section in building-view 2018-10-01 00:32:24 +01:00
Tom Russell
72a626e267 Squares turn to arrows on hover 
Closes #33
 2018-10-01 00:13:01 +01:00
Tom Russell
d8fb5aeaca Reject empty changesets 2018-09-30 23:06:42 +01:00
Tom Russell
ddd300405c Default 0 storeys (handle nulls) 2018-09-30 23:06:30 +01:00
Tom Russell
a9b3a394de Only logged-in edits (plus record user with edit) 2018-09-30 22:30:00 +01:00
Tom Russell
cf2ffd3cc8 Handle save-building errors 2018-09-30 22:23:13 +01:00
Tom Russell
18d95491be Fix frontend building_id references 2018-09-30 21:54:47 +01:00
Tom Russell
48a98ff610 Fix highlight tile query 2018-09-30 21:53:57 +01:00
Tom Russell
e98d589683 Catch-all server-side HTML route errors 2018-09-30 21:53:41 +01:00
Tom Russell
45d6a8e6e5 Fix single-digit integer parse (!) 2018-09-30 21:53:20 +01:00
Tom Russell
88e054ff55 Update buiilding locate URL 2018-09-30 21:10:03 +01:00
Tom Russell
c3e539cd81 Log error from error box if any 2018-09-30 20:30:04 +01:00
Tom Russell
11e93a18b3 Sprinkle credentials: same-origin on authenticated fetches 2018-09-30 20:29:46 +01:00
Tom Russell
aae5c1ca32 Handle errors logging in 2018-09-30 20:28:33 +01:00
Tom Russell
2e80c9d2e9 Fix db connection (use env vars) 2018-09-30 20:27:53 +01:00
Tom Russell
775f08ab2d Fix newsletter submit 2018-09-30 20:27:40 +01:00
Tom Russell
c8b320e48d Module heading comments 2018-09-30 19:50:09 +01:00
Tom Russell
e3c02612cd Update user db access 2018-09-30 19:49:07 +01:00
Tom Russell
d0755e61de Sketch in building-like method 2018-09-30 19:48:42 +01:00
Tom Russell
1b191a1466 Use simpler shallow compare, drop fast-json-patch 2018-09-30 18:58:41 +01:00
Tom Russell
b6ef15949e Rewrite building to log changes, use database columns 
- Typically returning all columns from 'buildings', possibly using other
  tables to join and filter.
- Using database types and constraints - let the db do validation and
  consistency checking!
- Using transaction around updating a building record, adding log entry
- Using JSON patch to record forward and reverse patches (hope this will
  give small data size compared to all-columns or before-and-after
  strategy)
 2018-09-30 16:25:53 +01:00
Tom Russell
9b5e85a9ff Use pg-promise in express-session 2018-09-30 16:18:57 +01:00
Tom Russell
fb350f5589 Move tile helper to env vars for db config 2018-09-30 16:18:34 +01:00
Tom Russell
26c79d07ff Move tileserver style queries to non-jsonb 2018-09-30 16:17:59 +01:00
Tom Russell
f8803b7875 Move db to pg-promise 2018-09-30 16:17:31 +01:00
Tom Russell
fb43998f86 Add pg-promise and fast-json-patch, npm upgrade/allow minor upgrades 2018-09-30 16:16:26 +01:00
Tom Russell
3e4beb5423 Query buildings by location or reference 2018-09-29 19:09:48 +01:00
Tom Russell
381a378870 Default to night bg 2018-09-27 21:37:32 +01:00
Tom Russell
e774ed1693 Update beta banner text (test site) 2018-09-17 21:32:29 +01:00
Tom Russell
9a06d35bd8 Add logos block to login/register pages (Closes #35) 2018-09-17 21:27:52 +01:00
Tom Russell
84cc616d06 Add 'under development' info to login/register 2018-09-14 00:19:19 +01:00
Tom Russell
853def333e Debug routing, id corner cases 2018-09-13 23:55:53 +01:00
Tom Russell
3baccffd36 Redirect from edit if not logged in 2018-09-13 22:19:55 +01:00
Tom Russell
4c2aecd73d Welcome/sidebar transitions 2018-09-13 22:13:53 +01:00
Tom Russell
9fb4fa052a Handle building not found 2018-09-13 21:12:01 +01:00
Tom Russell
6c0c1b51c0 Stricter int parsing 2018-09-13 20:36:14 +01:00
Tom Russell
4939c1dfb0 Fix ThemeSwitcher style and map click 2018-09-13 20:35:27 +01:00
Tom Russell
e87e334edd Don't link to # 2018-09-13 19:54:33 +01:00
Tom Russell
cf7128c66f Import (not require) 2018-09-13 19:54:16 +01:00
Tom Russell
0449170b76 Handle error on building update 2018-09-13 17:13:03 +01:00
Tom Russell
bdb4e45d8b Handle error on logout 2018-09-13 17:02:27 +01:00
Tom Russell
1ea6b0b75b Handle and show login/signup errors 2018-09-13 16:58:05 +01:00
Tom Russell
8ac687e454 Link login <-> signup 2018-09-13 16:09:41 +01:00
Tom Russell
a6d1b309a4 Switch map theme 2018-09-13 16:03:49 +01:00
Tom Russell
a2e995839e Handle POST/GET building 2018-09-11 23:30:17 +01:00
Tom Russell
0ec0b52f90 Demo rendering location_number as text 2018-09-11 23:29:30 +01:00
Tom Russell
30e4cf2912 Data-driven building edit and view 2018-09-11 20:59:59 +01:00
Tom Russell
66c71dfdc7 Split out Tooltpi, Sidebar, CSS 2018-09-11 20:59:37 +01:00
Tom Russell
05604e32b6 Select building, show view/edit 2018-09-10 23:34:56 +01:00
Tom Russell
6a150ba6f9 Parse building id server-side 2018-09-10 23:32:56 +01:00
Tom Russell
3e10119dc4 Backround fill for focus building 2018-09-10 23:32:19 +01:00
Tom Russell
fb9ff4f584 Render colour map for URL 2018-09-10 22:14:09 +01:00
Tom Russell
a48423bdaf Link legend 2018-09-10 21:49:58 +01:00
Tom Russell
60ad6fb1a4 Sketch in legend, map on welcome page 2018-09-10 12:41:00 +01:00
Tom Russell
bada23e69d Load highlight layer 2018-09-10 12:40:25 +01:00
Tom Russell
4422be4440 Pull tileserver into app 2018-09-10 10:44:32 +01:00
Tom Russell
a005643746 Merge frontend/api into universal react app 2018-09-09 22:22:44 +01:00