Commit Graph

583 Commits

Author SHA1 Message Date
Maciej Ziarkowski
aa3e1604e6 Merge branch 'features/migrations_landuse' of github.com:tomalrussell/colouring-london into features/migrations_landuse 2019-12-02 18:15:46 +00:00
Maciej Ziarkowski
bfdde02fab Merge branch 'feature/bulk_data_sources' into features/migrations_landuse 2019-12-02 18:13:55 +00:00
Maciej Ziarkowski
afe9d048f2 Make land use classification migration concise 2019-12-02 18:08:35 +00:00
Dominic H
7b8215517a Update to migrations for staging test 2019-12-02 15:57:22 +00:00
Dominic H
863dbe7eef Adds bul source migrations for landuse in support of #358 2019-12-02 15:02:58 +00:00
Maciej Ziarkowski
76def0022f Fix errors in landuse migrations 2019-12-02 12:53:38 +00:00
Dominic H
20e9299226 Work toward #358
-link to 
https://github.com/colouring-london/colouring_london_analysis/blob/master/bulk_extracts/nlud_landuse_classification.sql
2019-11-29 17:35:50 +00:00
dominic
6b52f2c573 Merge branch 'features/migrations_landuse'
of https://github.com/tomalrussell/colouring-london into 
features/migrations_landuse
2019-09-19 07:53:10 +01:00
dominic
16810db016 Stashing changes 2019-09-19 07:50:23 +01:00
Dominic H
68a9fd1b80 WIP for #358
- Switched from ENUM to table 
- Final steps to complete
2019-09-18 15:59:06 +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
Tom Russell
0ec5164f13
Merge pull request #389 from tomalrussell/features/migrations_sustainability
Sustainability sub categories for launch #360
2019-08-30 13:58:23 +01:00
dominic
f9a48f4a55 File rename to follow conventions for #360
- In future years do we want tocapture DEC certifcate date?
2019-08-30 13:02:37 +01:00
Dominic H
21c2c6cccc Addresses review comments for #360 2019-08-29 16:13:09 +01:00
Tom Russell
a723b2ba25
Merge pull request #404 from tomalrussell/dependabot/npm_and_yarn/app/connect-pg-simple-6.0.1
Bump connect-pg-simple from 5.0.0 to 6.0.1 in /app
2019-08-27 10:58:19 +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
2127521094
Merge pull request #392 from mz8i/feature/63-delete-account-frontend
Feature 63: delete user account (frontend code)
2019-08-23 12:43:53 +01:00
Tom Russell
a35289d9b8
Merge branch 'master' into feature/63-delete-account-frontend 2019-08-23 12:42:03 +01:00
Tom Russell
df902d21a2
Merge pull request #399 from mz8i/feature/61-forgotten-password
Feature 61: forgotten password
2019-08-23 12:39:41 +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
9c67b46f02 Add password reset token database migrations 2019-08-21 14:20:53 +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
Maciej Ziarkowski
1901ebad42 Add user delete database migrations
Apart from adding the delete-related columns, this migration replaces
the existing unique constraint on the username with a unique index
which has a WHERE clause, so that deleted usernames need not be unique.
This is to avoid having to implement a special function for generating
unique IDs just to keep the deleted username unique and under 30 chars.
The deleted username can still use e.g. the initial part of the user_id
but the uniqueness is not required.
2019-08-16 11:12:18 +01:00
Tom Russell
cb64457cca
Merge pull request #386 from mz8i/feature/383-refactor-routes
Refactor API and modify routes
2019-08-16 11:11:39 +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
5336f65ca4 Add user delete database migrations
Apart from adding the delete-related columns, this migration replaces
the existing unique constraint on the username with a unique index
which has a WHERE clause, so that deleted usernames need not be unique.
This is to avoid having to implement a special function for generating
unique IDs just to keep the deleted username unique and under 30 chars.
The deleted username can still use e.g. the initial part of the user_id
but the uniqueness is not required.
2019-08-15 16:08:36 +01:00
Dominic H
35f6eebeb6 Sustainability sub categories for launch #360
- Tested on local db
2019-08-15 14:28:27 +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