r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity
1726 commits 4 branches 1 tag 27 MiB
Commit graph

1115 commits

Author SHA1 Message Date
Andrew Nicolaou
8adb1347ba Merge branch 'feature/sketch-collections' of https://github.com/andrewn/p5.js-web-editor into feature/sketch-collections 2019-11-25 10:55:30 +01:00
Andrew Nicolaou
1056005eb6 "View" should link to sketch 2019-11-25 10:55:26 +01:00
Cassie Tarakajian
00b788f90b update collection view, update nav list so that 'my collections' doesn't overflow 2019-11-24 14:58:16 -05:00
Cassie Tarakajian
b751353243 collections: add styling changes for dashboard pages 2019-11-14 16:01:33 -05:00
Andrew Nicolaou
13c45490a2 Merge branch 'feature/public-api' into feature/sketch-collections 2019-11-10 22:12:14 +01:00
Andrew Nicolaou
212ad64bae Implement CollectionSearchbar in addition to SketchSearchbar 2019-11-10 21:57:11 +01:00
Andrew Nicolaou
e00cc30476 Fix layout of sketch add 2019-11-10 20:39:20 +01:00
Andrew Nicolaou
ecba54ee55 Remove padding 2019-11-10 20:32:03 +01:00
Andrew Nicolaou
ed1945ab4b Rename collection from collection list view 2019-11-10 20:28:13 +01:00
Andrew Nicolaou
b6e60185f7 Remove addMode code 2019-11-10 19:50:45 +01:00
Andrew Nicolaou
9ac0cc1482 Use bar chart for current size of used assets 2019-11-10 19:42:26 +01:00
Andrew Nicolaou
e3949a7cbd Tidy up Asset styles 2019-11-10 19:39:41 +01:00
Andrew Nicolaou
ff86e45e0a Put border around lists 2019-11-10 19:35:44 +01:00
Andrew Nicolaou
161725cb28 Remove popover and "add to collection" code from SketchList 2019-11-10 17:08:21 +01:00
Andrew Nicolaou
ad13684fe3 New simplified sketch list when adding from Collection view 2019-11-10 17:08:21 +01:00
Cassie Tarakajian
7135f5fabd update spacing on preview nav 2019-11-07 16:56:46 -05:00
Cassie Tarakajian
0d061a9dea merge in master 2019-11-07 15:03:01 -05:00
Andrew Nicolaou
08fd6b826d New simplfied collection list when adding a sketch 2019-11-05 18:23:57 +01:00
Andrew Nicolaou
18af6aed3a Show add/remove/in collection icon in SketchList 2019-11-04 22:04:38 +01:00
Andrew Nicolaou
e738221be6 Style DashboardActions below tabs 2019-11-04 20:30:24 +01:00
Cassie Tarakajian
57ecfb7e1e fixes #1206, removes titles where it is unnecesary 2019-10-31 17:27:23 -04:00
Cassie Tarakajian
821b2ea111 remove link to feedback, since we're not using the google doc at all 2019-10-31 15:25:44 -04:00
Cassie Tarakajian
846d2bb7db Merge branch 'feature/public-api' into feature/sketch-collections 2019-10-31 15:02:31 -04:00
Cassie Tarakajian
28356a9318 remove view column from asset list, add when clicking on asset row, opens asset in new tab 2019-10-31 14:21:43 -04:00
Cassie Tarakajian
3d2a7beeb9 merge master to feature/public-api branch 2019-10-22 17:35:20 -04:00
Stalgia Grigg
e79ab18a0c Add content-type to assets uploaded to s3 2019-10-21 12:54:56 -07:00
Andrew Nicolaou
14a8f48fd5 Fix all linting errors/warnings 2019-10-21 10:35:20 +02:00
Andrew Nicolaou
59469d9f85 Remove unused code 2019-10-21 10:14:55 +02:00
Andrew Nicolaou
935dd12520 Add sketch Searchbar when displaying modal in Collection view 2019-10-21 02:06:06 +02:00
Andrew Nicolaou
5611d32653 Allow extra elements to be injected into Overlay header 2019-10-21 02:05:35 +02:00
Andrew Nicolaou
126bdcab72 Entire SketchList row adds/removes sketch to collection 2019-10-21 01:51:42 +02:00
Andrew Nicolaou
f928665737 Show empty state when no collections 2019-10-21 01:13:33 +02:00
Andrew Nicolaou
7137c7bd73 Increase hit area of dashboard switcher tabs 2019-10-21 00:49:59 +02:00
Andrew Nicolaou
7e5613b2b4 Show if sketch is in collection and allow removal 2019-10-21 00:37:37 +02:00
Andrew Nicolaou
ad09ce15ab Filter collections using Searchbar 2019-10-20 23:30:06 +02:00
Andrew Nicolaou
48c4183b97 Add missing check image 2019-10-20 21:59:24 +02:00
Andrew Nicolaou
af8d25f142 Popover component to add sketches to collection from SketchList 2019-10-20 21:59:16 +02:00
Andrew Nicolaou
edfddcc75f Export unconnected Searchbar for use elsewhere (with sketch search) 2019-10-20 21:58:13 +02:00
Andrew Nicolaou
3554fe9eb4 Show Searchbar clear button only when text is entered 2019-10-20 21:55:00 +02:00
Andrew Nicolaou
66704e3788 Dashboard tabs should match other tabs on the site 2019-10-20 17:38:04 +02:00
Andrew Nicolaou
36f305e2e7 Fix bug where "empty" view is shown when loading 2019-10-20 17:21:28 +02:00
Andrew Nicolaou
45dbb8ec8b Remove sketch from collection view page 2019-10-20 15:50:41 +02:00
Andrew Nicolaou
4c5e62bce8 Remove "Add sketches" link as it have been replaced by primary button 2019-10-20 15:33:02 +02:00
Andrew Nicolaou
a82e079782 Delete collection from list 2019-10-20 15:31:20 +02:00
Andrew Nicolaou
3573253504 Add/Remove sketch to collection by clicking on entire row 2019-10-20 15:02:29 +02:00
Apoorv Taneja
5fa806d33e Password limit (#1191) 
* changes

* changes

* changes

* changes

* changes

* changez
 2019-10-17 12:53:11 -04:00
Cassie Tarakajian
4d9c7d6a1f
Merge pull request #1187 from plxity/add-limit-input 
Added limit in file name
 2019-10-08 17:58:36 -04:00
Cassie Tarakajian
f1bcccb1b2 fixes #1189, fixes nav tests so that the app will actually redeploy 2019-10-08 17:46:11 -04:00
plxity
01e5c1f7bb changes 2019-10-09 02:46:21 +05:30
Cassie Tarakajian
560659e76a
Merge pull request #1183 from processing/bug/add-file 
fixes #1180
 2019-10-08 16:40:37 -04:00
Cassie Tarakajian
9d8be89df7
Revert "Revert "fixes #963: fixes bug in which files/folders would get added to"" 2019-10-08 16:39:47 -04:00
Cassie Tarakajian
53241c9180 fixes #1180 2019-10-08 16:36:38 -04:00
Cassie Tarakajian
6a29bd4ce9
Revert "fixes #963: fixes bug in which files/folders would get added to" 2019-10-07 18:23:58 -04:00
Cassie Tarakajian
3d9507b7ef re #1177: increase autorefresh time period to 1000ms 2019-10-03 16:16:54 -04:00
Cassie Tarakajian
3360c7c799 fixes #963: fixes bug in which files/folders would get added to selected file (or root), rather than the file that you opened the popover from 2019-10-03 15:51:34 -04:00
Andrew Nicolaou
c981bc8b04 Fixes collection metadata spacing when user is not the owner 2019-10-03 19:39:23 +03:00
Andrew Nicolaou
cf9a6013a4 Share and Add Sketch button copy 2019-10-03 19:39:23 +03:00
Andrew Nicolaou
bcebc070a6 Collection Add Sketch and Share buttons 2019-10-03 07:41:57 +03:00
Cassie Tarakajian
c925da8c17 re #1067, remove lingering commented-out code 2019-10-02 16:48:33 -04:00
Cassie Tarakajian
81a76a1529 re #1067, when a line or lines are highlighted, tab will indent them 2019-10-02 16:40:52 -04:00
Andrew Nicolaou
fc02f49d93 Fix layout of Searchbar in IDEView 2019-10-02 18:17:52 +03:00
Andrew Nicolaou
38f13c2047 Remove modals from IDEView now that they are part of DashboardView 2019-10-02 18:17:32 +03:00
Andrew Nicolaou
ec32eb1262 Collection Create is a modal 2019-10-02 18:01:52 +03:00
Andrew Nicolaou
c84f590290 Fix eslint errors 2019-10-02 17:37:08 +03:00
Cassie Tarakajian
ad93782496 fixes #1170 2019-10-01 16:32:07 -04:00
Cassie Tarakajian
02f4cb23b4 fixes #1162, fixes #1118 2019-09-26 16:17:22 -04:00
Cassie Tarakajian
067e065c1b update nav on collection view 2019-09-25 13:20:49 -04:00
Cassie Tarakajian
e2f8fe7e81 fix merge conflicts 2019-09-25 12:14:52 -04:00
Andrew Nicolaou
0f3ce8e3a2 Collection metadata area layout improvements 2019-09-25 12:10:47 -04:00
Andrew Nicolaou
f5356007d3 Enable collection and sketch to be created from dashboard page 2019-09-25 12:10:47 -04:00
Andrew Nicolaou
27804acd6a Add sketch to collection from collection view 2019-09-25 12:09:31 -04:00
Andrew Nicolaou
7f78fda073 Fix sketch list padding in collection view 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
7a1fa663af Edit sketch name/description 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
60ec67804b Remove logging 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
2a0a5601ee Display icon-based add/remove button in Collection List 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
0086601af1 Sets Collection List modal in addMode to fixed width 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
679304d0ab Do not empty table when fetching new data 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
a385b470b2 Padding for table cells to align with header 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
c288481476 Shorten date displayed in Collection List items for better layout 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
20a5ac5ec3 Show toast message when creating collection or adding/removing sketches 2019-09-25 12:07:17 -04:00
Andrew Nicolaou
f98919e69b Logged in user can use "Add to collection" menu item 2019-09-25 12:07:17 -04:00
Andrew Nicolaou
959ff3ef20 Splits CollectionList into smaller files 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
8781036ac7 WIP Display collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
521e117d95 EditableInput component 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
c57ead4c62 Create Collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
6ca6e78a28 Displays existing collection 
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
af955b1602 Adds collections Nav item behind a feature flag 2019-09-25 12:04:37 -04:00
Cassie Tarakajian
5c54983c24 add searchbar to sketches dashboard view, adjust sketch list and asset list styling to have sticky header 2019-09-24 17:52:45 -04:00
Cassie Tarakajian
5900e62904 unify navigation for authentication pages, add authorization to front end, fixes #650 2019-09-19 13:38:27 -04:00
Andrew Nicolaou
52e98723f5 Collection metadata area layout improvements 2019-09-18 09:10:10 +02:00
Andrew Nicolaou
a93ac48587 Enable collection and sketch to be created from dashboard page 2019-09-17 21:32:54 +02:00
Andrew Nicolaou
b980ec7854 Add sketch to collection from collection view 2019-09-17 20:48:37 +02:00
Andrew Nicolaou
709aa8eccb Fix sketch list padding in collection view 2019-09-16 23:13:20 +02:00
Andrew Nicolaou
8b058d8e56 Edit sketch name/description 2019-09-16 23:05:24 +02:00
Andrew Nicolaou
d2ec6864fb Remove logging 2019-09-16 21:57:32 +02:00
Andrew Nicolaou
5011c1f002 Display icon-based add/remove button in Collection List 2019-09-16 21:50:44 +02:00
Cassie Tarakajian
7f2529a973 merge master 2019-09-11 19:05:15 -04:00
Cassie Tarakajian
f09e743e92
Merge pull request #1143 from andrewn/feature/standalone-sketches 
Standalone sketches and asset page (fixes #1142)
 2019-09-11 16:52:39 -04:00
Cassie Tarakajian
3a65afb6da change link to editor back to 'back to editor' 2019-09-11 16:46:56 -04:00
Andrew Nicolaou
5575c6344a Sets Collection List modal in addMode to fixed width 2019-09-11 21:13:51 +02:00
Andrew Nicolaou
a0384f166a Do not empty table when fetching new data 2019-09-11 21:13:34 +02:00
Andrew Nicolaou
41636642c9 Style Dashboard tabs to match visual style of other tabs in app 2019-09-11 20:11:46 +02:00
Andrew Nicolaou
125051ccb1 Use Nav with user menu in "dashboard" layout 2019-09-11 20:11:46 +02:00
Andrew Nicolaou
cf3c13266d Padding for table cells to align with header 2019-09-11 20:06:24 +02:00
Andrew Nicolaou
fef4bd8d71 Shorten date displayed in Collection List items for better layout 2019-09-11 20:06:08 +02:00
Andrew Nicolaou
611730c289 Refactor Nav 2019-09-11 19:06:30 +02:00
Cassie Tarakajian
8d0e59efc2
Merge pull request #1151 from davidbmx/master 
Add matches search into code mirror fixes #936
 2019-09-10 16:45:54 -04:00
davidbmx
6030b355ff Remove num results when don't match find 2019-09-10 12:38:12 -05:00
davidbmx
22f958e50a Add matches search into code mirror 2019-09-10 12:00:27 -05:00
Andrew Nicolaou
c575559272 Show toast message when creating collection or adding/removing sketches 2019-09-09 18:53:54 +02:00
Andrew Nicolaou
55e6b3162d Logged in user can use "Add to collection" menu item 2019-09-09 18:53:21 +02:00
Andrew Nicolaou
3dbaa900a4 Splits CollectionList into smaller files 2019-09-09 18:52:14 +02:00
Andrew Nicolaou
b258d7c5ca Fix routing bug displaying Sketch list tab 2019-09-08 19:25:45 +02:00
Andrew Nicolaou
2df3670dc4 WIP Display collection 2019-09-08 19:24:02 +02:00
Andrew Nicolaou
1c97152533 EditableInput component 2019-09-08 18:57:57 +02:00
Andrew Nicolaou
dcf65c6f46 Create Collection 2019-09-08 18:06:16 +02:00
Andrew Nicolaou
d02a413bf3 Displays existing collection 
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
 2019-09-08 17:24:46 +02:00
Andrew Nicolaou
8ac95c0084 SketchList and AssetList set page title 2019-09-08 17:10:48 +02:00
Andrew Nicolaou
9c36f2b2e2 Adds collections Nav item behind a feature flag 2019-09-08 16:45:59 +02:00
Andrew Nicolaou
0ae7a9eebb Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-09-08 16:45:59 +02:00
Andrew Nicolaou
7ea4ae5637 Fix linting errors and warnings 2019-09-08 16:43:16 +02:00
Cassie Tarakajian
a155e7638d
re #1153: fix bug in which login form was in invalid state if user had entered username or password incorrectly on the first try (#1155) 2019-09-06 13:30:06 -04:00
Rick Brown
c75e11b631 Add toast to notify when creating new file. Fixes #1140 (#1147) 
* Add toast to notify when creating new file

* Add toast for opposite conditional #1147

* Replaced New file created with New sketch created

* re #1140, change copy to 'opened new sketch' to make it clear that the new sketch isn't saved
 2019-09-05 14:56:18 -04:00
David
876f0b30fc Add matches search into code mirror 2019-09-02 08:02:49 -05:00
Andrew Nicolaou
162d5276f1 Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-08-30 16:15:13 -04:00
Rick Brown
5695830361 add ability to toggle line numbers to accessibility settings. Fixes #1138 (#1146) 
* Added SET_LINE_NUMBERS constant

* Added setLineNumbers()

* Added lineNumber prop

* Added functionality to Preferences

* Passing props

* handle case SET_LINE_NUMBERS

* add lineNumber default value to the schema
 2019-08-30 12:36:34 -04:00
Cassie Tarakajian
8054a532d7
Update to webpack 4 (#1145) 
* remove some of the react errors, start to fix webpack HMR errors

* start upgrade to webpack 4

* more stuff to update webpack

* update webpack configs to work with webpack 4

* remove linting from truncate script
 2019-08-28 16:08:40 -04:00
Jon Paul Gualdarrama
68c1e48c99 Fix Issue #588. Only highlight runtime errors at the appropriate line… (#1136) 
* Fix Issue #588. Only highlight runtime errors at the appropriate line for file in which the error occurred.

* Modifications to handle js in html <script> tag Part 1

* Correctly highlight errors in JavaScript in a <script> tag
 2019-08-27 13:02:07 -04:00
Andrew Nicolaou
b1bfb91f80 Serve assets from /:username/assets, redirecting old path 2019-08-24 13:38:01 +02:00
Andrew Nicolaou
a0a13ab7fc Flexible table width 2019-08-24 13:38:01 +02:00
Andrew Nicolaou
0193ee8297 Standalone sketch list and asset page 2019-08-24 13:37:55 +02:00
Andrew Nicolaou
1b461d33cf Do not set prevPath if navigation passes through skipSavingPath flag 2019-08-24 13:31:15 +02:00
Apoorv Taneja
aa318e0d2d fixed (#1141) 2019-08-22 16:47:22 -04:00
raclim
3d779734c3 Searchbar (#1132) 
* search bar function

* Fixes #231, adds searchbar to sketchlist

* Fixes #231, update requested changes to searchbar

* Fixes #231, reset search term after modal closed
 2019-08-21 14:08:08 -04:00
BMK
973bf7e98d 1133 - hides scrollbar when not needed (#1134) 
* 1133 - hides scrollbar when not needed

* 1133 adds overflow-y:auto to asset-table-container
 2019-08-21 11:28:38 -04:00
Apoorv Taneja
07a225c161 Fixed input field (#1130) 
* fixed

* fixed

* fixed
 2019-08-13 12:27:31 -04:00
Cassie Tarakajian
25151e76ee re: #524, slugify example titles so that they can have a permanent link 2019-08-09 13:07:56 -04:00
Cassie Tarakajian
8dada77ce5
fixes #1121, updates p5.js default to 0.9.0 (#1125) 2019-07-29 12:58:00 -04:00
Cassie Tarakajian
d64498ef1f
RE #168, Feature/asset totalsize limit (#1123) 
* re #168, add totalsize to response from API, add loader to asset list, add totalsize to asset list ui

* re #168, add totalsize to response from API, add loader to asset list, add totalsize to asset list ui

* update asset list copy to remove limit, since that's not implemented yet
 2019-07-24 12:55:58 -04:00
Apoorv Taneja
4c1ebdf83d Email Validation added (#1120) 
* changes

* changes

* changes

* changes

* changes
 2019-07-23 14:16:05 -04:00
Cassie Tarakajian
443232380c fix errors from rebase, again 2019-07-22 17:52:19 -04:00
Shan Rauf
116675f866 Fix hover effect on Log in and Sign up nav items (#1085) 
* Fix hover effect on Log in and Sign up nav items

* Fix Login and Signup unequal spacing

* Fix HTML syntax and right nav__item-header hover
 2019-07-22 17:34:26 -04:00
siddhant
a851eda254 Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-07-22 17:34:26 -04:00
Vertmo
a10e0f0327 You can now generate keys from the advanced settings interface 2019-07-22 17:33:26 -04:00
Laksh Singla
bfef3e93dc Update sketch list styling (#819) 
* parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540243 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540198 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560539667 -0400

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Dropdown menu disappearing while clicking anywhere on the table

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Made changes in the dropdown: Arrow positioned slightly updwards, Removed blank space and added box-shadow in dropdown, themifyed dropdowns dashed border color

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

Added download functionality to Dialog box

SketchList does not open a sketch if dialogue box is opened

SketchList Rename initial UI completed

Enter key handled for rename project option

[WIP] Updating rename functionality

Download option now working for all the sketches

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Final styling of ActionDialogueBox commplete

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Added Delete and Share functionality to Dialog box

[WIP] Updating rename functionality

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Final styling of ActionDialogueBox commplete

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

* fix bugs in merge commit

* move sketch list dialogue to ul/li

* update sketch option dropdown to use dropdown placeholder, remove unused css

* major refactor of sketchlist component, fix showShareModal action, minor updates ot icon sizing

* fix broken links on asset list

* remove unused image, fix options for different users in sketch list
 2019-07-22 17:32:55 -04:00
Cassie Tarakajian
ab7ecfc012 fix lingering errors from rebase 2019-07-22 17:22:36 -04:00
Shan Rauf
4e0ee89380 Fix hover effect on Log in and Sign up nav items (#1085) 
* Fix hover effect on Log in and Sign up nav items

* Fix Login and Signup unequal spacing

* Fix HTML syntax and right nav__item-header hover
 2019-07-22 16:16:17 -04:00
siddhant
d7837a62be Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-07-22 16:16:17 -04:00
Andrew Nicolaou
f937e72131 Makes form CSS theme-aware 2019-07-22 16:16:17 -04:00
Andrew Nicolaou
e77cbf4fa3 Changes API_KEY_REMOVED action constant to match API_KEY_CREATED 2019-07-22 16:14:51 -04:00