Commit graph

395 commits

Author SHA1 Message Date
Cassie Tarakajian
54534f68d3 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 ()
* toggling menu

* Other components should be treated equally
2017-01-09 12:47:32 -05:00
Yining Shi
62b4d4cc6e New Design for About ()
* 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 and ()
* Changed unsaved changes asterisk to an svg circle. 

* Fixed 
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 2017-01-05 14:40:04 -05:00
Lauren McCarthy
28323ffc09 formatting of dropdown login and editor menus ()
* removing avenir font, using montserrat instead due to licensing issues

* removing old import statement for typeography scss file

* dropdown formatting closes 
2016-12-20 00:21:04 -05:00
Lauren McCarthy
5de2a6761f Prefs ()
* 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 ()
* 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 
2016-12-19 17:07:04 -05:00
Yining Shi
0f17633f79 New design for ResetPassword view and NewPassword view ()
* 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 ()
* 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 ()
* 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 

* removing seconds from sketchlist view

* remove outline from active icon
2016-12-14 10:58:43 -05:00
Cassie Tarakajian
f3247bd0ef edit jshint options to be more lax for semicolons 2016-12-13 16:59:47 -05:00
Cassie Tarakajian
896d0cd715 testing of , 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 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 highlight p5 keywords in code editor 2016-12-07 14:42:05 -05:00
Cassie Tarakajian
49bdd9377f fixes 2016-12-06 21:33:12 -05:00
Jen Kagan
55b54f09bd Change routes to /:username/sketches/:projectid () 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 , making sure focus/form is reset properly 2016-11-29 19:18:11 -05:00
Cassie Tarakajian
0a459246ac FINALLY fix , 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 ()
* 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 ()
* 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 2016-11-11 17:36:19 -05:00
Cassie Tarakajian
66b83df0f2 fix , relates to 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 from happening again 2016-11-10 12:26:35 -05:00
Mathura MG
b3ac90a4c6 Change text output content ()
* 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' ()
* 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 2016-11-08 13:30:41 -05:00
Cassie Tarakajian
c7483b5d3a fix , 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 ()
* add shortcuts

* add keyboard shortcut for text based output

* remove duplicate
2016-11-08 12:39:46 -05:00
Cassie Tarakajian
41c1613d10 fix 2016-11-04 18:54:14 -04:00
Cassie Tarakajian
dd01aeb599 fix 2016-11-04 17:31:04 -04:00
Cassie Tarakajian
7ededa5c18 revert not printing to console if it is not expanded 2016-11-02 22:41:10 -04:00
Cassie Tarakajian
d33b6a354f handle undefined console messages 2016-11-02 19:26:13 -04:00
Cassie Tarakajian
3a8e67d484 fixes 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 ()
* add pencil icon, start wiring toolbar

* Closes 
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 ()
* 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 () 2016-10-17 22:58:30 -04:00
Mathura MG
1dafe3a8e9 Make p5 logo color variable ()
* 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 ()
* Add ability to delete projects from sketch list

- Fixes 
- 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 ()
* 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 2016-10-08 19:18:38 -04:00
Cassie Tarakajian
40f31b0e5c fixes 2016-10-08 18:52:32 -04:00
Yining Shi
96321ca767 Make Login & Sign Up as modal layovers ()
* 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 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 from yining1023/livecoding
detect infinite loop
2016-09-28 16:16:21 -04:00
Jen Kagan
19f0915350 Add shortcuts to shortcut modal
Fixes .
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 , 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 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 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 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 2016-08-27 13:54:20 -04:00
Lauren McCarthy
23d5341e7c getting a little closer with console output line number 2016-08-26 14:22:58 -04:00
MathuraMG
1803067aeb change labels 2016-08-25 17:59:02 -04:00