updated to fix graphql

cdmbase · cdmbase · commit a86e98dd7206 · 2017-01-06T13:50:45.000-05:00
diff --git a/app/lib/.gitkeep b/app/lib/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/package.json b/app/package.json
@@ -29,9 +29,11 @@
     "express": "^4.14.0",
     "formatjs": "^0.1.1",
     "graphql": "^0.8.2",
+    "graphql-custom-types": "^0.7.1",
     "graphql-schema-collector": "0.2.4",
     "graphql-server-express": "^0.4.3",
-    "graphql-tag": "^1.1.2",
+    "graphql-subscriptions": "^0.2.2",
+    "graphql-tag": "^1.2.1",
     "graphql-tools": "^0.8.4",
     "graphql-typings": "0.0.1-beta-2",
     "intl-locales-supported": "^1.0.0",
@@ -62,6 +64,7 @@
     "react-apollo": "^0.7.0",
     "react-bootstrap": "^0.30.2",
     "react-codemirror": "^0.2.6",
+    "react-cookie": "^1.0.4",
     "react-dom": "^15.2.0",
     "react-ga": "^2.1.2",
     "react-helmet": "^3.1.0",
@@ -93,6 +96,7 @@
     "rxjs": "^5.0.1",
     "sass-loader": "^4.0.0",
     "shortid": "^2.2.6",
+    "subscriptions-transport-ws": "^0.3.1",
     "tracker-component": "^1.3.21",
     "transit-immutable-js": "^0.6.0",
     "transit-js": "^0.8.846",
diff --git a/app/packages/.gitkeep b/app/packages/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/private/.gitkeep b/app/private/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/public/.gitkeep b/app/public/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/app/src/MainApp/client/app/Profile.js b/app/src/MainApp/client/app/Profile.js
@@ -0,0 +1,19 @@
+import React, { PropTypes, Component } from 'react';
+import Tracker from 'tracker-component';
+import { Accounts, STATES } from 'meteor/std:accounts-bootstrap';
+import { browserHistory } from 'react-router';
+import { Meteor } from 'meteor/meteor';
+
+
+export default class Profile extends Tracker.Component {
+
+
+  render() {
+    return (
+            <div className="container">
+                <Accounts.ui.LoginForm fromState={STATES.PROFILE} />
+            </div>
+    );
+  }
+
+}
diff --git a/app/src/MainApp/client/app/layouts/Footer.js b/app/src/MainApp/client/app/layouts/Footer.js
@@ -15,7 +15,7 @@ const AppFooter = () => (
     <FormattedMessage {...messages.madeByHtml} />
     {'\u00a0'}
     <Link to="https://github.com/cdmbase/meter-react-redux-webpack-starter-kit">
-      Meteork Kit
+      Meteor Kit
     </Link>
   </Footer>
 );
diff --git a/app/src/MainApp/client/index.js b/app/src/MainApp/client/index.js
@@ -13,7 +13,7 @@ Accounts.ui.config({
   loginPath: '/signin',
   signUpPath: '/signup',
   resetPasswordPath: '/reset-password',
-  profilePath: '/',
+  profilePath: '/profile',
   minimumPasswordLength: 4,
 });
 
diff --git a/app/src/MainApp/client/routes.js b/app/src/MainApp/client/routes.js
@@ -2,13 +2,14 @@ import { Route, IndexRoute } from 'react-router';
 import { Meteor } from 'meteor/meteor';
 import App from './app/App';
 import Main from './app/Main';
-import Index from './app/Index';
+import Index from './app/index';
 import NotFound from '../imports/ui/components/notfound/NotFoundPage';
 import SignIn from '../imports/ui/components/auth/SignIn';
 import SignUp from '../imports/ui/components/auth/SignUp';
 import SignOut from '../imports/ui/components/auth/SignOut';
 import Docs from '../imports/ui/components/docs/Docs';
 import logger from 'cdm-logger';
+import Profile from 'Main/Profile';
 
 import { getRoutes } from '../../AdminApp/client/routes';
 
@@ -28,7 +29,7 @@ class routes {
    * Only need to inject this on the CLIENT side for lazy loading
    */
   injectStore(store) {
-    logger.debug('Injecting Store', store);
+    logger.debug('Injecting Store and available states are ', store.getState());
     this.store = store;
   }
 
@@ -52,6 +53,7 @@ class routes {
           <Route path="/signin" component={SignIn} />
           <Route path="/signup" component={SignUp} />
           <Route path="/signout" component={SignOut} />
+          <Route path="/profile" component={ Profile } />
           <Route path="/docs" component={Docs} />
         </Route>
         {/* -- Protected Site here --*/}
diff --git a/app/src/MainApp/imports/api/server/graphql/connectors/index.js b/app/src/MainApp/imports/api/server/graphql/connectors/index.js
diff --git a/app/src/MainApp/imports/api/server/graphql/models/index.js b/app/src/MainApp/imports/api/server/graphql/models/index.js
diff --git a/app/src/MainApp/imports/api/server/graphql/resolvers/index.js b/app/src/MainApp/imports/api/server/graphql/resolvers/index.js
@@ -0,0 +1,3 @@
+import userResolvers from './userResolver';
+
+export default userResolvers;
diff --git a/app/src/MainApp/imports/api/server/graphql/resolvers/userResolver.js b/app/src/MainApp/imports/api/server/graphql/resolvers/userResolver.js
@@ -1,7 +1,7 @@
 import { Random } from 'meteor/random';
 import { Meteor } from 'meteor/meteor';
 
-const resolvers = {
+const userResolvers = {
   Query: {
     user(root, args, context) {
       // Only return the current user, for security
@@ -21,10 +21,14 @@ const resolvers = {
       }
     },
   },
+  Subscription: {
+    userAdded(){}
+  },
   User: {
     emails: ({ emails }) => emails,
     randomString: () => Random.id(),
   },
 };
 
-export default resolvers;
+
+export default userResolvers;
diff --git a/app/src/MainApp/imports/api/server/graphql/schema/mutation.graphql b/app/src/MainApp/imports/api/server/graphql/schema/mutation.graphql
diff --git a/app/src/MainApp/imports/api/server/graphql/schema/rootQuery.graphql b/app/src/MainApp/imports/api/server/graphql/schema/rootQuery.graphql
diff --git a/app/src/MainApp/imports/api/server/graphql/schema/schema.graphql b/app/src/MainApp/imports/api/server/graphql/schema/schema.graphql
@@ -1,5 +1,6 @@
 schema {
   query: Query
   mutation: Mutation
+  subscription: Subscription
 }
 
diff --git a/app/src/MainApp/imports/api/server/graphql/schema/subscription.graphql b/app/src/MainApp/imports/api/server/graphql/schema/subscription.graphql
@@ -0,0 +1,3 @@
+type Subscription {
+  userAdded: User
+}
diff --git a/app/src/MainApp/imports/api/server/graphql/schema/user.graphql b/app/src/MainApp/imports/api/server/graphql/schema/user.graphql
@@ -10,5 +10,3 @@ type User {
   randomString: String
   _id: String
 }
-
-
diff --git a/app/src/MainApp/imports/api/server/graphql/subscriptions/index.js b/app/src/MainApp/imports/api/server/graphql/subscriptions/index.js
diff --git a/app/src/MainApp/server/index.js b/app/src/MainApp/server/index.js
@@ -1 +1,9 @@
 import './startup';
+import { Accounts } from 'meteor/accounts-base';
+import logger from 'cdm-logger'
+
+// Accounts.onCreateUser(function (options, user) {
+//     logger.debug("User", user);
+//     user.profile = options.profile || {username: user};
+//     return user;
+// });
diff --git a/app/src/MainApp/server/lib/configureAccountsMeld.js b/app/src/MainApp/server/lib/configureAccountsMeld.js
@@ -0,0 +1,12 @@
+import { Meteor } from 'meteor/meteor';
+import { AccountsMeld } from 'meteor/splendido:accounts-meld';
+
+
+const configureAccountsMeld = () => {
+  AccountsMeld.configure({
+    askBeforeMeld: true,
+  });
+};
+
+
+export default configureAccountsMeld;
diff --git a/app/src/MainApp/server/startup/index.js b/app/src/MainApp/server/startup/index.js
@@ -1,11 +1,14 @@
-import configureService from '../lib/configureService';
-import { Meteor } from 'meteor/meteor';
-import { BrowserPolicy } from 'meteor/browser-policy-common';
-import logger from 'cdm-logger';
-
-const startup = () => {
-  logger.info('configuring login services');
-  configureService();
+import { Meteor } from 'meteor/meteor'
+import {BrowserPolicy} from 'meteor/browser-policy-common'
+import configureService from '../lib/configureService'
+import configureAccountsMeld from '../lib/configureAccountsMeld'
+import logger from 'cdm-logger'
+
+let startup = () => {
+    logger.info("configuring login services");
+    configureService();
+    logger.info("configuring account meld");
+    configureAccountsMeld();
 };
 
 if (Meteor.isServer && process.env.NODE_ENV === 'development') {
diff --git a/app/src/graphql/index.js b/app/src/graphql/index.js
@@ -0,0 +1,6 @@
+import resolvers from './resolvers';
+import schema from './schema';
+import models from './models';
+import { subscriptionManager, pubsub } from './subscriptions';
+
+export { resolvers, schema, subscriptionManager, pubsub, models };
diff --git a/app/src/graphql/models.js b/app/src/graphql/models.js
@@ -0,0 +1,4 @@
+import { merge } from 'lodash';
+
+
+export default merge({});
diff --git a/app/src/graphql/resolvers.js b/app/src/graphql/resolvers.js
@@ -0,0 +1,7 @@
+import { merge } from 'lodash';
+import defaultResolvers from '../MainApp/imports/api/server/graphql/resolvers';
+import logger from 'cdm-logger';
+
+const resolvers = merge(defaultResolvers);
+
+export default resolvers;
diff --git a/app/src/graphql/schema.js b/app/src/graphql/schema.js
@@ -0,0 +1,28 @@
+import { makeExecutableSchema, addMockFunctionsToSchema, addResolveFunctionsToSchema } from 'graphql-tools';
+import logger from 'cdm-logger';
+import loader from 'graphql-schema-collector';
+import resolvers from './resolvers';
+
+const clientLogger = { log: Meteor.bindEnvironment(e => logger.error(e.stack)) };
+let schemaString;
+try {
+  // Schemas strings are automatically resolved
+  schemaString = loader.loadSchema.sync(`${process.env.PWD}/src/**/schema/*.graphql`);
+//  logger.debug('Graphql query loaded!', schemaString);
+} catch (err) {
+  logger.error('Schema Load failure:', err);
+}
+const executableSchema = makeExecutableSchema({
+  typeDefs: [schemaString],
+  resolvers,
+  logger: clientLogger,
+  allowUndefinedInResolve: true, // optional
+  printErrors: true,
+  resolverValidationOptions: {
+    requireResolversForNonNull: true,
+    requireResolversForArgs: true,
+    rejectExtraResolvers: true,
+  }, // optional
+});
+
+export default executableSchema;
diff --git a/app/src/graphql/subscriptions.js b/app/src/graphql/subscriptions.js
@@ -0,0 +1,21 @@
+import { PubSub, SubscriptionManager } from 'graphql-subscriptions';
+import schema from './schema';
+import models from './models';
+
+const pubsub = new PubSub();
+
+const subscriptionManager = new SubscriptionManager({
+  schema,
+  pubsub,
+  // setupFuctions: {
+  //   ideSubscriptions,
+  // },
+  onSubscribe: (msg, params) => {
+    return Object.assign({}, params, {
+      context: models,
+    });
+  },
+
+});
+
+export { subscriptionManager, pubsub };
diff --git a/app/src/routes.js b/app/src/routes.js
diff --git a/app/src/server.js b/app/src/server.js
