Add orgs #584
Merged
Add orgs #584
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jordanh
reviewed
Jan 7, 2017
| r.table('Notification').indexWait('orgId', 'parentId', 'userId'), | ||
| r.table('User').indexWait('email', 'orgs', 'billingLeaderOrgs') | ||
| ]; | ||
| await Promise.all(waitIndices); |
There was a problem hiding this comment.
Nice! I was wondering when we were going to need to use this. And, here it is!
jordanh
reviewed
Jan 7, 2017
| socket.setAuthToken(authToken); | ||
| } | ||
| // no need to wait for this, it's just for billing | ||
| r.branch( |
jordanh
reviewed
Jan 7, 2017
| @@ -1,13 +1,13 @@ | |||
| import React, {PropTypes} from 'react'; | |||
| import withStyles from 'universal/styles/withStyles'; | |||
| import {css} from 'aphrodite-local-styles/no-important'; | |||
| import Notifications from 'universal/modules/notifications/containers/Notifications/Notifications'; | |||
| import Toast from 'universal/modules/toast/containers/Toast/Toast'; | |||
There was a problem hiding this comment.
Bless your heart for renaming this.
jordanh
reviewed
Jan 7, 2017
| @@ -2,7 +2,7 @@ import {cashay} from 'cashay'; | |||
| import {removeAuthToken} from 'universal/redux/authDuck'; | |||
| import {reset as resetAppState} from 'universal/redux/rootDuck'; | |||
| import {segmentEventTrack} from 'universal/redux/segmentActions'; | |||
| import {showSuccess} from 'universal/modules/notifications/ducks/notifications'; | |||
| import {showSuccess} from 'universal/modules/toast/ducks/toastDuck'; | |||
|
Wow man. Crazy amount of work in here. Incidentally, I love how you refactored (user|team)DashboardContainer into a single container. Nice work! |
|
@mattkrick updated these:
Going to work on some UI options for updating org avatars. |
# Conflicts: # src/universal/components/FileInput/FileInput.js # src/universal/modules/userDashboard/components/UserSettings/UserSettings.js
Closed
# Conflicts: # package.json # src/universal/decorators/loginWithToken/loginWithToken.js # src/universal/modules/landing/containers/Landing/LandingContainer.js # src/universal/redux/__tests__/AuthEngine-tests.js # src/universal/redux/__tests__/rootDuck-tests.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things left to do:
@ackernaut here are the things i'm stuck on
Designs:
/newteamMatt's to-do:
isPaid === truebefore subscribing to any subscription except notifications (but disregard most/all mutations because we'd rather be performant for the 99% than be slow & stingy towards the 1%)