Commit Graph

4998 Commits

Author SHA1 Message Date
Keviin Åberg Kultalahti ad1b6aaf54 remove testing stuff 2021-04-22 12:25:32 +02:00
Keviin Åberg Kultalahti 840d41d7eb fix DropdownMenu not being removed from export file 2021-04-22 12:15:42 +02:00
Keviin Åberg Kultalahti 4106d5705b Merge branch 'spectrum-bbui' into spectrum/kevins-bits-and-bobs 2021-04-22 12:09:51 +02:00
Andrew Kingston 5770035650 Update automation section to use spectrum 2021-04-22 10:58:04 +01:00
Andrew Kingston 1a067fd492 Merge branch 'spectrum-bbui' of github.com:Budibase/budibase into spectrum-bbui 2021-04-22 10:10:52 +01:00
Andrew Kingston 1fb6cd0b4b Add dropzone component and update builder and standard components 2021-04-22 10:10:42 +01:00
Martin McKeaveney 8fab374c1f google login reading from couch 2021-04-21 21:08:04 +01:00
Martin McKeaveney d8db863faa merge 2021-04-21 18:43:20 +01:00
Martin McKeaveney 28f8f8b6ef custom google middleware 2021-04-21 18:40:32 +01:00
mike12345567 e85b7682e0 Initial CRUD interface for templates. 2021-04-21 18:15:57 +01:00
mike12345567 15223080d5 Formatting and linting. 2021-04-21 16:46:51 +01:00
mike12345567 76ceb6a951 Some re-work of the auth package, making it a bit easier to use/less likely to make a mistake. 2021-04-21 16:42:44 +01:00
Keviin Åberg Kultalahti f3f0c29a9d Delete DropdownMenu component 2021-04-21 16:03:32 +02:00
Keviin Åberg Kultalahti 66562400fe Switch out DropdownMenu to Popover across the builder 2021-04-21 16:03:12 +02:00
Keviin Åberg Kultalahti 446c3af075 add defaults to Button and ActionGroup components 2021-04-21 15:59:08 +02:00
Keviin Åberg Kultalahti 5eaae47ec0 Move DetailSummary and update to use Spectrum Icon 2021-04-21 15:34:46 +02:00
Keviin Åberg Kultalahti b5fde37c39 Switches out SideNav to SideNavigation component 2021-04-21 15:25:25 +02:00
Keviin Åberg Kultalahti 3197174398 Implements SideNavigation component 2021-04-21 15:18:50 +02:00
Keviin Åberg Kultalahti 7229bdbaa3 add size prop to ClearButton 2021-04-21 14:59:16 +02:00
Keviin Åberg Kultalahti 81f2e14172 remove usage of old Icons component in ModalContent 2021-04-21 14:59:09 +02:00
Keviin Åberg Kultalahti b9f5868fb3 fix Menu component 2021-04-21 14:51:17 +02:00
Keviin Åberg Kultalahti f690adc552 Remove Icons 2021-04-21 14:20:53 +02:00
Keviin Åberg Kultalahti cb3e2fd106 fix ButtonGroup not adding classes to children 2021-04-21 14:19:10 +02:00
Keviin Åberg Kultalahti a86c6788da Implements ButtonGroup component 2021-04-21 14:12:47 +02:00
Keviin Åberg Kultalahti 64b3b0f6ef Implements Tags and Tag components 2021-04-21 14:10:24 +02:00
Keviin Åberg Kultalahti 937bd03af5 implements ClearButton 2021-04-21 14:09:56 +02:00
Keviin Åberg Kultalahti 8d80c007f3 implements Avatar component 2021-04-21 14:09:36 +02:00
Keviin Åberg Kultalahti 22602998f4 remove old Switcher import 2021-04-21 13:55:54 +02:00
Keviin Åberg Kultalahti 1888fbacca remove old Switcher import 2021-04-21 13:55:38 +02:00
Keviin Åberg Kultalahti 8390bee693 wip: initial tags 2021-04-21 13:53:49 +02:00
Keviin Åberg Kultalahti 17e14e0c06 remove unused code in QueryViewer component 2021-04-21 13:53:21 +02:00
Keviin Åberg Kultalahti 0e786089f5 Removes Switcher component 2021-04-21 13:44:36 +02:00
Keviin Åberg Kultalahti 630acef7fc SettingsModal now uses Tabs component 2021-04-21 13:43:58 +02:00
Keviin Åberg Kultalahti 9968ca7695 QueryViewer now uses Tabs component 2021-04-21 13:41:44 +02:00
Keviin Åberg Kultalahti 7a6d4fd359 adds defaults to Typography components 2021-04-21 13:21:43 +02:00
Keviin Åberg Kultalahti 6622d5a483 remove unused files that were accidentally left 2021-04-21 13:16:05 +02:00
Keviin Åberg Kultalahti a84b1ed316 merge spectrum-bbui 2021-04-21 13:15:16 +02:00
Martin McKeaveney ffe167bbd3 google auth E2E 2021-04-21 12:12:22 +01:00
Andrew Kingston 532b861bb0 Remove some old stuff and update binding icon 2021-04-21 11:42:25 +01:00
mike12345567 89fef34401 Updating cypress tests to work with the new user ID system. 2021-04-21 11:33:12 +01:00
Andrew Kingston 06b438d585 Add datepicker, centralise icon management and update builder styles 2021-04-20 20:06:27 +01:00
Martin McKeaveney 301f681c88 config creation and management APIs 2021-04-20 18:14:36 +01:00
Andrew Kingston 3c8b6fa5c6 Revert to use manual handlers for closing rather than clickOutside action 2021-04-20 18:14:33 +01:00
mike12345567 de19e986c6 Linting and formatting. 2021-04-20 17:33:44 +01:00
mike12345567 ec3a9db383 Updating test cases now that login has changed a bit. 2021-04-20 17:27:23 +01:00
mike12345567 b4c8bf81f7 Swapping over everything to use the new user ID and updating everything after some end to end testing. 2021-04-20 17:17:44 +01:00
Keviin Åberg Kultalahti d186eb9dc9 remove backend.js artifact 2021-04-20 16:44:29 +02:00
Keviin Åberg Kultalahti 7b9377ea1e clean up Tree Item component 2021-04-20 16:44:08 +02:00
Keviin Åberg Kultalahti 7403e4925e wip: trying to get the new TreeView component to work with the drag-and-drop functionality 2021-04-20 15:57:56 +02:00
Andrew Kingston 14cf5c0669 Add search component and update screen list panel 2021-04-20 14:24:14 +01:00
Andrew Kingston fde47ad61c Merge branch 'spectrum-bbui' of github.com:Budibase/budibase into spectrum-bbui-forms 2021-04-20 14:06:33 +01:00
mike12345567 1f8925ceb8 Merge branch 'next' of github.com:Budibase/budibase into feature/user-id-update 2021-04-20 14:03:42 +01:00
Andrew Kingston 5f7f18b187 Fix create table modal 2021-04-20 13:40:08 +01:00
Martin McKeaveney b5e19e4216 lint 2021-04-20 13:13:15 +01:00
Andrew Kingston 864366336a Update settings modal 2021-04-20 12:55:23 +01:00
Andrew Kingston e41c6e33e0 Update all form components to update bound values before firing onchange events 2021-04-20 12:49:02 +01:00
Andrew Kingston da47cfa4e5 Update new screen modal 2021-04-20 12:48:37 +01:00
Andrew Kingston 0119feddec Add additional spacer to query params 2021-04-20 12:37:33 +01:00
Andrew Kingston 1a0aa22968 Update group by popover 2021-04-20 12:35:34 +01:00
Andrew Kingston 514bdc4d3f Update calculate popover 2021-04-20 12:34:10 +01:00
Andrew Kingston beb296fd0d Update filter popover 2021-04-20 12:31:08 +01:00
Andrew Kingston d268064164 Update all backend table popovers to use spectrum and fix multiple bugs 2021-04-20 12:20:03 +01:00
Andrew Kingston 9482112d6b Update entire builder backend UI to work with new spectrum components and fix multiple issues 2021-04-20 11:53:19 +01:00
Andrew Kingston a49d54fb1a Fix jumping in nav items when hovering 2021-04-20 10:43:20 +01:00
Andrew Kingston 2d08bc7140 Fix styles in create app modal 2021-04-20 10:39:09 +01:00
Andrew Kingston c1512e1e0e Update builder settings modal to use spectrum components 2021-04-20 10:26:20 +01:00
mike12345567 c3a1841f01 Updating auth package to remove use of email address (bar logging in). 2021-04-19 17:31:47 +01:00
mike12345567 eaa89c824e Updating the server to remove use of the email in the user ID. 2021-04-19 16:26:33 +01:00
Martin McKeaveney 4b5d302819 group CRUD 2021-04-19 16:16:46 +01:00
Andrew Kingston 51c8609736 Add caret position function to text area and fix issue with design transitions and custom styles 2021-04-19 15:07:25 +01:00
Andrew Kingston 3a15047007 Update button actions to use new spectrum components 2021-04-19 14:40:51 +01:00
Andrew Kingston 575cb55402 Fix multiple bugs with ID numbering in the event editor 2021-04-19 14:37:04 +01:00
Andrew Kingston bafe7b64bd Update label to use spectrum 2021-04-19 14:36:28 +01:00
Andrew Kingston b0967c98a1 Update drawer bindable input styles 2021-04-19 14:11:46 +01:00
Andrew Kingston 7c52196c61 Update binding icon styles and fix theme editor 2021-04-19 14:10:58 +01:00
Andrew Kingston 90bcd87d24 Update all design panel settings and styles to use new spectrum components 2021-04-19 14:04:07 +01:00
Andrew Kingston eeac45d3e7 Add combobox component 2021-04-19 12:05:11 +01:00
Martin McKeaveney 390b43c122 merge 2021-04-19 11:38:54 +01:00
Martin McKeaveney 34a12831a6 basic group apis 2021-04-19 11:34:07 +01:00
mike12345567 b887fd6b99 Changing user db to be called global db. 2021-04-16 18:09:34 +01:00
mike12345567 aa467e7d63 Formatting. 2021-04-16 17:25:53 +01:00
Andrew Kingston 9663c62d2e Add switch and fix modal titles 2021-04-16 17:12:22 +01:00
mike12345567 3a6cc28df0 Merge branch 'master' of github.com:Budibase/budibase into next 2021-04-16 17:01:35 +01:00
Andrew Kingston ac4e0b6986 Standardise text area updates 2021-04-16 16:11:11 +01:00
Andrew Kingston 2ab62dc935 Replace RichText editor with spectrum text area 2021-04-16 16:00:10 +01:00
Keviin Åberg Kultalahti 0365e86876 implements working TreeView component 2021-04-16 16:41:04 +02:00
Keviin Åberg Kultalahti ff72127875 wip: tree component 2021-04-16 16:17:26 +02:00
mike12345567 d19e350df8 Formatting. 2021-04-16 14:43:20 +01:00
Andrew Kingston 431abb53ce Add radio group spectrum component and update builder 2021-04-16 14:30:33 +01:00
mike12345567 370ffde901 Merge branch 'master' of github.com:Budibase/budibase 2021-04-16 13:47:40 +01:00
mike12345567 9f22ab0a1a Some fixes for creation/editing of table columns. 2021-04-16 13:47:30 +01:00
Andrew Kingston 3354aeff54 Make modals only close on a mousedown outside the modal rather than a click 2021-04-16 13:09:16 +01:00
Andrew Kingston ff9824011a Fix crash when non iterable options property given to picker 2021-04-16 13:08:06 +01:00
Andrew Kingston 359588592e Update some more parts of the builder to use new form components 2021-04-16 13:07:38 +01:00
Keviin Åberg Kultalahti 641b6022de fix navigation error in automation section 2021-04-16 13:02:45 +02:00
Keviin Åberg Kultalahti a6f91704c9 fixes menu item placement issue 2021-04-16 12:42:32 +02:00
Keviin Åberg Kultalahti 98ad7a745a Convert main nav to use an ActionGroup 2021-04-16 12:40:34 +02:00
Andrew Kingston 106b7b9ebd Use BBUI checkbox in standard components 2021-04-16 11:32:41 +01:00
Andrew Kingston b14e993846 Improve select determination of field text 2021-04-16 11:32:24 +01:00
Andrew Kingston 84da746bb7 Improve multiselect determintation of pretty labels 2021-04-16 11:32:05 +01:00
Keviin Åberg Kultalahti d761a4ebfe Adds Icon component to bbui 2021-04-16 12:24:06 +02:00
Keviin Åberg Kultalahti 399bd1497b reverses tab order mistake in properties panel 2021-04-16 12:17:20 +02:00
Andrew Kingston 3627cd38e1 Fix schema in when creating columns and use new spectrum form components in design section 2021-04-16 11:06:21 +01:00
Andrew Kingston 064c2d8551 Add spectrum checkbox component 2021-04-16 11:05:53 +01:00
Andrew Kingston 7af7ff85ad Use new spectrum components to build up Table SelectEditRenderer cell 2021-04-16 11:05:31 +01:00
Andrew Kingston 698bf90007 Extract value and label props from select options which are objects by default 2021-04-16 11:04:50 +01:00
Andrew Kingston ad6fb672f1 Fix table height when no rows exist and fixed row count specified 2021-04-16 11:03:44 +01:00
Keviin Åberg Kultalahti 3ccc0a39ff Automations panel now uses the tabs component 2021-04-16 11:49:08 +02:00
Keviin Åberg Kultalahti ef74a2fe98 Component panel now uses Tabs component 2021-04-16 11:28:53 +02:00
Keviin Åberg Kultalahti 2255fdad64 adds tab to left sidebar on design section 2021-04-16 11:18:39 +02:00
Andrew Kingston c82c298a93 Update create table modal to use new forms 2021-04-16 09:40:44 +01:00
Andrew Kingston f2d3ff7f1b Update list autoscreen to use quiet table 2021-04-16 09:40:27 +01:00
Andrew Kingston ca6da5144e Fix standard component table layout 2021-04-16 09:40:04 +01:00
Andrew Kingston f241f201b9 Fix table borders and background colours to properly reflect spectrum theme 2021-04-16 09:39:49 +01:00
Andrew Kingston 47183460b7 Don't render field label components unless a label exists 2021-04-16 09:39:29 +01:00
Andrew Kingston 57f4ebd897 Fix placeholder text 2021-04-16 09:39:09 +01:00
Keviin Åberg Kultalahti 6696f1007a builder data side panel now uses new tabs component 2021-04-16 10:07:33 +02:00
Andrew Kingston 2e2d1b6738 Add missing modal content dependency 2021-04-16 09:02:16 +01:00
Andrew Kingston 2f619be19c Prune old dependencies 2021-04-16 09:01:52 +01:00
Andrew Kingston 966d842d7c Allow selects to support no placeholder option 2021-04-16 09:01:21 +01:00
Andrew Kingston 7d91794a53 Update lock 2021-04-16 08:10:18 +01:00
Andrew Kingston b823f2bed1 Merge branch 'spectrum-bbui' of github.com:Budibase/budibase into spectrum-bbui-forms 2021-04-16 08:08:52 +01:00
Martin McKeaveney d27609de40 default user 2021-04-15 23:14:10 +01:00
Martin McKeaveney 201b26059c account for empty user id in automations 2021-04-15 21:34:03 +01:00
Andrew Kingston cfa4b118c2 Update some standard components form components to use generic BBUI core components 2021-04-15 19:43:18 +01:00
Andrew Kingston 387651213b Update some builder components to use new forms 2021-04-15 19:42:58 +01:00
Andrew Kingston 3bdb484159 Clean up create app modal error messages 2021-04-15 19:31:04 +01:00
Andrew Kingston 910ac855cf Rewrite create app modal to work with new spectrum fields 2021-04-15 19:28:50 +01:00
Andrew Kingston 591d1c0fc5 Change BBUI to single bundle export and clean up some form components 2021-04-15 19:28:08 +01:00
Martin McKeaveney 508730db6b lint 2021-04-15 18:34:49 +01:00
Martin McKeaveney 4c20427c33 login step configured correctly 2021-04-15 18:29:11 +01:00
Martin McKeaveney 015bb72daf lint 2021-04-15 17:46:47 +01:00
Martin McKeaveney fdfb9dafb2 fix cypress tests, only login if cookie not present 2021-04-15 17:36:58 +01:00
Keviin Åberg Kultalahti afb5e25b1d adds wip progresscircle component 2021-04-15 18:06:22 +02:00
mike12345567 1ab5064ecb Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-15 16:57:35 +01:00
mike12345567 af53ed2109 Fixing some issues with auth module. 2021-04-15 16:57:01 +01:00
Martin McKeaveney b94a964775 uncomment code 2021-04-15 16:50:06 +01:00
Martin McKeaveney 9cebd859f8 merge 2021-04-15 16:49:35 +01:00
mike12345567 9e1315c535 Updating auth lib so that it takes in a pouch instance rather than creating its own. 2021-04-15 16:45:21 +01:00
mike12345567 aacfb6adba Updating worker/server to run in cypress properly. 2021-04-15 16:25:48 +01:00
mike12345567 9af9761753 Some changes to initial login form, improvements based on testing and attempts to fix cypress test failures. 2021-04-15 15:57:55 +01:00
Keviin Åberg Kultalahti d173acf566 remove unused stuff 2021-04-15 15:42:30 +02:00
Keviin Åberg Kultalahti a95240404a adds progressBar 2021-04-15 15:39:14 +02:00
Keviin Åberg Kultalahti e12808e3a2 adds on:select handler to tabs component 2021-04-15 15:39:00 +02:00
Andrew Kingston d779fbbea4 Add pretty labels to multiselect and fix stale props issue 2021-04-15 14:05:59 +01:00
Keviin Åberg Kultalahti 9f0f04c8d3 remove log 2021-04-15 14:48:20 +02:00
Keviin Åberg Kultalahti cec19df28b working sliding animation between tabs 2021-04-15 14:42:39 +02:00
mike12345567 68c113225e Linting. 2021-04-15 13:23:42 +01:00
Andrew Kingston dd7bf3fd68 Fix multiselect 2021-04-15 12:14:51 +01:00
Martin McKeaveney 52920beb78 login command - need to run worker in cypress env 2021-04-15 12:14:50 +01:00
Andrew Kingston c6cc5f95c6 Remove dependency on BBUI stylesheet in builder 2021-04-15 12:09:36 +01:00
Andrew Kingston 9a7cf3079a Fix modal transform causing inner overlays to incorrectly calculate window dimensions 2021-04-15 12:09:06 +01:00
Andrew Kingston 13e5c5ad61 Update StringField and OptionsField to use BBUI components 2021-04-15 11:51:18 +01:00
Andrew Kingston 10fe99346f Improve modal layout, improve modal button spacing, use rollup for building to expose multple BBUI entrypoints 2021-04-15 11:50:56 +01:00
mike12345567 3dfe255eb4 Removing test case that isn't valid anymore. 2021-04-14 17:27:58 +01:00
Martin McKeaveney 6cd43f545a Merge branch 'feature/global-user-management' of https://github.com/Budibase/budibase into feature/global-user-management 2021-04-14 17:02:18 +01:00
Martin McKeaveney 0f6bfb53fc removing initial user creation 2021-04-14 17:02:12 +01:00
mike12345567 c7171d0303 Linting. 2021-04-14 16:44:10 +01:00
mike12345567 6852d3c461 Formatting. 2021-04-14 16:01:28 +01:00
mike12345567 dc20151c19 Some more server-side fixes, updating it so that builders have permissions to do anything for now (means that a builder user doesn't have to be present in app database to work. 2021-04-14 16:00:58 +01:00
mike12345567 56552d02ef Removing server 403. 2021-04-14 15:44:18 +01:00
mike12345567 6c58c90a7a Adding some controls around cookies, expiring them when a 403 is hit. 2021-04-14 15:43:34 +01:00
Keviin Åberg Kultalahti 1e5245589a adds working tabs 2021-04-14 16:07:45 +02:00
mike12345567 a76964d12e Updating environment in auth package, easily see required env settings. 2021-04-14 14:13:48 +01:00
Keviin Åberg Kultalahti 3056d4316a adds divider component 2021-04-14 14:52:25 +02:00
Martin McKeaveney 77c98009b8 joi syntax, adding db user builder key to cookie 2021-04-14 13:22:57 +01:00
Keviin Åberg Kultalahti 697c3d33df adds Typogaphy components 2021-04-14 10:53:23 +02:00
Keviin Åberg Kultalahti df5c2e04a7 adds Heading component 2021-04-14 10:40:44 +02:00
Keviin Åberg Kultalahti 59c88b0064 rework to use tick instead of manual timeout 2021-04-14 10:25:10 +02:00
Keviin Åberg Kultalahti 255512e309 adds focus action to first input field of modals 2021-04-14 10:22:45 +02:00
mike12345567 e8383653c1 Formatting. 2021-04-13 20:26:26 +01:00
mike12345567 c7c158dd84 Fixing up tests, need to mock most of the worker functionality so that worker doesn't need to run during tests. 2021-04-13 20:25:43 +01:00
mike12345567 105e1cc16f Getting most of the test auth working, adding in global builder configuration. 2021-04-13 18:12:35 +01:00
Andrew Kingston 4e2fceffcb Add missing menu, actiongroup and link spectrum dependencies 2021-04-13 18:12:10 +01:00
Andrew Kingston 0acc823af4 Merge branch 'spectrum-bbui' of github.com:Budibase/budibase into spectrum-bbui 2021-04-13 18:08:55 +01:00
Andrew Kingston a85cada9d8 Fix table spectrum colour definitions 2021-04-13 18:08:01 +01:00
Andrew Kingston b467cc1677 Add default spectrum colours to existing builder components and allow spectrum dark mode toggle 2021-04-13 18:07:45 +01:00
mike12345567 f1e37a501c Fixing an issue with save row, changing how pre existing was handled caused an issue. 2021-04-13 17:41:32 +01:00
mike12345567 b9381e04a2 Merge branch 'next' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 17:12:56 +01:00
mike12345567 ad626d3e47 Merge branch 'feature/global-user-management' of github.com:Budibase/budibase into feature/global-user-management 2021-04-13 17:12:09 +01:00
mike12345567 a1227c5819 Removing the lookup of _id in usage quota when in dev/self host for performance reasons as part of usage quota, re-writing some bits of fetch self for cleaner implementation, fixing some issues with updating/saving users from within app. 2021-04-13 17:11:55 +01:00
Michael Shanks a61c54f07e lint fix + remove electron.js 2021-04-13 16:57:22 +01:00
Martin McKeaveney a68227735c ensuring public users can log in after being assigned a roleId 2021-04-13 16:56:45 +01:00
Keviin Åberg Kultalahti 8032d5f85d Merge branch 'spectrum-bbui' into spectrum/actionbutton-actionmenus 2021-04-13 17:05:01 +02:00
Andrew Kingston 9180312bab Fix z-index on table header 2021-04-13 15:31:38 +01:00
Andrew Kingston c602502e46 Add missing toast dependency 2021-04-13 15:28:57 +01:00
mike12345567 56b4b1583c Fixing some issues with the ctx.user, this was previously filled in by the old auth middleware. 2021-04-13 15:27:47 +01:00
Andrew Kingston c729d80902 Merge branch 'spectrum-bbui-table' of github.com:Budibase/budibase into spectrum-bbui 2021-04-13 15:24:34 +01:00
Andrew Kingston b612c32ce5 Fix stale data overwriting new data when requests are slow 2021-04-13 15:10:49 +01:00
Andrew Kingston 0f56ed3c95 Fix scroll state not resetting 2021-04-13 15:10:27 +01:00
Andrew Kingston 6ba2d7a0ef Make standard components table custom column non-sortable 2021-04-13 14:45:24 +01:00
Andrew Kingston 9e8b6c9c41 Fix routify empty span tags affecting dom layout 2021-04-13 14:44:46 +01:00
Andrew Kingston 13b7140571 Support non-sortable columns in table and prevent first row rendering flashing 2021-04-13 14:44:30 +01:00
mike12345567 02c9f69143 Updating current app to set up role in middleware. 2021-04-13 14:35:00 +01:00
Andrew Kingston e166195a49 Allow table dynamic resizing and scrolling whenever rowCount is not specified 2021-04-13 14:14:14 +01:00
Andrew Kingston 1ea51cdb74 Fix client table not passing down rowCount and improve styles of wrapper div 2021-04-13 14:13:44 +01:00
Martin McKeaveney d82516d949 remove buildertoken refs 2021-04-13 14:00:09 +01:00
Martin McKeaveney 509a04d914 logout button 2021-04-13 13:56:28 +01:00
Martin McKeaveney 252c50029f prevent login page flash on initial render 2021-04-13 13:41:12 +01:00
mike12345567 7685d2949e Removing test cases which are no longer valid. 2021-04-13 13:37:54 +01:00