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

653 commits

Author SHA1 Message Date
Cassie Tarakajian
1f86eb6711 Merge branch 'master' into zrispo-feature-code-folding 2017-10-11 15:55:55 -04:00
Cassie Tarakajian
48cbd79ca8 fixes #443 2017-10-11 12:56:44 -04:00
Cassie Tarakajian
9253d7e1ec fix reversed keyboard shortcuts on nav, fix wording on keyboard shortcut modal 2017-09-15 12:14:01 -04:00
Cassie Tarakajian
a92f4f5b3c refactor stop and stop sketch actions, add start and stop sketch to nav 2017-09-14 17:57:09 -04:00
Cassie Tarakajian
34cf86326b add find next and find previous commands to nav 2017-09-14 16:58:59 -04:00
Cassie Tarakajian
7f206122a2 add keyboard shortcuts to nav items 2017-09-14 14:52:41 -04:00
Cassie Tarakajian
251ab99ac7 move items from editor dropdown to nav 2017-09-14 14:52:41 -04:00
Cassie Tarakajian
1a4193f574 remove logo from toolbar 2017-09-14 14:52:41 -04:00
Cassie Tarakajian
087f319a8a make nav keyboard accessible 2017-09-14 14:52:40 -04:00
Cassie Tarakajian
9eede0f728 fix #429 2017-09-14 14:51:36 -04:00
Cassie Tarakajian
4ea9f96d3f fix #430 2017-09-14 14:32:43 -04:00
Mathura MG
d29e7ae453 Accessibility (#436) 
* add p5 interceptor submodule

* update package

* remoce interceptor

* update interceptor;

* merge scripts

* change postinstall script

* refactor interceptor files

* remove merge conflicts

* change source files

* add registry class

* provide seperate outputs for text and grid

* switch textOutput to boolean

* make both modules usable together

* update interceptor for safari

* fix grid label

* add sound output as well

* change file strucure

* change constants

* change input lables

* switch submodule branch

* change variable name

* change grid to table

* remove role from table elements

* switch submodule branch

* change aria albels

* revert submodule branch to master
 2017-09-06 17:55:09 +02:00
Zach Rispoli
1897ccdef2 Change setting so that decomment library preserves spaces (#411) 
* Change setting so that decomment preserves spaces

* Fix trailing spaces
 2017-08-03 23:27:01 +02:00
Zach Rispoli
bca73885b2 Fix broken accessibility feature 2017-08-01 15:53:27 -04:00
Zach Rispoli
682dd7e2fc Runtime error line highlight dissappears on lint message update 2017-08-01 15:53:27 -04:00
Zach Rispoli
b5f9879c44 Hacky runtime error highlight working 2017-08-01 15:52:56 -04:00
Zach Rispoli
1bb0efdac8 Line error highlight styling 2017-08-01 15:52:56 -04:00
Cassie Tarakajian
e111d3c020 fix line number for runtime errors 2017-08-01 15:03:48 -04:00
Cassie Tarakajian
273fc08b19 Merge branch 'feature-code-folding' of https://github.com/zrispo/p5.js-web-editor into zrispo-feature-code-folding 2017-08-01 13:48:49 -04:00
Cassie Tarakajian
983248ccb7 fixes #402 2017-07-24 11:12:11 -04:00
Zach Rispoli
683b718303 Fix CSS loader + Improve visual for code folding 2017-07-18 15:57:40 -04:00
Cassie Tarakajian
b384fdc6ba remove console errors and extraneous console logs 2017-07-17 17:34:11 -04:00
Zach Rispoli
87de91016b Code folding (#382) 2017-07-17 16:07:59 -04:00
Cassie Tarakajian
e140702784 Create Asset List View and refactor overlay code (#356) 
* start to create asset list

* begin refactoring overlay component to remove duplicate code

* refactoring of overlays, asset list styles

* changes to add size to asset list

* fixes to asset list

* handle case in which a user hasn't uploaded any assets

* fix bug in which asset list only grabbed first asset

* remove console.log

* update overlay exit styling to use icon mixin
 2017-07-11 17:37:43 +02:00
Cassie Tarakajian
1359a72f2d fix #372 2017-06-26 15:39:21 -04:00
Andrew Nicolaou
2e62c6b288 Find (#359) 
* Styles CodeMirror Search box

* Switch to fork of search add-on

* Styles search box using custom markup

* Prev/Next search behaviour, highlighting current result

* Hide search modifiers until implemented

* Regexp search

* Style RegExp modifier button active state

* Styles search modifiers

* Wires up Case Sensitive search button

* Allows case insenstive regexp search

* Do not show underlying regexp query string when re-opening dialog

* Adds "Whole word" search

* Adds title and aria-label for tooltip and screenreaders

* Whole Word button shows correct active/inactive state

* Disables replace implementation which doesn't work

* Tidies up query parsing so it's less of a hack

- uses state to convert query text into a regexp
- avoids having to fake regexp using "/.../" syntax
- parsing is now in one place

* Uses shared metaKey function for Cmd/Ctrl key

* Adds find function to keyboard shortcuts modals

* Sets aria-checked to true/false to indicate button state

* Sets role=checkbox on checkbox-like buttons
 2017-06-06 15:20:21 -04:00
Zach Rispoli
3f32ccc89c Remove comments before using loopProtect on scripts (fixes #218) (#364) 2017-06-05 22:46:19 -04:00
Andrew Nicolaou
313fc856d1 Fixes linting errors (#362) 2017-06-05 22:33:32 -04:00
Mathura MG
82207a50d3 Accessibility (#361) 
* add p5 interceptor submodule

* update package

* remoce interceptor

* update interceptor;

* merge scripts

* change postinstall script

* refactor interceptor files

* remove merge conflicts

* change source files

* add registry class

* provide seperate outputs for text and grid

* switch textOutput to boolean

* make both modules usable together

* update interceptor for safari

* fix grid label

* add sound output as well

* change file strucure

* change constants

* change input lables

* switch submodule branch

* change variable name

* change grid to table

* remove role from table elements

* switch submodule branch
 2017-05-31 15:23:30 -04:00
Cassie Tarakajian
341ea63437 forgot to commit a file for fix to #347 2017-05-10 13:23:10 -04:00
Andrew Nicolaou
ae668f681e HTTPS UI switch (#335) 
* Checkbox to toggle project's serveSecure flag

This doesn't yet persist or reload the page.

* Help button that shows modal to explain feature

* Extracts protocol redirection to helper

* Returns promise from saveProject() action to allow chaining

* Setting serveSecure flag on project redirects after saving project

* Set serveSecure on Project model in API and client

* Redirect to correct protocol when project is loaded
 2017-05-03 11:46:12 -04:00
Cassie Tarakajian
32d3f7a76c allow file names to change case of file extension 2017-04-27 13:08:20 -04:00
Cassie Tarakajian
2a9ea85ed8 #339 add region to .env 2017-04-13 14:39:03 -04:00
Cassie Tarakajian
94694c5a72 start to fix editing permissions for the sidebar 2017-04-13 13:41:03 -04:00
Cassie Tarakajian
99152f6e37 handle case for #169 where project does not yet have an owner 2017-04-06 16:22:34 -04:00
Cassie Tarakajian
aaa5e868e2 make inital changes for #169--need to migrate the locations of a user's s3 files to be namespaced under their userid 2017-04-06 14:34:14 -04:00
JunShern
8e82fe96c3 Set Ctrl+Enter shortcuts to null, don't generate newlines (#333) 2017-04-05 21:50:44 -04:00
Mathura MG
8e688a6103 Fix focus switch to accessible text output (#318) 
* Change accessibility example links

* ensure we focus on text output
 2017-03-06 15:58:36 -05:00
Cassie Tarakajian
134cc76981 fix #317 2017-03-06 14:13:39 -05:00
Cassie Tarakajian
fe4c2641e3 fix #254, stale project warning works correctly, removed unused actions and state for ide 2017-03-02 14:38:29 -05:00
Mathura MG
5982203b28 Change label from grid to table (#315) 
* Change accessibility example links

* change grid label
 2017-03-01 17:12:20 -05:00
Cassie Tarakajian
e87390adb9 update eslint to latest version, fix lots of linting errors (#308) 
* update eslint and dependencies, fix linting errors that can be fixed with --fix

* fix lots of linting errors

* update eslintrc, fix some linting errors

* fix all server side linting errors, untested

* fix errors that fixing linting errors had caused

* fix client side eslint errors

* fix client side linting errors

* fix refs lint errors

* fix more linting errors

* update eslint and dependencies, fix linting errors that can be fixed with --fix

* fix lots of linting errors

* update eslintrc, fix some linting errors

* fix all server side linting errors, untested

* fix errors that fixing linting errors had caused

* fix client side eslint errors

* fix client side linting errors

* fix refs lint errors

* fix more linting errors

* fix some accessibility linting errors

* fix a lot of linting errors

* fix a billion more linting errors

* hopefully fix all linting errors, still need to test

* fix bugs that fixing linting had caused
 2017-02-22 14:29:35 -05:00
Cassie Tarakajian
f60f2310dc #292 stop propagation to row click event when clicking on trashcan 2017-02-17 17:35:29 -05:00
Cassie Tarakajian
f06ac10f9a #292, when clicking on row in sketch list, navigate to sketch 2017-02-17 17:29:36 -05:00
Cassie Tarakajian
93e0ec2a73 fix #284, when autorefresh is enabled, clear the console as well 2017-02-17 16:04:47 -05:00
Cassie Tarakajian
7b602671b9 fix #291 2017-02-17 15:47:54 -05:00
Cassie Tarakajian
89972bf2ae fix #301, remove sublime text shortcuts that are the same as the shortcuts for run and stop 2017-02-17 13:30:33 -05:00
Mathura MG
e354fc0cea Refactor interceptor code (#240) 
* add p5 interceptor submodule

* update package

* remoce interceptor

* update interceptor;

* merge scripts

* change postinstall script

* refactor interceptor files

* remove merge conflicts

* change source files

* add registry class
 2017-02-15 16:17:57 -05:00
Cassie Tarakajian
52a28328e4 fix #302 2017-02-14 15:54:29 -05:00
Cassie Tarakajian
36a715fc3a fix #287 2017-02-01 22:00:19 -05:00
Cassie Tarakajian
ad62d20544 fix #284 2017-01-31 16:45:47 -05:00
Cassie Tarakajian
09a4829bef remove lint error for == and != 2017-01-29 13:29:17 -05:00
Cassie Tarakajian
a9ee70e033 #254 show error when user attempts to save stale version of project, refactor error modals to one component 2017-01-24 15:29:25 -05:00
Cassie Tarakajian
65592cbf9e add authentcation error component, return 403 error from server when trying to save a project where the user doesn't match the owner 2017-01-17 15:37:19 -05:00
Cassie Tarakajian
286a5dd6c6 fixes #5, turns autosave off when a user logs off, hide timer component when user is not owner of sketch 2017-01-13 11:55:13 -05:00
Cassie Tarakajian
8120fdd7db refactor console to its own reducer and actions, add clear button, clean up console component 2017-01-11 14:13:49 -05:00
Cassie Tarakajian
d1c1279061 start to break out console into its own reducer 2017-01-09 18:09:23 -05:00
Cassie Tarakajian
1e670e9f9a fix #244, make console open by default and remove console icon 2017-01-09 16:31:39 -05:00
Cassie Tarakajian
54534f68d3 #255 remove unused SidebarItem component, display file dropdown menu when right clicking on sidebar item or project folder 2017-01-09 16:11:01 -05:00
Akarshit Wal
843418e195 toggling menu (#258) 
* toggling menu

* Other components should be treated equally
 2017-01-09 12:47:32 -05:00
Yining Shi
62b4d4cc6e New Design for About (#246) 
* new design for about

* clean code

* reuse play.svg
 2017-01-06 13:14:39 -05:00
Cassie Tarakajian
3fc4ee897d remove no sketches warning from sketch list 2017-01-06 13:09:32 -05:00
Enrique Piqueras
5e4b076b93 Fixed #158 and #100 (#198) 
* Changed unsaved changes asterisk to an svg circle. #158

* Fixed #100
Unmatched routes are handled by react-router on the client side
and a single wildcard route on server.routes.js renders the index
html.
When the /:username/sketches route is matched and the username is not
valid, the user will be redirected to the index route and a toast
will explain what happened. When the username is 'p5' (default when
logged out) it will show all sketches. Maybe this should be changed
to just public or 'local' sketches?

* Moved unsaved changes SVG to a separate file.

* User not found is now a 404 error.

* Added server rendered 404 page.

* Removed console.log

* 404 Page now renders a random p5 sketch. TODO: make 404 sketches.

* Added 404 header
404 page now fetches a random example sketch

* Moved circle closer to file name

* Render 404 page in SketchList route if !user
 2017-01-06 13:08:03 -05:00
Cassie Tarakajian
3ba03d709a fixes #241 2017-01-05 14:40:04 -05:00
Lauren McCarthy
28323ffc09 formatting of dropdown login and editor menus (#239) 
* removing avenir font, using montserrat instead due to licensing issues

* removing old import statement for typeography scss file

* dropdown formatting closes #210
 2016-12-20 00:21:04 -05:00
Lauren McCarthy
5de2a6761f Prefs (#238) 
* removing avenir font, using montserrat instead due to licensing issues

* removing old import statement for typeography scss file

* formating prefs pane

* updating capitalization
 2016-12-19 23:48:36 -05:00
Cassie Tarakajian
1186bebd94 minor css fix in sketch list 2016-12-19 17:49:35 -05:00
Lauren McCarthy
a5d304da2b implement sidebar design #234 (#235) 
* removing avenir, replacing with montserrat

* sidebar tweaks

* sidebar positioning

* resolving merge conflict

* working on sidebar

* removing avenir font, using montserrat instead due to licensing issues

* removing old import statement for typeography scss file

* design formatting for sidebar closes #234
 2016-12-19 17:07:04 -05:00
Yining Shi
0f17633f79 New design for ResetPassword view and NewPassword view (#232) 
* newdesign for resetpassword view and newpassword view

* bought password token back

* added params.reset_password_token

* no themify
 2016-12-19 16:49:37 -05:00
Yining Shi
acad9538cc Taking login and sign pages out + new design for login and signup page (#228) 
* make login a seperate page

* make signup a another page

* get previousPath

* setPreviousPath between routes

* new desig for login pagen

* new design for signup page

* added login and exit icons

* added signup and exit icons

* refactor form-container.scss

* deleted extra code
 2016-12-15 18:43:58 -05:00
Cassie Tarakajian
67dad2b86d fix p5 specific syntax highlighting 2016-12-14 18:07:13 -05:00
Lauren McCarthy
67c53f5781 implement new design for sketchbook (#227) 
* removing avenir font, using montserrat instead due to licensing issues

* updating headings for sketchlist

* removing old import statement for typeography scss file

* implementing new design for sketchbook closes #207

* removing seconds from sketchlist view

* remove outline from active icon
 2016-12-14 10:58:43 -05:00
Cassie Tarakajian
f3247bd0ef #21 edit jshint options to be more lax for semicolons 2016-12-13 16:59:47 -05:00
Cassie Tarakajian
896d0cd715 testing of #214, fix bug where errors not in sketch.js wouldn't appear in the console 2016-12-13 15:37:11 -05:00
Cassie Tarakajian
637a62be01 fix sidebar bugs 2016-12-09 17:05:24 -05:00
Cassie Tarakajian
85bc40013c fix bug where new files aren't editable 2016-12-09 16:27:10 -05:00
Cassie Tarakajian
339b7d75db #214 add data-tag to local script elements, untested 2016-12-09 16:21:43 -05:00
Cassie Tarakajian
51336baee6 fix small bug from undo update from error to sliently failing 2016-12-07 17:15:10 -05:00
Cassie Tarakajian
604a7ec7e8 fix rendering bugs in firefox 2016-12-07 16:12:06 -05:00
Cassie Tarakajian
bdefab53b6 #211 highlight p5 keywords in code editor 2016-12-07 14:42:05 -05:00
Cassie Tarakajian
49bdd9377f fixes #49 2016-12-06 21:33:12 -05:00
Jen Kagan
55b54f09bd Change routes to /:username/sketches/:projectid (#216) 2016-12-01 17:12:34 -05:00
Cassie Tarakajian
5dd0220610 fix baseURL for preview frame 2016-11-30 12:38:53 -05:00
Cassie Tarakajian
fd26b3f77c add otf and ttf to media file list for preview generation 2016-11-30 11:51:54 -05:00
Cassie Tarakajian
8cf313f6f9 fix #204, making sure focus/form is reset properly 2016-11-29 19:18:11 -05:00
Cassie Tarakajian
0a459246ac FINALLY fix #52, this will not work with redirecting to https when authenticating but we will cross that bridge when we get there 2016-11-29 15:51:16 -05:00
Mathura MG
bd88e86ecc Move the interceptor code to a git module (#200) 
* add p5 interceptor submodule

* update package

* remoce interceptor

* update interceptor;

* merge scripts

* change postinstall script
 2016-11-23 13:35:12 -05:00
Cassie Tarakajian
04922522cc cool to share some of this code between client and server 
Squashed commit of the following:

commit fb5e82cea930b011792983c7d1cc9f6ecacc7dd4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 16 12:28:10 2016 -0500

    add server side rendering, untested

commit 5c60fb30c46ea49a8d9a0ecb56f39ec778464a8b
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 18:26:06 2016 -0500

    add redux-form bandage post react update, should probably update to redux-form 6 at some point

commit 057b5871e7137179abc93f7821a9690f0ea52c92
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:30:09 2016 -0500

    remove passing jsFiles and cssFiles to PreviewFrame, fix rendering bug

commit 88c56fd36d3a8d88902c79642171988ce37825f2
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 16:21:59 2016 -0500

    code cleanup, untested

commit 82e5dcf8bca461892f1daf06d38f1eaebe72983f
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 15:53:50 2016 -0500

    update react and react router, fix a few bugs in rendering code, add ability to parse inline js and css

commit e02f4b67803ea45328eff4e53659222f3149964c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Tue Nov 15 14:43:38 2016 -0500

    add almost full code to create preview html correctly, untested

commit 12f61b2a1aed4607fab24d01572b647ca6210262
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 17:09:26 2016 -0400

    refactor some of the preview html generation code

commit 111825846703d5c8959cb18795a3aadb7ebe505c
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Nov 2 11:06:36 2016 -0400

    add comments as plan of action

commit 1cc2cf5203674732b4057382f1937de38b687078
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 19:34:55 2016 -0400

    add href parsing

commit e67189298cda9b70645f454ecd541a363980f0e4
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Thu Oct 27 10:48:36 2016 -0400

    continue parsing html

commit 1458fb940a15a3dc5d74890211a3073e920b84b8
Author: Cassie Tarakajian <ctarakajian@gmail.com>
Date:   Wed Oct 26 17:40:31 2016 -0400

    start to add html parsing
 2016-11-16 13:12:36 -05:00
Mathura MG
ced885d03f Add multiple canvas text outputs (#197) 
* added grid

* add table to textoutput

* add all three outputs

* add shortcuts

* fix sound bug for triangle

* fix triangle bug - again
 2016-11-12 11:53:02 -05:00
Cassie Tarakajian
ddc4fb32b1 injects S3 CSS/JS files properly into preview, as found in #196 2016-11-11 17:36:19 -05:00
Cassie Tarakajian
66b83df0f2 fix #180, relates to #185 in that the user is redirected to where they were post signup/login 2016-11-10 16:13:00 -05:00
Cassie Tarakajian
c959aec6a9 add commit to hopefully prevent #195 from happening again 2016-11-10 12:26:35 -05:00
Mathura MG
b3ac90a4c6 Change text output content (#194) 
* make output less verbose

* fix bug in setup

* remove log; fix area

* fix type casting
 2016-11-09 13:16:14 -05:00
Yining Shi
e86e9a0ae0 Added a star icon for unsaved file name, added 'Saved: xx time ago' (#177) 
* added a star icon for unsaved file name, added saved time ago

* changed text

* added timer component

* clean extra styling in _editor.sass

* customize momentjs fromnow function

* clear 10s interval in componentWillUnmount

* use space-between instead of float
 2016-11-09 12:52:14 -05:00
Cassie Tarakajian
fc83040c8f remove some dead code/files, change react components to .jsx files because of sublime syntax highlighting, fix linting errors 2016-11-08 18:54:54 -05:00
Cassie Tarakajian
77e2f5bfff fix #186 2016-11-08 13:30:41 -05:00
Cassie Tarakajian
c7483b5d3a fix #190, also fix bug in which fontSize and indentation amount could be NaN 2016-11-08 13:11:07 -05:00
Mathura MG
d082ada1fd Add keyboard shortcut for text based output (#193) 
* add shortcuts

* add keyboard shortcut for text based output

* remove duplicate
 2016-11-08 12:39:46 -05:00
Cassie Tarakajian
41c1613d10 fix #191 2016-11-04 18:54:14 -04:00
Cassie Tarakajian
dd01aeb599 fix #188 2016-11-04 17:31:04 -04:00
Cassie Tarakajian
7ededa5c18 #143 revert not printing to console if it is not expanded 2016-11-02 22:41:10 -04:00
Cassie Tarakajian
d33b6a354f #143 handle undefined console messages 2016-11-02 19:26:13 -04:00
Cassie Tarakajian
3a8e67d484 fixes #178 2016-11-02 17:28:06 -04:00
Cassie Tarakajian
a06369ab06 add font uploads 2016-11-02 11:42:59 -04:00
Cassie Tarakajian
1e32e42729 change max file upload size to 5MB 2016-10-28 16:19:56 -04:00
Jen Kagan
476a4a4d20 Add pen icon next to sketch name (#171) 
* add pencil icon, start wiring toolbar

* Closes #156
 2016-10-26 17:40:10 -04:00
Cassie Tarakajian
b48cf1ebdc parse CSS files for links to S3 2016-10-25 18:38:20 -04:00
Cassie Tarakajian
61925b67e4 show error messages for invalid files 2016-10-24 21:15:32 -04:00
Cassie Tarakajian
7cba11f90c add video upload support 2016-10-24 18:25:57 -04:00
Cassie Tarakajian
5c050e078b add uploader support for obj files 2016-10-24 18:01:14 -04:00
Cassie Tarakajian
aae72ea57d add ability to use svgs 2016-10-24 17:40:03 -04:00
Cassie Tarakajian
99df998e11 add csv, don't include s3 js/css/json/txt/csv files as blobs 2016-10-24 17:05:49 -04:00
Cassie Tarakajian
8aeb044509 fix bug where plaintext files were being posted to s3 2016-10-24 16:33:16 -04:00
Cassie Tarakajian
8c270c2ced generate blob urls for text and json files 2016-10-22 16:42:43 -04:00
Cassie Tarakajian
d262783ec1 can add and edit json/txt files 2016-10-22 15:23:37 -04:00
Cassie Tarakajian
280d3e69ea fix keyboard shortcuts on safari 2016-10-19 18:35:59 -04:00
Cassie Tarakajian
ef7d121927 show errors if file name is invalid 2016-10-19 17:09:31 -04:00
Cassie Tarakajian
32d45ea332 remove all blobutil stuff 2016-10-19 15:33:14 -04:00
Cassie Tarakajian
0ccfeb6b9c fix debounce on safari 2016-10-19 13:29:02 -04:00
Cassie Tarakajian
a4b6dd194e fix dropdown bug on safari 2016-10-19 13:03:19 -04:00
Cassie Tarakajian
5e36617de4 add link to login on signup view 2016-10-19 12:40:32 -04:00
Cassie Tarakajian
4ff6ac1021 fix lag on password reset form 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
8b35951ba4 invalid password reset token styling 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
e5ff11f65a add basic password reset functionality, no error checking or styling 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
d055aa5af8 more password reset things 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
04f68e37f9 add submit text 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
5aa5032961 create password reset token from FE, start to add flash text 2016-10-19 12:36:58 -04:00
Cassie Tarakajian
ea6d30c430 more password reset stuff 2016-10-19 12:36:57 -04:00
Cassie Tarakajian
1610b0168d start to add mailgun and nodemailer 2016-10-19 12:36:57 -04:00
Yining Shi
185d8fdd05 fixes #148 (#153) 
* save project after changing sketch name

* not saving the sketch after updating the name if it's not created yet
 2016-10-19 11:47:58 -04:00
Cassie Tarakajian
3e7d88698b remove comments and console.logs 2016-10-17 23:23:19 -04:00
Mathura MG
c6e1d1c906 revert lint code (#151) 2016-10-17 22:58:30 -04:00
Mathura MG
1dafe3a8e9 Make p5 logo color variable (#150) 
* initial changes for high contrast theme

* change more colours

* add more styles

* add new variables

* fix few more colours

* fix typo

* fix indent

* make logo colour a variable
 2016-10-17 22:57:29 -04:00
kaganjd
76bd1b1630 Add ability to delete projects from sketch list (#125) 
* Add ability to delete projects from sketch list

- Fixes #76
- Also gets rid of outdated Sketch module

* Styling for Sketch List trash can

* Merge all the stuff

* Fix trash can line height
 2016-10-12 14:24:53 -04:00
Mathura MG
85bbe045e5 Add high contrast theme (#141) 
* initial changes for high contrast theme

* change more colours

* add more styles

* add new variables

* fix few more colours

* fix typo

* fix indent
 2016-10-12 12:08:12 -04:00
Cassie Tarakajian
37bb45cc37 fixes #134 2016-10-08 19:18:38 -04:00
Cassie Tarakajian
40f31b0e5c fixes #135 2016-10-08 18:52:32 -04:00
Yining Shi
96321ca767 Make Login & Sign Up as modal layovers (#122) 
* make Login & Sign Up as modal layovers

* delete extra signupForm.js in original path

* deleted extra comments
 2016-10-08 18:03:39 -04:00
Cassie Tarakajian
e511db64fe change console throttling to batch deliver messages 2016-10-06 16:58:14 -04:00
Cassie Tarakajian
fe13349850 make autorefresh time a little longer 2016-10-06 15:48:45 -04:00
Cassie Tarakajian
58d0dba167 remove dead code, fix linting errors, get infinite loop functionality working 2016-10-06 15:45:26 -04:00
Cassie Tarakajian
f9d487ebe8 refactor infinite loop being triggered 2016-10-06 13:01:48 -04:00
Cassie Tarakajian
6cecc6ae63 did a thing 2016-10-05 14:49:43 -04:00
Cassie Tarakajian
a9caa30db3 start to refactor loopprotect 2016-10-05 14:21:32 -04:00
Cassie Tarakajian
2608efbc13 Merge branch 'lmccart-console' 2016-10-05 14:02:56 -04:00
Cassie Tarakajian
322ec88b22 add horizonal scroll for code editor 2016-10-05 12:26:49 -04:00
Cassie Tarakajian
55403e9a20 Merge branch 'console' of https://github.com/lmccart/p5.js-web-editor into lmccart-console 2016-10-04 16:21:42 -04:00
Cassie Tarakajian
dfc55aaa5b temporarily remote autorefresh and loop protect 2016-10-04 15:35:23 -04:00
Lauren McCarthy
ee6c5e94aa only update console when expanded 2016-10-01 16:25:00 -07:00
Lauren McCarthy
4d6cb43330 changing interval to 100ms 2016-10-01 16:04:40 -07:00
Lauren McCarthy
e4e7f176b5 throttling postMessage to 250ms, fixes #80 2016-10-01 16:01:05 -07:00
Cassie Tarakajian
4d834ed16d add lots of changes to make autorefresh work with infinite loop checking 2016-09-29 00:54:35 -04:00
Cassie Tarakajian
f78fc37d68 add previewIsRefreshing to redux state 2016-09-28 18:17:39 -04:00
Cassie Tarakajian
5f23ea8132 did stuff 2016-09-28 18:11:11 -04:00
Cassie Tarakajian
7fb85c251b auto autorefresh to preferences, save autorefresh server side 2016-09-28 18:09:37 -04:00
Cassie Tarakajian
56fcedc06a add autofresh toggle to toolbar 2016-09-28 18:08:37 -04:00
Cassie Tarakajian
274614cc60 Merge pull request #94 from yining1023/livecoding 
detect infinite loop
 2016-09-28 16:16:21 -04:00
Jen Kagan
19f0915350 Add shortcuts to shortcut modal 
Fixes #16.
 2016-09-28 15:19:38 -04:00
MathuraMG
46d58014ff add focus and labels 2016-09-28 12:09:42 -04:00
Yining Shi
55b37866f6 detect infinite loop, disable play button 2016-09-24 00:46:06 -04:00
Yining Shi
c48c012160 fixed appending errors in draw(), changed error color 2016-09-22 17:17:24 -04:00
Cassie Tarakajian
3d087df1a2 add light and dark codemirrir themes 2016-09-21 00:00:43 -04:00
catarak
103ebd2014 add theme to preferences, add backbone of themes to scss 2016-09-20 23:57:27 -04:00
Cassie Tarakajian
84ac4459d1 fix merge conflicts 2016-09-20 18:32:26 -04:00
Cassie Tarakajian
f48b872500 add unsavedChanges to redux, handle unsaved changes 2016-09-20 18:27:10 -04:00
Yining Shi
43052cb675 detect infinite loop 
detect infinite loop

detect infinite loop
 2016-09-17 00:11:33 -04:00
catarak
9e6d4b56bd change isSelected to isSelectedFile, add db reformat 2016-09-14 15:57:52 -04:00
catarak
2d4cb76edf fix other urls that should be https 2016-09-08 22:15:29 -04:00
catarak
0e0d3975e1 fix #89, fix closed sidebar on Safari 2016-09-07 22:49:29 -04:00
catarak
12c0581ee0 add command + s for save, detect os for control + s, add to keyboard shortcut list 2016-09-07 21:48:45 -04:00
catarak
3352fe9d0d add toast component, start to add functionality 2016-09-07 19:00:52 -04:00
catarak
f1ead9f124 add keyboard shortcuts modal 2016-09-07 17:47:22 -04:00
catarak
4799a26652 add code tidy button 2016-09-07 16:41:56 -04:00
catarak
0716d209c4 add show/hide editor options 2016-09-07 16:33:01 -04:00
catarak
d1576bb661 add css and html beautify 2016-09-07 15:05:25 -04:00
catarak
506c959f8c map shift+tab to beautifier, only for js 2016-09-07 12:16:26 -04:00
catarak
95daa80fc1 update browser history to go back when exiting open and about, fixes #85 2016-09-06 22:46:49 -04:00
catarak
14a51b6332 add share modal 2016-09-06 22:37:29 -04:00
catarak
207bab20eb add embed route, fix path parsing in PreviewFrame 2016-09-06 16:54:16 -04:00
catarak
fedef1628d fix console error when loading a project by url 2016-09-03 20:19:07 -04:00
catarak
1ae87ab85c focus on newfilemodal input when opened 2016-09-03 19:42:23 -04:00
catarak
550347e6fc add expanding/contracting styles 2016-09-02 17:41:02 -04:00
catarak
e82270a709 add hide/showing files, carrot doesn't work 2016-09-02 17:41:02 -04:00
catarak
bf61fdd992 nested css styling fixes 2016-09-02 17:41:02 -04:00
catarak
245ca63a5d add special file options to folders 2016-09-02 17:41:02 -04:00
catarak
fa518f028a fix proptypes for redux forms 2016-09-02 17:41:02 -04:00
catarak
9d3bcf2a15 add new folder modal 2016-09-02 17:41:02 -04:00
catarak
7f5c970b6c fix proptypes that were missing from preview frame 2016-09-02 17:41:02 -04:00
catarak
1ae27f0d66 add file icons and file types default to file 2016-09-02 17:41:01 -04:00
catarak
cd0dcc9184 reset selected file after deleting 2016-09-02 17:41:01 -04:00
catarak
5f694329db delete files, only client side 2016-09-02 17:41:01 -04:00
catarak
69b73d016a add comment for hack 2016-09-02 17:41:01 -04:00
catarak
b0ce13e6ba fix project loading bug 2016-09-02 17:41:01 -04:00
catarak
d08c7c6b94 fix really really annoying bug 2016-09-02 17:41:01 -04:00
catarak
c8074f1501 do a lot of things that aren't really working 2016-09-02 17:41:01 -04:00
catarak
cbb272ec14 file tree renders, select file works and editor changes content, rename works 2016-09-02 17:41:01 -04:00
catarak
40b70d6c69 add file node component 2016-09-02 17:41:00 -04:00
MathuraMG
8de170135e switch to react refs 2016-09-01 12:51:38 -04:00
MathuraMG
6cba157687 add preview; output focus 2016-08-31 23:07:43 -04:00
Cassie Tarakajian
f8ab95d0dc Merge pull request #70 from MathuraMG/accessibility 
Accessibility changes to preferences and toolbar
 2016-08-30 21:32:40 -04:00
Lauren McCarthy
6e18cb9535 fixing console.log outside setup/draw closes #78 2016-08-30 18:06:55 -04:00
MathuraMG
fbc6f1c97a switch to onChange 2016-08-29 16:36:35 -04:00
MathuraMG
fe803d52d0 remove preference__option--selected 2016-08-29 14:39:23 -04:00
Lauren McCarthy
fa77ad2edd fixing merge conflicts 2016-08-28 09:54:35 -04:00
Lauren McCarthy
f936d98f76 fixing linting errors 2016-08-28 09:52:57 -04:00
Lauren McCarthy
402e9bc95e fixes line numbers closes #36 2016-08-27 13:54:20 -04:00
Lauren McCarthy
23d5341e7c getting a little closer with console output line number #36 2016-08-26 14:22:58 -04:00
MathuraMG
1803067aeb change labels 2016-08-25 17:59:02 -04:00
MathuraMG
b825096640 make preferences radio buttons 2016-08-25 17:46:30 -04:00
omnikrll
399e29f37b remove comment 2016-08-25 13:48:52 -04:00
omnikrll
c245a6a21e Merge branch 'upstream' into editor-accessibility-unique-key-warning 2016-08-25 13:46:24 -04:00
omnikrll
8a61917937 make 'no lint errors' p ino li 2016-08-25 13:45:35 -04:00
Cassie Tarakajian
fc0049e2d7 Merge pull request #66 from MathuraMG/temp 
populate current line number differently
 2016-08-25 12:45:22 -04:00
catarak
1de8c02cf2 fix a few regexes for preview frame 2016-08-25 12:39:36 -04:00
MathuraMG
db85dcc04b add word line 2016-08-25 12:32:06 -04:00
catarak
a1dcf77557 upload text files locally 2016-08-25 00:18:28 -04:00
omnikrll
9457d2e57c replace for loop with forEach 2016-08-24 17:54:26 -04:00
omnikrll
006c78a362 Merge branch 'master' into editor-accessibility-unique-key-warning 2016-08-24 16:43:12 -04:00
MathuraMG
76492cec6f switch focus to section 2016-08-24 13:30:50 -04:00
MathuraMG
abe9ac4d5a add on focus 2016-08-24 13:10:06 -04:00
omnikrll
5d11dcdc84 add key property to lint message elements 2016-08-23 23:38:58 -04:00
catarak
de62acdaaa make renaming files more robust--now checks to see if extension after renaming is the same 2016-08-22 13:16:28 -04:00
catarak
8713e297dd add about modal to link to github 2016-08-22 12:35:59 -04:00
Cassie Tarakajian
1734852f68 Merge pull request #50 from MathuraMG/output 
Create text output for canvas
 2016-08-19 16:03:22 -04:00
MathuraMG
76c7c6384d add subtitle 2016-08-19 15:51:41 -04:00
MathuraMG
049b3ce0e5 include JSONs in local 2016-08-19 12:44:44 -04:00
catarak
3ab1b82d8d add fullscreen route and page 2016-08-17 18:13:17 -04:00
catarak
8f66327b55 add link to user's sketches in toolbar 2016-08-17 16:09:20 -04:00
catarak
bca59a6233 add /:username/sketches links to username sketches 2016-08-17 15:53:25 -04:00
MathuraMG
8659251bcf merge master 2016-08-15 21:09:47 -04:00
MathuraMG
c0407dec65 update interceptor 2016-08-15 20:28:18 -04:00
MathuraMG
9c03efcef2 read data from json file 2016-08-15 18:06:09 -04:00
catarak
e823e383e7 add timestamp to sketch list view 2016-08-15 17:14:55 -04:00
catarak
2f6d5e84e8 switch sketch list to sketch list modal, which you now can close 2016-08-15 17:06:12 -04:00
catarak
17efc42778 switch project name edit to html5 input 2016-08-15 12:42:13 -04:00
MathuraMG
87de5a2188 merge master 2016-08-15 12:14:32 -04:00
MathuraMG
a5b4f0d23c add text output component 2016-08-15 12:12:25 -04:00
catarak
03d59b159a add accessibility linting beep to webpack loader and remove base64 string 2016-08-15 11:51:11 -04:00
MathuraMG
5179b09022 merge with master 2016-08-13 11:37:05 -04:00
MathuraMG
34d8582412 add button tp play text output and sketch 2016-08-12 16:37:38 -04:00
MathuraMG
bcd2a39f9d add preferences to include text output 2016-08-12 15:50:33 -04:00
MathuraMG
018a8b970c switch lineNo to lineNumber 2016-08-12 14:23:34 -04:00
MathuraMG
be010b8ac0 switch div to sections 2016-08-12 14:19:23 -04:00
catarak
43c49e9617 when clicking new project, don't save new project 2016-08-12 12:45:26 -04:00
MathuraMG
e964df2fe2 make pref visible 2016-08-12 10:13:22 -04:00
MathuraMG
8f68b3aa58 add ntc 2016-08-12 00:39:59 -04:00
MathuraMG
c14eae56c8 add files 2016-08-12 00:11:31 -04:00
MathuraMG
cd1a803123 move accessiblity region inside main editor block 2016-08-11 21:26:49 -04:00
MathuraMG
0f9bf4a999 fix aria-live bug in FF 2016-08-11 20:26:14 -04:00
MathuraMG
4776dcf48f add TODO 2016-08-11 16:56:39 -04:00
MathuraMG
ac06cae5c0 add current line desc 2016-08-11 16:02:21 -04:00
MathuraMG
4806b83d1f style editor-accessibility 2016-08-11 15:38:32 -04:00
MathuraMG
d789c9a8f3 move lint warning to preferences 2016-08-11 14:09:59 -04:00
MathuraMG
fb5d640b45 change file names 2016-08-11 13:29:30 -04:00
MathuraMG
57f39d5a64 add editor accessibility 2016-08-11 13:24:02 -04:00
MathuraMG
ea2ed435ba Merge branch 'master' of https://github.com/catarak/p5.js-web-editor into editor 2016-08-11 11:21:18 -04:00
catarak
5877b82933 fix https://github.com/catarak/p5.js-web-editor/issues/35 2016-08-10 20:02:55 -04:00
MathuraMG
9aaa814fc4 fix issues with safari 2016-08-10 17:24:52 -04:00
MathuraMG
6e74ef03c4 add aria-tags 2016-08-10 16:20:15 -04:00
MathuraMG
5cf1249cc7 merge master 2016-08-10 15:51:56 -04:00
MathuraMG
1a45e4cb91 change file modal structure 2016-08-10 15:49:03 -04:00
MathuraMG
703f9ff820 add basic button functionality to linting 2016-08-10 11:13:17 -04:00
catarak
18c2fe9e85 add autosave preference styling 2016-08-09 17:29:17 -04:00
catarak
42b15d06de add autosave to preferences 2016-08-09 16:15:28 -04:00
MathuraMG
250cd0ae9d debounce the beep 2016-08-08 13:49:45 -04:00
MathuraMG
7cb9475b44 add audio tone 2016-08-05 23:08:44 -04:00
MathuraMG
6d7c9873b3 add fn 2016-08-05 16:58:59 -04:00
MathuraMG
ec26e6ddac add printing of lint messages 2016-08-05 12:53:16 -04:00
catarak
c76b1353c3 put preferences to server, need to look at mongoose docs tho because is wrong 2016-08-04 21:43:13 -04:00
catarak
b542f72d33 remove code bloat from preferences, add preferences to user schema 2016-08-03 23:45:49 -04:00
catarak
d7a6773995 fix bugs in sketch list view 2016-08-03 19:03:01 -04:00
catarak
7cafe490df remove stray debugger statement 2016-08-03 17:46:13 -04:00
catarak
8c4003bb17 add rename validation 2016-08-03 17:45:50 -04:00
catarak
443a9f57d5 add file renaming 2016-08-03 17:45:50 -04:00
catarak
da98dcd47e add file deletion 2016-08-03 17:45:50 -04:00
Cassie Tarakajian
7fb77772f7 Merge pull request #29 from MathuraMG/label 
add aria tags and roles
 2016-08-01 14:01:29 -04:00
catarak
a2072d9b0c move preference action creators to preferences component 2016-08-01 13:55:49 -04:00
MathuraMG
0bc2956e58 add title to console 2016-07-31 21:41:28 -04:00
MathuraMG
f4d49f49a5 add aria-label tag 2016-07-30 22:46:48 -04:00
catarak
4c5fafe251 add promise polyfill 2016-07-22 12:42:38 -04:00
catarak
5362098844 add commenting/uncommenting, add sublime text bindings 2016-07-21 14:33:23 -04:00
catarak
979fcf2152 add support for audio files 2016-07-21 14:18:38 -04:00
catarak
9201cb247c make console expandable and contractable 2016-07-21 00:33:41 -04:00
catarak
afe7e07188 start console styling 2016-07-21 00:05:47 -04:00
catarak
051e3771ee fix merge conflict with therewasaguy-console 2016-07-20 23:02:45 -04:00
catarak
a5db4ae9f6 can't upload media if not logged in 2016-07-20 22:18:20 -04:00
catarak
3d6cfd832d fix s3 bucket name in file uploader 2016-07-20 20:30:40 -04:00
catarak
f0872f8173 clear file uploader after upload 2016-07-20 18:37:49 -04:00
catarak
ceccef3cc3 change uploader copy, change uploader style 2016-07-19 21:42:33 -04:00
catarak
7e6bbb1fae fix file state changing bug 2016-07-19 21:36:21 -04:00
catarak
57568f6504 wowowowow this blob url thing works 2016-07-19 19:36:50 -04:00
catarak
625608ebbb when uploading file, add file to project 2016-07-19 18:27:27 -04:00
catarak
b3956fb91b file upload to aws works 2016-07-19 18:27:27 -04:00
catarak
c677c37597 get dropzone to render 2016-07-19 18:27:27 -04:00
therewasaguy
0c7f713887 console BEM style 2016-07-18 19:10:42 -04:00
therewasaguy
6b672d2629 Merge branch 'master' of https://github.com/catarak/p5.js-web-editor into console 2016-07-18 18:56:00 -04:00
therewasaguy
40704b4b00 console: shouldComponentUpdate and componentWilLReceiveProps tweaks 2016-07-17 20:49:57 -04:00
therewasaguy
8b69ab7fdd really clear sketch when sketch is stopped 2016-07-17 20:49:10 -04:00
therewasaguy
e7ea35fa60 add comments 2016-07-17 20:05:20 -04:00
therewasaguy
5561d49a48 merge upstream changes 2016-07-17 19:15:13 -04:00
therewasaguy
7f0b7afac1 add Console component, gets postMessage from previewFrame 2016-07-17 19:06:43 -04:00
MathuraMG
c29bbda4c2 add back navigation role 2016-07-15 17:25:54 -04:00
MathuraMG
038d290577 fix merge conflicts 2016-07-15 17:23:59 -04:00
MathuraMG
4ddad41053 add labels for buttons 2016-07-15 16:47:12 -04:00
catarak
78ed7b4b5f add download as zip 2016-07-15 13:11:50 -04:00
catarak
c3486af031 add author name to sketches 2016-07-15 11:54:47 -04:00
MathuraMG
589bc9f630 change html tags 2016-07-14 17:20:44 -04:00
catarak
accf8e2504 add expand/contract sidebar 2016-07-14 12:47:54 -04:00
catarak
d9a11cea4c add debounce to editor input 2016-07-13 21:50:59 -04:00
catarak
c29f5aee68 add syntax highlighting for different file types, and linting for html and css 2016-07-13 19:52:50 -04:00
catarak
4d6e4857ba add files, server side, only css and js files 2016-07-13 18:53:56 -04:00
catarak
70588cd487 add new file popup, not tested with redux 2016-07-13 16:13:28 -04:00
mathuramg
b4c15e70df add more roles + remove menu roles 2016-07-13 15:23:48 -04:00
mathuramg
0d9c3a29c8 fix merge conflicts 2016-07-13 12:07:05 -04:00
mathuramg
baec9e9e87 add aria-tags and titles 2016-07-13 11:59:47 -04:00
catarak
bc69995fb1 super ugly, but added jslinting 2016-07-12 17:38:24 -04:00
Cassie Tarakajian
6010e14e30 Merge pull request #10 from MathuraMG/accessibility 
Changes to make the links screen reader compatible
 2016-07-12 16:07:04 -04:00
catarak
b4ba44a67e fix editor overflow 2016-07-12 15:58:11 -04:00
mathuramg
70f5638a47 move keyCode 2016-07-12 15:11:45 -04:00
therewasaguy
fae5ea086e Merge branch 'development' of https://github.com/catarak/p5.js-web-editor into console 2016-07-12 15:09:45 -04:00
mathuramg
67fcd323a4 Merge branch 'master' of https://github.com/catarak/p5.js-web-editor into accessibility 2016-07-12 12:26:20 -04:00
mathuramg
624d79075a make links accessible 2016-07-12 12:25:48 -04:00
mathuramg
99f6ab562c fix merge conflicts 2016-07-11 23:40:30 -04:00
mathuramg
c8f54dced9 fix merge conflict 2016-07-11 23:03:54 -04:00
catarak
9249d496fa add css files to sketch 2016-07-11 21:54:08 -04:00
catarak
61a6f7d4ac readd sandbox 2016-07-11 17:32:13 -04:00
catarak
552036c7ce add srcdoc polyfill again, maybe this time it will work 2016-07-11 17:21:20 -04:00
catarak
7b8561a55c add srcdoc polyfill to static 2016-07-11 17:00:30 -04:00
catarak
960701942a temporarily remove sandbox 2016-07-11 16:12:31 -04:00
catarak
016325be9b add srcdoc polyfill 2016-07-11 15:50:08 -04:00
catarak
dcc39afb45 add comment about adding srddoc polyfill 2016-07-11 15:27:00 -04:00
catarak
7a164d9cdd multiple files rendering 2016-07-11 15:22:29 -04:00
mathuramg
0942378812 remove dev changes 2016-07-11 09:06:43 -04:00
mathuramg
7f5d83a161 change default indentation 2016-07-11 09:00:44 -04:00
mathuramg
42d59d3fb3 change list to buttons - accessibility 2016-07-11 08:44:27 -04:00
mathuramg
8746558fa8 add isTabIndent to componentchange 2016-07-10 23:11:06 -04:00
mathuramg
65bd8c2e63 include space and tab 2016-07-10 22:52:48 -04:00
mathuramg
3bdd02e859 make preference value input tag 2016-07-10 20:13:37 -04:00
catarak
ebfd1fce0d add Sidebar click to change Editor content 2016-07-08 15:58:49 -04:00
catarak
7a84137e9b start to add selected file stuff 2016-07-08 14:57:22 -04:00
therewasaguy
14ede1388b console: hijack iframe console messages 2016-07-08 14:33:06 -04:00
catarak
e06c821923 fix updating file to return all file keys 2016-07-07 13:50:52 -04:00
catarak
e6d94a0db8 start to add multiple file functionality 2016-07-06 15:09:05 -04:00
mathuramg
1b56f8ce54 add more preferences 2016-07-06 11:27:39 -04:00
catarak
cfd4d998cf fix all linting errors 2016-06-27 17:22:54 -04:00
catarak
3ab89b4cae add proptypes to editor and preview 2016-06-27 16:03:22 -04:00
catarak
f60a7e845d add prop types to preference, fix proptype head in preview frame 2016-06-27 15:57:36 -04:00
catarak
786753f1d3 add proptypes to previewframe 2016-06-27 15:47:48 -04:00
catarak
323b48c511 add proptypes to toolbar 2016-06-27 15:08:25 -04:00
catarak
3d42da18a8 fix a ton of eslint errors 2016-06-23 18:29:55 -04:00