Wip subscribe

.gitignore

@@ -34,7 +34,7 @@ mup.json
 
 packages_update.py
 
-versions
+# versions
 
 get_file_list.sh
 packages_update.py

.meteor/packages

@@ -1,23 +1,28 @@
+# base vulcan package for comments, posting, all forum functions:
+example-forum
+fourseven:scss@4.10.0
 
 # see http://docs.vulcanjs.org/packages
 
-# Internal dependencies
+vulcan:core
+# vulcan:admin
+# subscribe and notifications manually imported
+vulcan:notifications
+vulcan:subscribe
 dynamic-import
-accounts-password@1.4.0
-fourseven:scss@4.5.0
-
-vulcan:admin@1.7.0
-vulcan:core@1.7.0
-vulcan:posts@1.7.0
-vulcan:comments@1.7.0
-vulcan:voting@1.7.0
-vulcan:accounts@1.7.0
-vulcan:categories@1.7.0
-vulcan:forms@1.7.0
-vulcan:i18n-en-us@1.7.0
-vulcan:notifications@1.7.0
-vulcan:email-templates@1.7.0
-vulcan:subscribe@1.7.0
-
-networkcanvas-styles
-artwells-accounts-guest
+
+############ Language Packages ############
+
+vulcan:i18n-en-us
+
+############ Accounts Packages ############
+
+accounts-password@1.5.1
+# accounts-twitter
+# accounts-facebook
+
+############ Your Packages ############
+
+artwells-accounts-guest-custom
+accounts-ui
+#networkcanvas-styles

.meteor/release

@@ -1 +1 @@
-METEOR@1.5.1
+METEOR@1.8.0.2

.meteor/versions

@@ -1,105 +1,116 @@
-accounts-base@1.3.1
-accounts-password@1.4.0
-allow-deny@1.0.6
-artwells-accounts-guest@0.1.13_1
-autoupdate@1.3.12
-babel-compiler@6.19.4
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
+accounts-base@1.4.3
+accounts-password@1.5.1
+accounts-ui@1.3.1
+accounts-ui-unstyled@1.4.2
+allow-deny@1.1.0
+artwells-accounts-guest-custom@0.1.13_1
+autoupdate@1.5.1
+babel-compiler@7.2.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
 blaze-tools@1.0.10
-boilerplate-generator@1.1.1
+boilerplate-generator@1.6.0
 brettle:accounts-login-state@0.0.4
 brettle:accounts-patch-ui@0.1.3
 buffer@0.0.0
-caching-compiler@1.1.9
-caching-html-compiler@1.0.7
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.3.0
-ddp-client@2.0.0
-ddp-common@1.2.9
+caching-compiler@1.2.1
+caching-html-compiler@1.1.3
+callback-hook@1.1.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.3.3
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.0.0
+ddp-server@2.2.0
 deps@1.0.12
-diff-sequence@1.0.7
-dynamic-import@0.1.1
-ecmascript@0.8.2
-ecmascript-runtime@0.4.1
-ecmascript-runtime-client@0.4.3
-ecmascript-runtime-server@0.4.1
-ejson@1.0.13
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.4
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
+ejson@1.1.0
 email@1.2.3
-fourseven:scss@4.5.4
+es5-shim@4.8.0
+example-forum@1.12.12
+fetch@0.1.0
+fourseven:scss@4.10.0
 geojson-utils@1.0.10
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.2.12
-id-map@1.0.9
-jquery@1.11.10
-livedata@1.0.18
-localstorage@1.1.1
-logging@1.1.17
-meteor@1.7.1
-meteor-base@1.1.0
+http@1.4.2
+id-map@1.1.0
+inter-process-messaging@0.1.0
+jquery@1.11.11
+less@2.8.0
+localstorage@1.2.0
+logging@1.1.20
+meteor@1.9.2
 meteorhacks:inject-initial@1.0.4
 meteorhacks:picker@1.0.3
-minifier-css@1.2.16
-minifier-js@2.1.1
-minimongo@1.2.1
-modules@0.9.2
-modules-runtime@0.8.0
-mongo@1.1.22
-mongo-id@1.0.6
+minifier-css@1.4.1
+minifier-js@2.4.0
+minimongo@1.4.5
+modern-browsers@0.1.3
+modules@0.13.0
+modules-runtime@0.10.3
+mongo@1.6.0
+mongo-decimal@0.1.0
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
 networkcanvas-styles@1.7.0
 npm-bcrypt@0.9.3
-npm-mongo@2.2.30
+npm-mongo@3.1.1
 observe-sequence@1.0.16
-ordered-dict@1.0.9
+ordered-dict@1.1.0
 percolatestudio:synced-cron@1.1.0
-promise@0.8.9
-random@1.0.10
-rate-limit@1.0.8
-reactive-dict@1.1.9
+promise@0.11.2
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.2.1
 reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
+reload@1.2.0
+retry@1.1.0
+routepolicy@1.1.0
+server-render@0.3.1
 service-configuration@1.0.11
-session@1.1.7
+session@1.2.0
 sha@1.0.9
-shell-server@0.2.4
+shell-server@0.4.0
+socket-stream-client@0.2.2
 spacebars@1.0.15
-spacebars-compiler@1.1.2
-srp@1.0.10
-standard-minifier-css@1.3.4
-standard-minifier-js@2.1.1
-standard-minifiers@1.1.0
-templating@1.1.14
+spacebars-compiler@1.1.3
+srp@1.0.12
+standard-minifier-css@1.5.2
+standard-minifier-js@2.4.0
+static-html@1.2.2
+templating@1.2.15
+templating-compiler@1.2.15
+templating-runtime@1.2.15
 templating-tools@1.1.2
-tracker@1.1.3
-ui@1.0.13
+tracker@1.2.0
 underscore@1.0.10
-url@1.1.0
-vulcan:accounts@1.7.0
-vulcan:admin@1.7.0
-vulcan:categories@1.7.0
-vulcan:comments@1.7.0
-vulcan:core@1.7.0
-vulcan:email@1.7.0
-vulcan:email-templates@1.7.0
-vulcan:events@1.7.0
-vulcan:forms@1.7.0
-vulcan:i18n@1.7.0
-vulcan:i18n-en-us@1.7.0
-vulcan:lib@1.7.0
+url@1.2.0
+vulcan:accounts@1.12.16
+vulcan:admin@1.12.16
+vulcan:core@1.12.16
+vulcan:debug@1.12.16
+vulcan:email@1.12.16
+vulcan:embed@1.12.16
+vulcan:events@1.12.16
+vulcan:forms@1.12.16
+vulcan:i18n@1.12.16
+vulcan:i18n-en-us@1.12.16
+vulcan:lib@1.12.16
+vulcan:newsletter@1.12.16
 vulcan:notifications@1.7.0
-vulcan:posts@1.7.0
-vulcan:routing@1.7.0
+vulcan:routing@1.12.16
 vulcan:subscribe@1.7.0
-vulcan:users@1.7.0
-vulcan:voting@1.7.0
-webapp@1.3.17
+vulcan:ui-bootstrap@1.12.16
+vulcan:users@1.12.16
+vulcan:voting@1.12.16
+webapp@1.7.2
 webapp-hashing@1.0.9

.vulcan/prestart_vulcan.js

@@ -0,0 +1,70 @@
+#!/usr/bin/env node
+
+//Functions
+var fs         = require('fs');
+function existsSync(filePath){
+  try{
+    fs.statSync(filePath);
+  }catch(err){
+    if(err.code == 'ENOENT') return false;
+  }
+  return true;
+}
+
+function copySync(origin,target){
+  try{
+    fs.writeFileSync(target, fs.readFileSync(origin));
+  }catch(err){
+    if(err.code == 'ENOENT') return false;
+  }
+  return true;
+}
+
+//Add Definition Colors
+const chalk = require('chalk');
+
+//Vulcan letters
+console.log(chalk.gray(' ___    ___ '));
+console.log(chalk.gray(' '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92)+'  /')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/'));
+console.log(chalk.gray('  '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.gray(String.fromCharCode(92))+chalk.gray('/')+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    Vulcan.js'));
+console.log(chalk.gray('   '+String.fromCharCode(92))+chalk.redBright(String.fromCharCode(92))+chalk.dim.yellow(String.fromCharCode(92))+chalk.dim.yellow('/')+chalk.yellowBright('/')+chalk.gray('/    The full-stack React+GraphQL framework'));
+console.log(chalk.gray('    ────     '));
+
+
+var os = require('os');
+var exec = require('child_process').execSync;
+var options = {
+  encoding: 'utf8'
+};
+//Check Meteor and install if not installed
+var checker = exec("meteor --version", options);
+if (!checker.includes("Meteor ")) {
+console.log("Vulcan requires Meteor but it's not installed. Trying to Install...");
+  //Check platform
+  if (os.platform()=='darwin') {
+    //Mac OS platform
+    console.log("🌋  "+chalk.bold.yellow("Good news you have a Mac and we will install it now! }"));
+    console.log(exec("curl https://install.meteor.com/ | bash", options));
+  } else if (os.platform()=='linux') {
+    //GNU/Linux platform
+    console.log("🌋  "+chalk.bold.yellow("Good news you are on  GNU/Linux platform and we will install Meteor now!"));
+    console.log(exec("curl https://install.meteor.com/ | bash", options));
+  } else if (os.platform()=='win32') {
+    //Windows NT platform
+      console.log(">  "+chalk.bold.yellow("Oh no! you are on a Windows platform and you will need to install Meteor Manually!"));
+      console.log(">  "+chalk.dim.yellow("Meteor for Windows is available at: ")+chalk.redBright("https://install.meteor.com/windows"));
+      process.exit(-1)
+  }
+} else {
+//Check exist file settings and create if not exist
+if (!existsSync("settings.json")) {
+  console.log(">  "+chalk.bold.yellow("Creating your own settings.json file...\n"));
+  if (!copySync("sample_settings.json","settings.json")) {
+    console.log(">  "+chalk.bold.red("Error Creating your own settings.json file...check files and permissions\n"));
+    process.exit(-1);
+  }
+}
+
+  console.log(">  "+chalk.bold.yellow("Happy hacking with Vulcan!"));
+  console.log(">  "+chalk.dim.yellow("The docs are available at: ")+chalk.redBright("http://docs.vulcanjs.org"));
+}

imports/components/account/SwitchableLoginForm.jsx → imports/components/accounts/SwitchableLoginForm.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router';
 import PropTypes from 'prop-types';
-import { Components, registerComponent } from 'meteor/vulcan:core';
+import { Components, replaceComponent, withCurrentUser } from 'meteor/vulcan:core';
 
 const LOGIN_MODE = "login";
 const SIGNUP_MODE = "signup";
@@ -87,4 +87,4 @@ SwitchableLoginForm.propTypes = {
   onComplete: PropTypes.func,
 }
 
-registerComponent('SwitchableLoginForm', SwitchableLoginForm);
+replaceComponent('AccountsLoginForm', SwitchableLoginForm);

imports/components/categories/CategoriesEditForm.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { intlShape } from 'meteor/vulcan:i18n';
-import { Components, registerComponent, getFragment, withMessages } from 'meteor/vulcan:core';
-import Categories from "meteor/vulcan:categories";
+import { Components, registerComponent, withMessages } from 'meteor/vulcan:core';
+import { getFragment } from 'meteor/vulcan:lib';
+import { Categories } from "meteor/example-forum";
 
 const CategoriesEditForm = (props, context) => {