hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use Meteor.user() in AppContainer for now

Browse source
This commit is contained in:
Sacha Greif 2016-11-10 10:11:43 +09:00
parent a2f2a2e0fe
commit 4e4c4d0b20
2 changed files with 55 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/nova-base-components/lib/common/App.jsx
View file

@ -16,8 +16,8 @@ class App extends Component {
const {intl} = intlProvider.getChildContext();
return {
currentUser: this.props.data.currentUser,
categories: this.props.data.categories,
currentUser: this.props.currentUser,
categories: this.props.categories,
actions: {call: Meteor.call},
events: this.props.events,
intl: intl

96
packages/nova-base-containers/lib/containers/AppContainer.jsx
View file

@ -5,11 +5,21 @@ import Events from "meteor/nova:events";
import { graphql } from 'react-apollo';
import gql from 'graphql-tag';
import { composeWithTracker } from 'react-komposer';
const currentUserComposer = (props, onData) => {
const data = {
currentUser: Meteor.user()
}
onData(null, data);
}
const AppContainer = (props, context) => {
const {loading, refetch, currentUser, categories} = props.data;
const {loading, refetch, /*currentUser,*/ categories} = props.data;
const currentUser = props.currentUser;
return <Telescope.components.App
ready={!loading}
currentUser={currentUser}
@ -40,47 +50,47 @@ const AppContainerWithData = graphql(gql`
slug
image
}
currentUser {
_id
username
createdAt
isAdmin
nova_bio
nova_commentCount
nova_displayName
nova_downvotedComments {
itemId
power
votedAt
}
nova_downvotedPosts {
itemId
power
votedAt
}
nova_email
nova_emailHash
nova_htmlBio
nova_karma
nova_postCount
nova_slug
nova_twitterUsername
nova_upvotedComments {
itemId
power
votedAt
}
nova_upvotedPosts {
itemId
power
votedAt
}
nova_website
nova_groups
nova_notifications_users
nova_notifications_posts
nova_newsletter_subscribeToNewsletter
}
#currentUser {
# _id
# username
# createdAt
# isAdmin
# nova_bio
# nova_commentCount
# nova_displayName
# nova_downvotedComments {
# itemId
# power
# votedAt
# }
# nova_downvotedPosts {
# itemId
# power
# votedAt
# }
# nova_email
# nova_emailHash
# nova_htmlBio
# nova_karma
# nova_postCount
# nova_slug
# nova_twitterUsername
# nova_upvotedComments {
# itemId
# power
# votedAt
# }
# nova_upvotedPosts {
# itemId
# power
# votedAt
# }
# nova_website
# nova_groups
# nova_notifications_users
# nova_notifications_posts
# nova_newsletter_subscribeToNewsletter
#}
}
`, {
options(ownProps) {
@ -91,4 +101,4 @@ const AppContainerWithData = graphql(gql`
},
})(AppContainer);
module.exports = AppContainerWithData;
module.exports = composeWithTracker(currentUserComposer)(AppContainerWithData);