Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel

This commit is contained in:
SachaG 2017-11-22 09:17:34 +09:00
commit 0ea50dfbcf
3 changed files with 8 additions and 8 deletions

View file

@ -11,7 +11,7 @@ component (if the "component" prop is specified).
import React from 'react';
import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
import Users from 'meteor/vulcan:users';
import PicsNewForm from '../pics/PicsNewForm';
// import PicsNewForm from '../pics/PicsNewForm';
// navigation bar component when the user is logged in
@ -33,7 +33,7 @@ const NavLoggedIn = ({currentUser}) =>
</div>
<Components.ModalTrigger label="Upload">
<PicsNewForm />
<Components.PicsNewForm />
</Components.ModalTrigger>
</div>
@ -71,4 +71,4 @@ const Header = ({currentUser}) =>
</div>
registerComponent('Header', Header, withCurrentUser);
registerComponent('Header', Header, withCurrentUser);

View file

@ -11,7 +11,7 @@ component (if the "component" prop is specified).
import React from 'react';
import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
import Users from 'meteor/vulcan:users';
import PicsNewForm from '../pics/PicsNewForm';
// import PicsNewForm from '../pics/PicsNewForm';
// navigation bar component when the user is logged in
@ -33,7 +33,7 @@ const NavLoggedIn = ({currentUser}) =>
</div>
<Components.ModalTrigger label="Upload">
<PicsNewForm />
<Components.PicsNewForm />
</Components.ModalTrigger>
</div>
@ -71,4 +71,4 @@ const Header = ({currentUser}) =>
</div>
registerComponent('Header', Header, withCurrentUser);
registerComponent('Header', Header, withCurrentUser);

View file

@ -11,7 +11,7 @@ component (if the "component" prop is specified).
import React from 'react';
import { registerComponent, Components, withCurrentUser } from 'meteor/vulcan:core';
import Users from 'meteor/vulcan:users';
import PicsNewForm from '../pics/PicsNewForm';
// import PicsNewForm from '../pics/PicsNewForm';
// navigation bar component when the user is logged in
@ -34,7 +34,7 @@ const NavLoggedIn = ({currentUser}) =>
{Users.canDo(currentUser, 'pics.new') ?
<Components.ModalTrigger label="Upload">
<PicsNewForm />
<Components.PicsNewForm />
</Components.ModalTrigger>
: null
}