Commit graph

422 commits

Author SHA1 Message Date
Laksh Singla
c3856480b8 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 16:09:11 -04:00
Andrew Nicolaou
7fdd970a43 Fixes bug where requestsOfType() would fail if no body
- Passes if request has no body
- Returns a JSON object with an error message when request
  doesn't match type, the response body was "[object Object]"
2019-07-22 15:03:31 -04:00
Cassie Tarakajian
cdf1585b72
Bug/orphaned assets (#1108)
* fixes #498

* fix linting errors
2019-06-19 17:03:15 -04:00
Laksh Singla
735adcfa05 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-06-19 16:21:25 -04:00
Andrew Nicolaou
d6438aa3b2 Merge branch 'master' into feature/public-api 2019-06-12 12:03:22 +02:00
Andrew Nicolaou
d2cad7438e
Test create project server code (prep for #1095)
* upgrades jest to latest version

* tests Project model with mockingoose

* extracts createProject controller to own file

* tests createProject controller with sinon-mongoose
2019-06-12 11:27:28 +02:00
Andrew Nicolaou
f8d6cb4940 Merge branch 'master' into feature/public-api 2019-06-11 09:59:22 +02:00
Cassie Tarakajian
18f646bde9
for #950, update babel to v7 (#1077)
* for #950, upgrade babel to v7

* fix linting errors

* for #950, remove @babel/core from devDependencies (so it's only in dependencies) and change babel-loader config to use .babelrc

* for #950, changes to .babelrc to make  work

* for #950, include core-js modules in webpack config for IE support with babel/plugin-syntax-dynamic-import

* for #950, update babel and associated packages to LTS
2019-06-05 12:05:31 -04:00
Cassie Tarakajian
b41b3538b9 fixes #417, add default p5.js inclusion to non-minified version, and update default p5.js version to latest (#1084) 2019-05-29 17:29:53 -04:00
Andrew Nicolaou
7c4f180540 Consistent user data returned from API
There's duplication in the user and session endpoints that
all return the same shaped user model data. The new helper should keep
them consistent when new properties need to be exposed.
2019-05-29 12:51:50 -04:00
Andrew Nicolaou
9f627c1c37 Fixes bug where lastUsedAt timestamp wasn't set when access token used 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
27ea1c1e1b Adds a temporary route for checking Personal Access Tokens work 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
7fd226f3ad Removes hashedKey from APIKey data when serialising
This ensures it's not accidentally exposed to the client when returning
the key metadata
2019-05-29 12:51:50 -04:00
Andrew Nicolaou
89dd41d81f lastUserAt should be null if the key has never been used 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
504eacaf64 Displays all API keys in a table, including new token information 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
69d5a87861 Fixes API controller tests
The tests mock the mogoose User model and the express Response model
which isn't good. We should find a solution that makes use of
the actual model object.
2019-05-29 12:51:50 -04:00
Andrew Nicolaou
7bfacf08d0 Do not return any keys in API 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
de5e1a9e8f Removes AdvancedSettingsView as functionality now in AccountView 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
403234ae81 Moves API key creation to server 2019-05-29 12:51:50 -04:00
Vertmo
f0b669d5af Added Basic Auth using passport-http 2019-05-29 12:51:50 -04:00
Vertmo
3b55ff81d2 Hashing keys before storing them 2019-05-29 12:51:50 -04:00
Vertmo
db71a2b7c0 Added DB schema and backend logic for API keys creation and deletion 2019-05-29 12:51:50 -04:00
Vertmo
3d2a862d9d Added design of the API key page 2019-05-29 12:51:50 -04:00
Cassie Tarakajian
507b0b28b1
fixes #417, add default p5.js inclusion to non-minified version, and update default p5.js version to latest (#1084) 2019-05-24 12:40:20 -04:00
Cassie Tarakajian
df1219b47a
fixes #850, bundling external libraries was causing a callback to never be called (#1060) 2019-05-02 19:33:16 -04:00
Cassie Tarakajian
765ec68ef3 attempt to fix error in mongo logs 2019-05-02 19:10:14 -04:00
Joey Lee
a5753b5e4c Script to fetch ml5 examples from Github Repo (#1051)
* replaced () with {} to fix implicit return error

* added first version of fetching generative-design examples

* ignore local testing files

* formatting

* updated examples-gg-latest

* updated examples-gg-latest.js

- data files not served via rawgit - hallelujah!
- added jquery

* updated p5 version

* refactoring and code cleanup

* added comment

* comment out link to svgFiles - unused

* moved commented code

* fixed conflicts

* linted examples-gg-latest

* removed console.log of response.data to prevent logging user data to console

* fixed linting error

* initial commit for setting up automated ml5 example fetching

* rm logs from .env replaced with placeholder

* added functions for retrieving all assets from examples sketches

* added recursive walk through to get all directories and files

* added functions t format files for making project

* added full working test

* added comments and formated code

* added comments

* set username at to of code

* added process.exit() on complete

* added linting and fixed errors

* rm await in return

* added es lint disable for reduce()

* rm package-lock.json

* reset package-lock.json to master

* "updated .env.example with dummy logins"

* updated .env.example for consistency

* added p5 user checking

* fixed linting issues

* add webpack config to build ml5 example fetching bundle
2019-05-02 15:12:06 -04:00
Cassie Tarakajian
870d9ceded
Fixes #760 (#1046)
* fixes #760

* fixes linting errors
2019-05-01 15:38:11 -04:00
Cassie Tarakajian
8b296a51aa
Fixes #1052, in which you can't save a sketch after uploading a file (#1053)
Fixes #1052, in which a user can't save a sketch after uploading a file
2019-04-24 13:32:23 -04:00
Cassie Tarakajian
7d1901649f
Project synching, for #790 (#1039)
* add isSaving to project reducer, move actions to functions, start work to get comprehensive frontend/backend syncing working

* handle making changes while saving project, handle saving from another window

* add change to handle saving new sketch, and adding new changes while saving
2019-04-17 14:08:33 -04:00
Laksh Singla
24302b56de Added softwrap preference for users. (#970)
* Client and server side code added for Linewrap option

* Linked linewrap prop with the Editor.jsx property

* linewrap defaults to true

* Renamed 'LineWrap' to 'WordWrap'
2019-03-26 15:37:44 -04:00
Ankur Ingale
80765e03c7 Fixed Issue #659 (#964)
* Fixed Issue #659

* Undo changes in package.json and package-lock.json

* Resolved error
2019-03-21 17:08:46 -04:00
Abhishek Kumar
0eea37e72a Fixing Spelling Mistake (#913)
* Fixing typos

* Fixed Spellings
2019-03-20 12:43:38 -04:00
siddhant1
b6e2c4c983 Migrated from momentjs to date-fns 2019-03-02 15:05:40 +05:30
siddhant
456697ec75 Fixed Mongoose Warning (#856) 2019-03-01 15:47:17 -05:00
Oliver Wright
03d7533e2a Serve text-type assets from sketch asset urls - Fixes #839 (#843) 2019-02-22 18:05:56 -05:00
Cassie Tarakajian
ed57e082e6
fixes #820, fixes #830, fixes #831 (#841) 2019-02-21 17:15:28 -05:00
Oliver Wright
e75c98b299 Prevent Race Condition when Updating Project - Fixes #837 (#838) 2019-02-20 16:27:28 -05:00
Cassie Tarakajian
f1b6aab749 fixes #826 2019-02-20 16:03:18 -05:00
Cassie Tarakajian
3a1b8abac1 fix lint error 2019-02-20 14:57:26 -05:00
Cassie Tarakajian
4dcec4baa8 Merge branch 'fix-char-restriction' of git://github.com/GaurangTandon/p5.js-web-editor into GaurangTandon-fix-char-restriction 2019-02-20 14:49:55 -05:00
Oliver Wright
00391a4ef9 Prevent User Information leak Fixes #822 (#823)
Prevents leaking the encrypted password and verification tokens to
the user when they update their account.
2019-02-20 11:08:10 -05:00
Gaurang Tandon
57b5f2f5bb resolve mc 2019-02-10 07:00:48 +05:30
Gaurang Tandon
bd3eed5fd3 reverted some changes and changed to file system safe naming 2019-02-10 06:57:03 +05:30
Cassie Tarakajian
65c1c35d10 fix fetch-examples script to adjust to changes to the p5.js website 2019-01-25 15:12:04 -05:00
Francis Li
31abeb9455 Serve up an empty 404 page if no examples user (#766)
* Rebase/squash

* Fix 404 page showing when refreshing Examples list

* Fix linter error

* Revert special-case handling of the p5 user for examples

* Add additional env var for enabling/disabling examples
2019-01-25 14:12:39 -05:00
Cassie Tarakajian
7bd016bac3
fixes #785, update node, and everything else that comes along with that (#810) 2019-01-16 17:56:18 -05:00
Cassie Tarakajian
437ffba378
fixes #802 (#809) 2019-01-16 12:35:34 -05:00
Gaurang Tandon
d86944034e fix lint errors 2018-12-15 12:43:58 +05:30
Gaurang Tandon
26d65396b4 fixes #568 2018-12-15 12:35:52 +05:30
Francis Li
9fe34504e9 Disable login/save (#778) 2018-12-11 16:21:37 -05:00
Joey Lee
597a6637cb Generative Design Examples: Updated githack cdn to jsDelivr (#779)
* replaced () with {} to fix implicit return error

* added first version of fetching generative-design examples

* ignore local testing files

* formatting

* updated examples-gg-latest

* updated examples-gg-latest.js

- data files not served via rawgit - hallelujah!
- added jquery

* updated p5 version

* refactoring and code cleanup

* added comment

* comment out link to svgFiles - unused

* moved commented code

* fixed conflicts

* linted examples-gg-latest

* changed branch ref to master

* rm spaces

* updated url links with https for jquery and set branch to dev-updates for testing

* changed branched ref to master

* removed console.log of response.data to prevent logging user data to console

* fixed linting error

* updated p5 version from 0.7.1 to 0.7.2

* updated rawgit to jsdelivr cdn
2018-12-11 15:03:20 -05:00
Joey Lee
5bcb5119e3 Update/Updated Generative Design Examples (#774)
* replaced () with {} to fix implicit return error

* added first version of fetching generative-design examples

* ignore local testing files

* formatting

* updated examples-gg-latest

* updated examples-gg-latest.js

- data files not served via rawgit - hallelujah!
- added jquery

* updated p5 version

* refactoring and code cleanup

* added comment

* comment out link to svgFiles - unused

* moved commented code

* fixed conflicts

* linted examples-gg-latest

* changed branch ref to master

* rm spaces

* updated url links with https for jquery and set branch to dev-updates for testing

* changed branched ref to master

* removed console.log of response.data to prevent logging user data to console

* fixed linting error

* updated p5 version from 0.7.1 to 0.7.2
2018-12-07 11:46:04 -05:00
anaplian
319e68ddb6 Fix async validation in signup form (fixes #742) (#746) 2018-10-29 19:33:37 -04:00
Cassie Tarakajian
2902145ec2 for #733 2018-10-18 14:14:38 -04:00
Basile Pesin
996a1b988a Fixes #692 (#713)
* Got the basis covered, now I need to style all this

* Corrected and upgraded Share window

* Changed the routes again, and set correct design

* Made some of the requested changes

* Removed PreviewFrame errors

* Redesigned Preview Header

* Corrected style of the FullView

* Corrected most of the css mistakes

* Corrected logo size
2018-10-18 14:10:37 -04:00
Cassie Tarakajian
474c843e8a Merge branch 'bugfix/680-preview-dimensions' of https://github.com/bendman/p5.js-web-editor into bendman-bugfix/680-preview-dimensions 2018-10-17 15:27:57 -04:00
Cassie Tarakajian
54002feb1d change for #727 2018-10-16 11:43:16 -04:00
Cassie Tarakajian
088efaad0c another change for #727, getting warmer 2018-10-16 11:13:01 -04:00
Cassie Tarakajian
63380c5dd8 another change for #727 2018-10-16 10:58:12 -04:00
Cassie Tarakajian
2307d89df7 for #727 2018-10-10 18:59:14 -04:00
cdncat
e83654f6ad Fixes #717 (#720)
* remove npm run lint warnings, fixes #717

* Update link for Code of Conduct in CONTRIBUTING.md
2018-10-05 15:35:31 -04:00
Cassie Tarakajian
8495a59e36
Development documentation (#705)
* delete unused files, move webpack configs to their own directory

* start of improved developer documentation, moving everything to developer_docs/ directory

* documentation updates
2018-09-26 16:14:06 -04:00
Cassie Tarakajian
7ac6dd0b39 Merge branch 'master' into production-docker 2018-09-19 16:09:26 -04:00
Cassie Tarakajian
032169e7bc add authorization to file routes 2018-09-19 16:09:12 -04:00
bendman
ffa4ac145a Fixes #680 by adjusting canvas and iframe layout
- Set the preview canvas to `display:block` to remove vertical spacing
caused by the default value, which was making a full-height canvas cause
vertical scrolling, and the vertical scrollbar caused horizontal
scrolling
- Wrap the preview content in a container with `position:relative` and
no other visible content, so that the full-height iframe excludes the
height of the preview frame header, preventing it from going beyond the
height of the page
2018-09-08 11:50:39 -07:00
Cassie Tarakajian
8be04ac817 update fetch example scripts connection to mongodb, add pulling env variables from secret to kubernetes config 2018-09-07 15:29:47 -04:00
Cassie Tarakajian
545d4aec5f fix mongo connection URL for example fetch scripts 2018-09-05 18:09:18 -04:00
Cassie Tarakajian
02c7c2f26d fix mongo connection so that deprecation warning doesn't appear 2018-09-05 15:34:53 -04:00
Cassie Tarakajian
0f0be1f956 fix file uploads by updating mongoose 2018-08-30 21:00:29 -04:00
Cassie Tarakajian
7cb2847b94 fix error with undefined env S3_URL_BUCKER_BASE 2018-08-30 19:35:03 -04:00
Cassie Tarakajian
5e70d8bb86 Merge branch 'master' into production-docker 2018-08-29 15:06:59 -04:00
Cassie Tarakajian
4a2d6d3035 fixes #668 2018-08-29 15:06:41 -04:00
Cassie Tarakajian
6705e4c3f8 load client-side environment variables at runtime 2018-08-24 17:41:23 -04:00
Cassie Tarakajian
4dc0ee1d25 fix linting errors 2018-08-21 17:52:42 -04:00
Cassie Tarakajian
02456eaa60 try creating health check 2018-08-21 17:39:34 -04:00
Cassie Tarakajian
bd476d3d38 add basic auth to server for beta editor setup 2018-08-21 16:09:41 -04:00
Cassie Tarakajian
aa543fad4a merge in master 2018-08-20 12:20:41 -04:00
Cassie Tarakajian
549d622c6f more config for kubernetes, fix example fetching tasks to include node env 2018-08-09 13:58:48 -04:00
Liang Tang
617f00653c Improve current console (#656)
* init v2

* make replay work

* fix a failing scenary of react-frame

* fix some bugs

* delete/comment some files

* remove

* fix some bugs && remove more comments

* remove unnecessary lines

* minor tweak

* fix some bugs

* try to hook iframe using webpack

* update

* changes according to cassie

* minor tweak

* fix lint

* extract sass

* add icons

* update webpack config

* update webpack configuration

* update

* tweak

* fix a small bug
2018-07-30 12:20:57 -04:00
Jared Donovan
903713e705 WIP - Mixed content error for Issue #543 (#661)
* Set trust proxy option on Express app.

* Fix replacement of filePath for full screen and embed sketches.

* Use const rather than let because  is never reassigned.
2018-07-03 13:02:46 -07:00
Cassie Tarakajian
fa5a9e39b2 fix linting errors and do stuff to make build work 2018-06-26 19:13:13 -07:00
Cassie Tarakajian
82059bbfb0 remove nginx Dockerfile because it's not actually necessary 2018-06-26 19:05:08 -07:00
Cassie Tarakajian
f06198a4e1 start to add mongo configuration 2018-06-25 16:13:31 -07:00
Cassie Tarakajian
432361bc86 fix lint errors 2018-06-20 10:28:54 -07:00
Cassie Tarakajian
d29be20395 Merge branch 'master' into production-docker 2018-06-20 10:23:13 -07:00
Jared Donovan
9a0c044884 Fixed the linting errors that I could. (#653) 2018-06-18 14:45:50 -07:00
Cassie Tarakajian
b172087b98 get local-ssl-proxy working for testing prod locally 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
a14c232935 fix fetch example scripts, add webpack config to build fetch script bundles 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
131e853503 change Dockerfile to fix environment variables and fetching examples 2018-06-18 14:32:09 -07:00
Cassie Tarakajian
41f793b130 remove unused index.html, move example fetch to own folder 2018-06-18 14:30:10 -07:00
Cassie Tarakajian
5613a285f6 move github files to .github folder, delete useless server config, get development Docker build working 2018-06-18 14:30:10 -07:00
Jared Donovan
c814826c4a Remove EXAMPLE_USERNAME as a settable option as per discussion on Issue #646 (#651) 2018-06-18 14:30:05 -07:00
Cassie Tarakajian
9958619fc4 fixes #630 and updates codemirror 2018-05-30 15:23:32 -07:00
Cassie Tarakajian
63be548f63 fix linting error 2018-05-30 14:23:11 -07:00
Liang Tang
d5856ba923 Remove authorization from specific routes (#642)
* fixes #569

* update listObjectsInS3ForUser

* update client-side routes

* update aws controller

* update

* redirect to /login when unlogged in
2018-05-29 21:37:10 -07:00
Andrew Mitchell
3bb5bea0ff Issue #598 Add Meta to Transnational Emails (#634)
* Added meta tags to transactional emails

* Use single quotation marks to match style

* single quotes must be used

* single quotes must be used
2018-05-14 11:53:21 -07:00
Cassie Tarakajian
9ba507e091 fix server-side lint error 2018-05-08 19:30:33 -07:00
Cassie Tarakajian
bd303b7710 fix even more linting errors 2018-05-08 19:16:04 -07:00
Cassie Tarakajian
c90dac55b7 update eslint and fix linting errors 2018-05-08 19:16:04 -07:00