Nova 1.2.0 🚀

VulcanJS · Mar 8, 2017 · 81c74db · 81c74db
2 parents d195d36 + f43436b
commit 81c74db
Show file tree

Hide file tree

Showing 110 changed files with 612 additions and 597 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -3,11 +3,11 @@
 nova:core                       # core components and wrappers
 nova:forms                      # auto-generated forms
 nova:routing                    # routing and server-side rendering
-nova:email                      # email
 nova:users                      # user management and permissions
 
 ############ Features Packages ############
 
+nova:email
 nova:posts
 nova:comments
 nova:newsletter
@@ -42,4 +42,4 @@ [email protected]
 # accounts-facebook
 
 # customization-demo
-# framework-demo
+framework-demo
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-[email protected]
+[email protected].1
diff --git a/.meteor/versions b/.meteor/versions
@@ -7,16 +7,16 @@ aldeed:[email protected]
 aldeed:[email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].4
+[email protected].5
 [email protected]_4
 [email protected]
 [email protected]
@@ -25,12 +25,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
 fortawesome:[email protected]
 fourseven:[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -50,36 +51,36 @@ [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-[email protected].17
+[email protected].18
 [email protected]
-[email protected].8
+[email protected].9
 [email protected]
 [email protected]
 [email protected]
-nova:api@1.1.0
-nova:base-components@1.1.0
-nova:base-styles@1.1.0
-nova:categories@1.1.0
-nova:comments@1.1.0
-nova:core@1.1.0
-nova:debug@1.1.0
-nova:email@1.1.0
-nova:email-templates@1.1.0
-nova:embedly@1.1.0
-nova:events@1.1.0
-nova:forms@1.1.0
-nova:getting-started@1.1.0
-nova:i18n-en-us@1.1.0
-nova:lib@1.1.0
-nova:newsletter@1.1.0
-nova:notifications@1.1.0
-nova:posts@1.1.0
-nova:routing@1.1.0
-nova:rss@1.1.0
-nova:search@1.1.0
-nova:subscribe@1.1.0
-nova:users@1.1.0
-nova:voting@1.1.0
+nova:api@1.2.0
+nova:base-components@1.2.0
+nova:base-styles@1.2.0
+nova:categories@1.2.0
+nova:comments@1.2.0
+nova:core@1.2.0
+nova:debug@1.2.0
+nova:email@1.2.0
+nova:email-templates@1.2.0
+nova:embedly@1.2.0
+nova:events@1.2.0
+nova:forms@1.2.0
+nova:getting-started@1.2.0
+nova:i18n-en-us@1.2.0
+nova:lib@1.2.0
+nova:newsletter@1.2.0
+nova:notifications@1.2.0
+nova:posts@1.2.0
+nova:routing@1.2.0
+nova:rss@1.2.0
+nova:search@1.2.0
+nova:subscribe@1.2.0
+nova:users@1.2.0
+nova:voting@1.2.0
 [email protected]
 [email protected]_1
 [email protected]
@@ -98,14 +99,14 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-softwarerero:[email protected].6
+softwarerero:[email protected].9
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
-[email protected].2
+[email protected].4
+[email protected].3
 [email protected]
-std:[email protected].18
+std:[email protected].19
 tmeasday:[email protected]
 [email protected]
 [email protected]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nova",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "engines": {
     "npm": "^3.0"
   },
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "analytics-node": "^2.1.1",
-    "apollo-client": "^0.8.1",
+    "apollo-client": "^0.10.1",
     "babel-runtime": "^6.18.0",
     "bcrypt": "^0.8.7",
     "body-parser": "^1.15.2",
@@ -23,12 +23,11 @@
     "express": "^4.14.0",
     "formsy-react": "^0.18.1",
     "formsy-react-components": "^0.8.1",
-    "graphql": "^0.8.2",
+    "graphql": "^0.9.1",
     "graphql-date": "^1.0.2",
-    "graphql-server-express": "^0.4.4",
-    "graphql-subscriptions": "^0.2.1",
-    "graphql-tag": "^1.2.1",
-    "graphql-tools": "^0.9.0",
+    "graphql-server-express": "^0.6.0",
+    "graphql-tag": "^1.2.4",
+    "graphql-tools": "^0.10.1",
     "graphql-type-json": "^0.1.4",
     "handlebars": "^4.0.5",
     "history": "^3.0.0",
@@ -47,7 +46,7 @@
     "optics-agent": "^1.0.5",
     "react": "^15.4.1",
     "react-addons-pure-render-mixin": "^15.4.1",
-    "react-apollo": "^0.9.0",
+    "react-apollo": "^0.13.3",
     "react-bootstrap": "^0.30.7",
     "react-bootstrap-datetimepicker": "0.0.22",
     "react-cookie": "^0.4.6",

diff --git a/packages/framework-demo/client.js b/packages/framework-demo/client.js
diff --git a/packages/framework-demo/lib/client/main.js b/packages/framework-demo/lib/client/main.js
@@ -0,0 +1 @@
+import '../modules/index.js';
diff --git a/packages/framework-demo/lib/components.js b/packages/framework-demo/lib/components.js
diff --git a/...ramework-demo/lib/components/Accounts.jsx → ...work-demo/lib/components/AccountsForm.jsx b/...ramework-demo/lib/components/Accounts.jsx → ...work-demo/lib/components/AccountsForm.jsx
diff --git a/packages/framework-demo/lib/components/MoviesDetails.jsx b/packages/framework-demo/lib/components/MoviesDetails.jsx
@@ -6,9 +6,8 @@ Wrapped with the "withDocument" container.
 */
 
 import React, { PropTypes, Component } from 'react';
-import Movies from '../collection.js';
+import Movies from '../modules/collection.js';
 import { withDocument, registerComponent } from 'meteor/nova:core';
-import gql from 'graphql-tag';
 
 const MoviesDetails = props => {
   const movie = props.document;
@@ -26,24 +25,10 @@ const MoviesDetails = props => {
   }
 }
 
-MoviesDetails.fragment = gql`
-  fragment moviesDetailsFragment on Movie {
-    _id
-    name
-    createdAt
-    year
-    review
-    privateComments
-    user {
-      displayName
-    }
-  }
-`;
-
 const options = {
   collection: Movies,
   queryName: 'moviesSingleQuery',
-  fragment: MoviesDetails.fragment,
+  fragmentName: 'MoviesDetailsFragment',
 };
 
 registerComponent('MoviesDetails', MoviesDetails, withDocument(options));
diff --git a/packages/framework-demo/lib/components/MoviesEditForm.jsx b/packages/framework-demo/lib/components/MoviesEditForm.jsx
@@ -6,21 +6,18 @@ Wrapped with the "withDocument" container.
 */
 
 import React, { PropTypes, Component } from 'react';
-import { Components, registerComponent } from "meteor/nova:core";
-import Movies from '../collection.js';
+import { Components, registerComponent, getFragment } from "meteor/nova:core";
+import Movies from '../modules/collection.js';
 
-const MoviesEditForm = (props, context) => {
-  return (
-    <Components.SmartForm 
-      collection={Movies} 
-      documentId={props.documentId}
-      showRemove={true}
-    />
-  )
-}
-
-MoviesEditForm.contextTypes = {
-  closeCallback: React.PropTypes.func,
-}
+const MoviesEditForm = props =>
+  <Components.SmartForm 
+    collection={Movies} 
+    documentId={props.documentId}
+    mutationFragment={getFragment('MoviesItemFragment')}
+    showRemove={true}
+    successCallback={document => {
+      props.closeModal();
+    }}
+  />
 
 registerComponent('MoviesEditForm', MoviesEditForm);
diff --git a/packages/framework-demo/lib/components/MoviesItem.jsx b/packages/framework-demo/lib/components/MoviesItem.jsx
@@ -7,8 +7,8 @@ Wrapped with the "withCurrentUser" container.
 
 import React, { PropTypes, Component } from 'react';
 import { Button } from 'react-bootstrap';
-import { Components, registerComponent, withCurrentUser, ModalTrigger } from 'meteor/nova:core';
-import Movies from '../collection.js';
+import { Components, registerComponent, ModalTrigger } from 'meteor/nova:core';
+import Movies from '../modules/collection.js';
 
 class MoviesItem extends Component {
 
@@ -63,6 +63,4 @@ class MoviesItem extends Component {
 
 }
 
-MoviesItem.displayName = 'MoviesItem';
-
-registerComponent('MoviesItem', MoviesItem, withCurrentUser);
+registerComponent('MoviesItem', MoviesItem);
diff --git a/packages/framework-demo/lib/components/MoviesList.jsx b/packages/framework-demo/lib/components/MoviesList.jsx
@@ -7,8 +7,7 @@ Wrapped with the "withList" and "withCurrentUser" containers.
 
 import React, { PropTypes, Component } from 'react';
 import { Button } from 'react-bootstrap';
-import gql from 'graphql-tag';
-import Movies from '../collection.js';
+import Movies from '../modules/collection.js';
 import { Components, registerComponent, ModalTrigger, withList, withCurrentUser } from 'meteor/nova:core';
 
 const LoadMore = props => <a href="#" className="load-more button button--primary" onClick={e => {e.preventDefault(); props.loadMore();}}>Load More ({props.count}/{props.totalCount})</a>
@@ -52,25 +51,11 @@ class MoviesList extends Component {
 
 }
 
-MoviesList.displayName = 'MoviesList';
-
-export const MoviesListFragment = gql`
-  fragment moviesItemFragment on Movie {
-    _id
-    name
-    year
-    createdAt
-    user {
-      displayName
-    }
-  }
-`;
-
-const listOptions = {
+const options = {
   collection: Movies,
   queryName: 'moviesListQuery',
-  fragment: MoviesListFragment,
+  fragmentName: 'MoviesItemFragment',
   limit: 5,
 };
 
-registerComponent('MoviesList', MoviesList, withList(listOptions), withCurrentUser);
+registerComponent('MoviesList', MoviesList, withList(options), withCurrentUser);
diff --git a/packages/framework-demo/lib/components/MoviesNewForm.jsx b/packages/framework-demo/lib/components/MoviesNewForm.jsx
@@ -5,21 +5,16 @@ A component to configure the "new movie" form.
 */
 
 import React, { PropTypes, Component } from 'react';
-import Movies from '../collection.js';
-import { MoviesListFragment } from './MoviesList.jsx';
-import { Components, registerComponent, withMessages } from 'meteor/nova:core';
+import Movies from '../modules/collection.js';
+import { Components, registerComponent, withMessages, getFragment } from 'meteor/nova:core';
 
-const MoviesNewForm = (props, context) => {
-  return (
-    <Components.SmartForm 
-      collection={Movies}
-      mutationFragment={MoviesListFragment}
-    />
-  )
-}
-
-MoviesNewForm.contextTypes = {
-  closeCallback: React.PropTypes.func,
-}
+const MoviesNewForm = props =>
+  <Components.SmartForm 
+    collection={Movies}
+    mutationFragment={getFragment('MoviesItemFragment')}
+    successCallback={document => {
+      props.closeModal();
+    }}
+  />
 
 registerComponent('MoviesNewForm', MoviesNewForm, withMessages);
diff --git a/packages/framework-demo/lib/components/MoviesWrapper.jsx b/packages/framework-demo/lib/components/MoviesWrapper.jsx
@@ -7,22 +7,17 @@ Wrapper for the Movies components
 import React, { PropTypes, Component } from 'react';
 import { Components, registerComponent } from 'meteor/nova:core';
 
-class MoviesWrapper extends Component {
-  render() {
-    return (
-      <div className="wrapper framework-demo">
+const MoviesWrapper = () => 
+  <div className="wrapper framework-demo">
 
-        <div className="header">
-          <Components.AccountsForm />
-        </div>        
-        
-        <div className="main">
-          <Components.MoviesList />
-        </div>
+    <div className="header">
+      <Components.AccountsForm />
+    </div>        
+
+    <div className="main">
+      <Components.MoviesList />
+    </div>
 
-      </div>
-    )
-  }
-}
+  </div>
 
 registerComponent('MoviesWrapper', MoviesWrapper);
diff --git a/packages/framework-demo/lib/modules.js b/packages/framework-demo/lib/modules.js