Modifications/commits

OGV/.meteor/.finished-upgraders

@@ -0,0 +1,7 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file

OGV/.meteor/.id

@@ -0,0 +1,7 @@
+# This file contains a token that is unique to your project.
+# Check it into your repository along with the rest of this directory.
+# It can be used for purposes such as:
+#   - ensuring you don't accidentally deploy one app on top of another
+#   - providing package authors with aggregated statistics
+
+7wsm8s16lskrlihi2vj

OGV/.meteor/cordova-plugins

@@ -0,0 +1 @@
+

OGV/.meteor/packages

@@ -1,17 +1,13 @@
-# Meteor packages used by this project, one per line.
-#
-# 'meteor add' and 'meteor remove' will edit this file for you,
-# but you can also edit it by hand.
-
 standard-app-packages
 accounts-password
+iron:router
+cfs:collection-filters
+cfs:standard-packages
+cfs:ui
+alanning:roles
+cfs:filesystem
 bootstrap
-email
-ogv-threejs
-iron-router
-collectionFS
-cfs-filesystem
-Dropzonejs
-ui-dropped-event
-cfs-ui
-roles
+ishwerdas:ogv-threejs
+dbarrett:dropzonejs
+raix:ui-dropped-event
+

OGV/.meteor/platforms

@@ -0,0 +1,2 @@
+server
+browser

OGV/.meteor/release

@@ -1 +1 @@
-0.8.1.3
+METEOR@1.0

OGV/.meteor/versions

@@ -0,0 +1,92 @@
+accounts-base@1.1.2
+accounts-password@1.0.4
+alanning:roles@1.2.13
+application-configuration@1.0.3
+autoupdate@1.1.3
+base64@1.0.1
+binary-heap@1.0.1
+blaze-tools@1.0.1
+blaze@2.0.3
+boilerplate-generator@1.0.1
+bootstrap@1.0.1
+callback-hook@1.0.1
+cfs:access-point@0.0.0
+cfs:base-package@0.0.0
+cfs:collection-filters@0.0.0
+cfs:collection@0.0.0
+cfs:data-man@0.0.0
+cfs:file@0.0.0
+cfs:filesystem@0.0.0
+cfs:http-methods@0.0.24
+cfs:http-publish@0.0.0
+cfs:power-queue@0.0.1
+cfs:reactive-list@0.0.0
+cfs:reactive-property@0.0.0
+cfs:standard-packages@0.0.2
+cfs:storage-adapter@0.0.0
+cfs:tempstore@0.0.2
+cfs:ui@0.0.0
+cfs:upload-http@0.0.2
+cfs:worker@0.0.0
+check@1.0.2
+ctl-helper@1.0.4
+ctl@1.0.2
+dbarrett:dropzonejs@3.10.3
+ddp@1.0.11
+deps@1.0.5
+ejson@1.0.4
+email@1.0.4
+fastclick@1.0.1
+follower-livedata@1.0.2
+geojson-utils@1.0.1
+html-tools@1.0.2
+htmljs@1.0.2
+http@1.0.8
+id-map@1.0.1
+iron:controller@1.0.0
+iron:core@1.0.0
+iron:dynamic-template@1.0.0
+iron:layout@1.0.0
+iron:location@1.0.1
+iron:middleware-stack@1.0.0
+iron:router@1.0.1
+iron:url@1.0.0
+ishwerdas:ogv-threejs@1.0.1
+jquery@1.0.1
+json@1.0.1
+launch-screen@1.0.0
+livedata@1.0.11
+localstorage@1.0.1
+logging@1.0.5
+meteor-platform@1.2.0
+meteor@1.1.3
+minifiers@1.1.2
+minimongo@1.0.5
+mobile-status-bar@1.0.1
+mongo-livedata@1.0.6
+mongo@1.0.8
+npm-bcrypt@0.7.7
+observe-sequence@1.0.3
+ordered-dict@1.0.1
+raix:eventemitter@0.0.1
+raix:ui-dropped-event@0.0.7
+random@1.0.1
+reactive-dict@1.0.4
+reactive-var@1.0.3
+reload@1.1.1
+retry@1.0.1
+routepolicy@1.0.2
+service-configuration@1.0.2
+session@1.0.4
+sha@1.0.1
+spacebars-compiler@1.0.3
+spacebars@1.0.3
+srp@1.0.1
+standard-app-packages@1.0.3
+templating@1.0.9
+tracker@1.0.3
+ui@1.0.4
+underscore@1.0.1
+url@1.0.2
+webapp-hashing@1.0.1
+webapp@1.1.4

OGV/client/views/authentication/forgot_password.js

@@ -44,6 +44,7 @@ Template.forgotPassword.events({
 	    isEmail(email)) {
 	    Accounts.forgotPassword({email:email},function(err){
 		if (err) {
+			clearNotifications();
 		    throwError(err.reason);
 	        } else {
 		    throwNotification('Email Sent, Please check your mailbox to reset your password');

OGV/lib/router.js

@@ -50,7 +50,6 @@ Router.map(function() {
     this.route('cfsUploader', {path : 'upload'});
     this.route('notVerified', {path : 'not-verified'});
     this.route('forgotPassword', {path : 'forgot-password'});
-    this.route('filemanager', {path : 'filemanager'});
     this.route('dashboard',{
 	path: 'dashboard',
 	waitOn: function() {
@@ -93,16 +92,16 @@ Router.map(function() {
 var validateUser = function(pause) {
     if (Meteor.user()) {
 	if (Meteor.user().emails[0].verified) {
-	    this.render();
-	} else {
+	    this.next();
+	}
+	 else {
 	    this.render('notVerified');
         }
     } else if (Meteor.loggingIn()) {
 	this.render('preloader');
     } else {
 	this.render('logIn');
     }
-    pause();
 }
 
 
@@ -113,11 +112,10 @@ var validateUser = function(pause) {
 var actionReady = function(pause) 
 {
     if (this.ready()) {
-	this.render();
+	this.next();
     } else {
-	this.render('preloader'); 
+	this.render('preloader');
     }
-    pause();
 }
 
 /**
@@ -129,16 +127,15 @@ var loggingIn = function(pause) {
 	this.render('preloader');
     }
     else {
-	this.render();
+	this.next();
     }
-    pause();
 }
 
 /**
  * Remove notifactions and error messages that have been seen
  * everytime a route is changed 
 */
-Router.onBeforeAction(function() { clearNotifications(); });
+Router.onBeforeAction(function() { clearNotifications(); this.next(); });
 Router.onBeforeAction(validateUser,{only:['cfsUploader','filemanager','dashboard','modelMeta']});
 Router.onBeforeAction(actionReady, {only:['index', 'modelViewer']});
 Router.onBeforeAction(loggingIn);

README.md

@@ -1,4 +1,41 @@
-OGV-meteor
-==========
+# Online Geometry Viewer
+
+Online Geometry Viewer is an online web application, where users can upload, view
+and share 3D CAD models. They can also host these models online, can like (love)
+or comment on them. In a nutshell it can be looked at as a social blogging 
+platform for 3D models. 
+
+----------------------
+#Installation Steps
+#### Debian and Ubuntu based Linux distributions
+
+* Install Nodejs :
+
+  * sudo apt-get install python-software-properties python g++ make
+  * sudo add-apt-repository ppa:chris-lea/node.js
+  * sudo apt-get update
+  * sudo apt-get install nodejs
+
+* Install mongoDB
+
+  * sudo apt-get install mongodb
+
+* Install Meteor
+
+  * sudo apt-get install curl
+  * curl https://install.meteor.com/ | sh
+
+* Clone the OGV Repository
+
+  * sudo apt-get install git
+  * git clone https://github.com/BRL-CAD/OGV-meteor
+
+* Run OGV
+
+  * cd OGV-meteor/OGV
+  * meteor
+
+* Open Browser and type in URL
+
+  * http://localhost:3000
 
-Port of BRL-CAD's OGV to meteor