Commit Graph

167 Commits

Author SHA1 Message Date
Cassie Tarakajian e2f8fe7e81 fix merge conflicts 2019-09-25 12:14:52 -04:00
Andrew Nicolaou 0f3ce8e3a2 Collection metadata area layout improvements 2019-09-25 12:10:47 -04:00
Andrew Nicolaou f5356007d3 Enable collection and sketch to be created from dashboard page 2019-09-25 12:10:47 -04:00
Andrew Nicolaou 27804acd6a Add sketch to collection from collection view 2019-09-25 12:09:31 -04:00
Andrew Nicolaou 7f78fda073 Fix sketch list padding in collection view 2019-09-25 12:07:18 -04:00
Andrew Nicolaou 7a1fa663af Edit sketch name/description 2019-09-25 12:07:18 -04:00
Andrew Nicolaou 8781036ac7 WIP Display collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou c57ead4c62 Create Collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou 6ca6e78a28 Displays existing collection
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
2019-09-25 12:06:07 -04:00
Cassie Tarakajian 5c54983c24 add searchbar to sketches dashboard view, adjust sketch list and asset list styling to have sticky header 2019-09-24 17:52:45 -04:00
Cassie Tarakajian 5900e62904 unify navigation for authentication pages, add authorization to front end, fixes #650 2019-09-19 13:38:27 -04:00
Andrew Nicolaou 52e98723f5 Collection metadata area layout improvements 2019-09-18 09:10:10 +02:00
Andrew Nicolaou a93ac48587 Enable collection and sketch to be created from dashboard page 2019-09-17 21:32:54 +02:00
Andrew Nicolaou b980ec7854 Add sketch to collection from collection view 2019-09-17 20:48:37 +02:00
Andrew Nicolaou 709aa8eccb Fix sketch list padding in collection view 2019-09-16 23:13:20 +02:00
Andrew Nicolaou 8b058d8e56 Edit sketch name/description 2019-09-16 23:05:24 +02:00
Cassie Tarakajian 7f2529a973 merge master 2019-09-11 19:05:15 -04:00
Cassie Tarakajian f09e743e92
Merge pull request #1143 from andrewn/feature/standalone-sketches
Standalone sketches and asset page (fixes #1142)
2019-09-11 16:52:39 -04:00
Andrew Nicolaou 125051ccb1 Use Nav with user menu in "dashboard" layout 2019-09-11 20:11:46 +02:00
Andrew Nicolaou 2df3670dc4 WIP Display collection 2019-09-08 19:24:02 +02:00
Andrew Nicolaou dcf65c6f46 Create Collection 2019-09-08 18:06:16 +02:00
Andrew Nicolaou d02a413bf3 Displays existing collection
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
2019-09-08 17:24:46 +02:00
Andrew Nicolaou 8ac95c0084 SketchList and AssetList set page title 2019-09-08 17:10:48 +02:00
Andrew Nicolaou 0ae7a9eebb Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-09-08 16:45:59 +02:00
Andrew Nicolaou 7ea4ae5637 Fix linting errors and warnings 2019-09-08 16:43:16 +02:00
Cassie Tarakajian a155e7638d
re #1153: fix bug in which login form was in invalid state if user had entered username or password incorrectly on the first try (#1155) 2019-09-06 13:30:06 -04:00
Andrew Nicolaou 162d5276f1 Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-08-30 16:15:13 -04:00
Cassie Tarakajian 8054a532d7
Update to webpack 4 (#1145)
* remove some of the react errors, start to fix webpack HMR errors

* start upgrade to webpack 4

* more stuff to update webpack

* update webpack configs to work with webpack 4

* remove linting from truncate script
2019-08-28 16:08:40 -04:00
Andrew Nicolaou 0193ee8297 Standalone sketch list and asset page 2019-08-24 13:37:55 +02:00
Apoorv Taneja 4c1ebdf83d Email Validation added (#1120)
* changes

* changes

* changes

* changes

* changes
2019-07-23 14:16:05 -04:00
Cassie Tarakajian 443232380c fix errors from rebase, again 2019-07-22 17:52:19 -04:00
Vertmo a10e0f0327 You can now generate keys from the advanced settings interface 2019-07-22 17:33:26 -04:00
Cassie Tarakajian ab7ecfc012 fix lingering errors from rebase 2019-07-22 17:22:36 -04:00
Andrew Nicolaou e77cbf4fa3 Changes API_KEY_REMOVED action constant to match API_KEY_CREATED 2019-07-22 16:14:51 -04:00
Vertmo 64caab0702 You can now generate keys from the advanced settings interface 2019-07-22 16:13:59 -04:00
Andrew Nicolaou 4679d6a0bd Show "Back to the editor" in nav on Account view page 2019-06-11 16:24:26 -04:00
Andrew Nicolaou eb4846c3c2 Fix layout on user pages 2019-06-11 16:24:26 -04:00
Andrew Nicolaou 1f95718f58 Page background matches selected theme for user pages 2019-06-11 16:24:26 -04:00
Andrew Nicolaou b16cb26a4b Makes Account view a modal 2019-06-11 16:24:26 -04:00
Andrew Nicolaou 2854aa9235 Extracts tabs into reusable CSS 2019-06-11 16:24:26 -04:00
Andrew Nicolaou 5e74be46fd Adds theme-aware CSS for "user" pages 2019-06-11 16:24:26 -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 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 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
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 3d2a862d9d Added design of the API key page 2019-05-29 12:51:50 -04:00
Apoorv Taneja ac188eb6d9 fixed (#958) 2019-04-17 15:30:50 -04:00
anaplian 319e68ddb6 Fix async validation in signup form (fixes #742) (#746) 2018-10-29 19:33:37 -04:00
Cassie Tarakajian 6705e4c3f8 load client-side environment variables at runtime 2018-08-24 17:41:23 -04:00
Cassie Tarakajian 9efd9c624f fix remaining linting errors 2018-05-08 19:16:05 -07:00
Cassie Tarakajian 617cffc869 fix many linting errors 2018-05-08 19:16:04 -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
Cassie Tarakajian 52b6a6bbb4 minor changes to SCSS styles 2018-04-18 14:00:53 -07:00
Madhurjya Pegu 307091ad3c Solving #553 Addition of google oauth 2.0 for easy login (#608)
* google oauth added

* google credentials 

updated .env description for google oauth

* changes done wrt review
2018-04-18 13:38:02 -07:00
Mr.tang 61560b87f7 Fixes #554 (#559)
* update title

* update titles

* delete unnecessary line
2018-02-23 11:31:41 -05:00
Dhruvdutt Jadhav e7abb55ee7 Fixes #515 Update React to 16 and other dependencies (#519)
* Update to react, react-dom 16.2.0

* Update react-redux

* Update react-tabs

* Update redux-devtools

* Update redux-devtools-dock-monitor

* Update redux-devtools-log-monitor

* Add prop-types package

* Update gitignore

* Update all files to use prop-types package

* Update react-router

* Update react-inlinesvg
2018-02-07 13:06:07 -05:00
Akarshit Wal 20bc8633d7 Login and signup page not visible after login (#431)
* Login and signup page not visible after login

* Redirect added on server side
2017-09-29 11:52:20 -07:00
Andrew Nicolaou 1dc0c22cb7 Email verification (#369)
* Re-introduce Email Verification code

Revert "Revert "Email verification""
This reverts commit d154d8bff259350523a0f139e844db96c43d2ee1.

* Uses MJML to generate Reset Password email

* Sends Password Reset and Email Confirmation emails using MJML template

* Sends verified status along with user data

* API endpoint for resending email verification confirmation

* Displays verification status on Account page and allows resending

* Send back error string

* Passes email address through to sign/verify helper

* Uses enum-style object to set verified state

* Sends minimal info when user verifies since it can be done without login

* Provides /verify UI and sends confirmation token to API

* Better name for JWT secret token env var

* Adds mail config variables to Readme

* Encrypts email address in JWT

The JWT sent as the token in the Confirm Password URL
can be unencoded by anyone, although it's signature can only
be verified by us. To ensure that no passwords are leaked,
we encrypt the email address before creating the token.

* Removes unused mail templates

* Resets verified flag when email is changed and sends another email

* Moves email confirmation functions next to each other

* Extracts random token generator to helper

* Moves email confirmation actions into Redux

- updates the AccountForm label with a message to check inbox
- show status when verifying email token

* Uses generated token stored in DB for email confirmation

* Sets email confirmation status to verified if logging in from Github

* Sends email using new method on account creation

* Fixes linting errors

* Removes replyTo config
2017-06-26 12:48:28 -04:00
Andrew Nicolaou 313fc856d1 Fixes linting errors (#362) 2017-06-05 22:33:32 -04:00
Andrew Nicolaou 7be45ce875 Search for existing user account using Github emails (#337)
* Tries to match user account from list of emails in Github API

Requests the 'user:email' scope from Github which returns the private
emails associated with the user's account.

* Centres GitHub button in layout
2017-04-13 12:04:10 -04:00
Yining Shi fe6acc90e4 Adding User Settings View (#325)
* added account page showing username and email

* change username and email

* validate current password and add new  password

* reject promise with error for reduxForm submit-validation for current password

* updated user reducer to handle setting sucess and server side async

* warning if there is current password but no new password

* fixes logout button

* import validate function, fixes logout style
2017-03-16 18:25:12 -04:00
Andrew Nicolaou 6af92a4a32 Exposes API endpoint URL to client via env variable (#323) 2017-03-16 00:34:14 -04:00
Cassie Tarakajian abbeb7fc60 fi linting to include .jsx files 2017-03-02 15:18:58 -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 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 c8253dd923 #254 test all of the edge cases for autosaving, such as login and logout, changing the autosave preference 2017-01-24 13:04:51 -05:00
Cassie Tarakajian 437f94649f fix minor linting error 2017-01-18 16:50:11 -05:00
Cassie Tarakajian c42de5b2ae add validate session action 2017-01-17 15:37:20 -05:00
Cassie Tarakajian 0a4f56db32 fix signup email regex 2017-01-17 12:42:00 -05:00
Akarshit Wal dee9688ece Use username also to log in (#250)
* Use username also to log in

* Minor changes
2017-01-06 18:14:42 -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 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 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 33c7c0ec8f fix #187 2016-11-04 17:27:39 -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 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
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 73c3e8e21e fixes #102 2016-09-29 22:02:06 -04:00
catarak 7d7641b80b comment out login with github button 2016-09-06 16:53:37 -04:00
catarak fa518f028a fix proptypes for redux forms 2016-09-02 17:41:02 -04:00
catarak d9d7dfa39f add cancel button to login and signup forms 2016-09-02 17:37:34 -04:00
catarak 1d86d766d9 add login error for invalid username or password 2016-09-02 17:31:07 -04:00
catarak 3b6bfbc552 check for duplicate email and username 2016-09-02 14:51:30 -04:00