Commit Graph

448 Commits

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