Commit graph

1492 commits

Author SHA1 Message Date
Andrew Nicolaou
f8d6cb4940 Merge branch 'master' into feature/public-api 2019-06-11 09:59:22 +02:00
siddhant
b7df80a96c Add sorting to sketches #789 (#910)
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

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

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
2019-06-06 17:17:33 -04: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
f54f41e604 re #1086, fix typo in staging deploy script name 2019-05-30 14:06:31 -04:00
Cassie Tarakajian
84e240e781 re #1086, fix typo in staging deploy script name 2019-05-30 14:05:45 -04:00
Cassie Tarakajian
b7ead2a4de re #1086, initial staging configuration (#1087) 2019-05-29 17:29:53 -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
5bf2835ed6 Experiment with "Checks" in Travis output (#1081)
* Run tests on CI

* Create a lint error on purpose

* Splits build into test and deploy stages

lint and test jobs will run in parallel and if both are successful
(and branch is master), deploy will run.

* Revert "Create a lint error on purpose"

This reverts commit 306c91c4278631fa1c1dcd40f0b23f7f9e5f000d.

* Updating snapshot

* Run deploy only on master branch (not PRs)

* Use global deploy config item to avoid building on PRs
2019-05-29 17:29:53 -04:00
Cassie Tarakajian
27b80104c0
re #1086, initial staging configuration (#1087) 2019-05-29 16:11:26 -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
693542eef5 Forces light theme on Account page
This is until this page's components are made theme-aware
2019-05-29 12:51:50 -04:00
Andrew Nicolaou
fe513fdb54 Adds spacing around social login button 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
34fea139f2 Fixes Account back behaviour 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
3cedf37647 Changes API_KEY_REMOVED action constant to match API_KEY_CREATED 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
c508765310 Fixes linting errors 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
3e760ca0b8 Styles Account and APIKeys components 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
a03eed1603 Copy button copies token to clipboard 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
ed87d4cd26 Aligns AccountView to top of page 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
90f34d7a5a Updates client UI to request token generation from server 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
Andrew Nicolaou
a860762683 Adds passport-http to package-lock.json 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
89babdc8c0 Update test snapshots 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
78695d3983 Improved interface for copying key after creation 2019-05-29 12:51:50 -04:00
Vertmo
4d4f636623 You can now generate keys from the advanced settings interface 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
Andrew Nicolaou
137ea783ea Experiment with "Checks" in Travis output (#1081)
* Run tests on CI

* Create a lint error on purpose

* Splits build into test and deploy stages

lint and test jobs will run in parallel and if both are successful
(and branch is master), deploy will run.

* Revert "Create a lint error on purpose"

This reverts commit 306c91c4278631fa1c1dcd40f0b23f7f9e5f000d.

* Updating snapshot

* Run deploy only on master branch (not PRs)

* Use global deploy config item to avoid building on PRs
2019-05-24 12:16:15 -04:00
Cassie Tarakajian
18239eb2e0
fixes #1065, checks if cmController.getContent is defined (#1071) 2019-05-10 18:26:48 -04:00
Cassie Tarakajian
d4cdd1b790
fixes #1061, sets selected file if it gets unset (#1066) 2019-05-06 14:50:28 -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
Ziyao Wei
10403a7f59 Fix race condition that's causing preview/console and code to be out of sync (#990) (#1031)
* Fix race condition that's causing preview/console and code to be out of sync (#990)

* Refactor

* Fix undefined prop error
2019-05-02 15:30:56 -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
siddhant
538a41c617 Added Loader to indicate loading of sketches (#880)
* Added Loader to indicate loading of sketches

* Fixed styles

* Changed styles

* remove prefixes

* Issues Fixed:

* added Loader

* Refactor

* Issues Fixed

* clean up loader functions
2019-05-01 16:32:39 -04:00
Cassie Tarakajian
870d9ceded
Fixes #760 (#1046)
* fixes #760

* fixes linting errors
2019-05-01 15:38:11 -04:00
Cassie Tarakajian
9d22c3c146
fixes #1057, fullscreen wasn't rendering because clearConsole was not defined (#1058) 2019-05-01 15:31:55 -04:00
Abhishek Kumar
76e4363705 Dialog fixes (#1043)
* Dialog fixes

* Dialog Alignmet Fixed
2019-05-01 14:17:55 -04:00
Ankur Ingale
07b55d7ee4 Fixed Issue #896 (#1049) 2019-04-30 17:44:41 -04:00
Nimish Agrawal
705dd5c796 Focus on find input (#1044) 2019-04-30 17:24:41 -04:00