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

453 Commits

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