Commit graph

306 commits

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