diff --git a/OGV/.meteor/.finished-upgraders b/OGV/.meteor/.finished-upgraders new file mode 100644 index 00000000..68df3d8d --- /dev/null +++ b/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 diff --git a/OGV/.meteor/.id b/OGV/.meteor/.id new file mode 100644 index 00000000..35cd0959 --- /dev/null +++ b/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 diff --git a/OGV/.meteor/cordova-plugins b/OGV/.meteor/cordova-plugins new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/OGV/.meteor/cordova-plugins @@ -0,0 +1 @@ + diff --git a/OGV/.meteor/packages b/OGV/.meteor/packages index beceb0c3..a74101b8 100644 --- a/OGV/.meteor/packages +++ b/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 + diff --git a/OGV/.meteor/platforms b/OGV/.meteor/platforms new file mode 100644 index 00000000..efeba1b5 --- /dev/null +++ b/OGV/.meteor/platforms @@ -0,0 +1,2 @@ +server +browser diff --git a/OGV/.meteor/release b/OGV/.meteor/release index db5f2c74..87bf4952 100644 --- a/OGV/.meteor/release +++ b/OGV/.meteor/release @@ -1 +1 @@ -0.8.1.3 +METEOR@1.0 diff --git a/OGV/.meteor/versions b/OGV/.meteor/versions new file mode 100644 index 00000000..51424d3d --- /dev/null +++ b/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 diff --git a/OGV/client/views/authentication/forgot_password.js b/OGV/client/views/authentication/forgot_password.js index aeb0a769..46401ddd 100644 --- a/OGV/client/views/authentication/forgot_password.js +++ b/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'); diff --git a/OGV/lib/router.js b/OGV/lib/router.js index 29dc7709..6f829020 100644 --- a/OGV/lib/router.js +++ b/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,8 +92,9 @@ 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()) { @@ -102,7 +102,6 @@ var validateUser = function(pause) { } 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); diff --git a/OGV/public/icons/Chat.png b/OGV/public/icons/Chat.png index 18600857..a35a70ff 100644 Binary files a/OGV/public/icons/Chat.png and b/OGV/public/icons/Chat.png differ diff --git a/OGV/public/icons/Download.png b/OGV/public/icons/Download.png index 006abf48..38b6cd19 100644 Binary files a/OGV/public/icons/Download.png and b/OGV/public/icons/Download.png differ diff --git a/OGV/public/icons/Folder-Cube.png b/OGV/public/icons/Folder-Cube.png index 8208a1a0..bb24070d 100644 Binary files a/OGV/public/icons/Folder-Cube.png and b/OGV/public/icons/Folder-Cube.png differ diff --git a/OGV/public/icons/Link.png b/OGV/public/icons/Link.png index 4ad61256..0a46d254 100644 Binary files a/OGV/public/icons/Link.png and b/OGV/public/icons/Link.png differ diff --git a/OGV/public/icons/Message.png b/OGV/public/icons/Message.png index 6bb66990..60b9bb10 100644 Binary files a/OGV/public/icons/Message.png and b/OGV/public/icons/Message.png differ diff --git a/OGV/public/icons/Settings.png b/OGV/public/icons/Settings.png index efa76bc9..471a15e1 100644 Binary files a/OGV/public/icons/Settings.png and b/OGV/public/icons/Settings.png differ diff --git a/OGV/public/icons/Shape-Heart.png b/OGV/public/icons/Shape-Heart.png index 315d7036..36fc10ad 100644 Binary files a/OGV/public/icons/Shape-Heart.png and b/OGV/public/icons/Shape-Heart.png differ diff --git a/OGV/public/icons/User.png b/OGV/public/icons/User.png index 5fca7aba..cb697cae 100644 Binary files a/OGV/public/icons/User.png and b/OGV/public/icons/User.png differ diff --git a/OGV/public/icons/logout.png b/OGV/public/icons/logout.png index c03e6eb8..cb5375ea 100644 Binary files a/OGV/public/icons/logout.png and b/OGV/public/icons/logout.png differ diff --git a/OGV/public/icons/love.png b/OGV/public/icons/love.png index 8a9c2268..d02ed63a 100644 Binary files a/OGV/public/icons/love.png and b/OGV/public/icons/love.png differ diff --git a/OGV/public/icons/upload-big.png b/OGV/public/icons/upload-big.png index a0f0854d..4d129c91 100644 Binary files a/OGV/public/icons/upload-big.png and b/OGV/public/icons/upload-big.png differ diff --git a/OGV/public/icons/upload.png b/OGV/public/icons/upload.png index 09d2b62a..ab0067a6 100644 Binary files a/OGV/public/icons/upload.png and b/OGV/public/icons/upload.png differ diff --git a/README.md b/README.md index 99613a5d..323efd55 100644 --- a/README.md +++ b/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