learnlinux · DerekTBrown · Jul 14, 2016 · Jul 13, 2016 · Jul 13, 2016 · Jul 13, 2016
diff --git a/.meteor/packages b/.meteor/packages
@@ -4,24 +4,24 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-base             # Packages every Meteor app needs to have
-mobile-experience       # Packages for a great mobile UX
-mongo                   # The database Meteor supports right now
-reactive-var            # Reactive variable for tracker
-tracker                 # Meteor's client-side reactive programming library
+meteor-base@1.0.4             # Packages every Meteor app needs to have
+mobile-experience@1.0.4       # Packages for a great mobile UX
+mongo@1.1.10-beta.12                   # The database Meteor supports right now
+reactive-var@1.0.10            # Reactive variable for tracker
+tracker@1.1.0-beta.12                 # Meteor's client-side reactive programming library
 
-standard-minifier-js    # JS minifier run for production mode
-es5-shim                # ECMAScript 5 compatibility for older browsers.
-ecmascript              # Enable ECMAScript2015+ syntax in app code
+standard-minifier-js@1.1.8-beta.12    # JS minifier run for production mode
+es5-shim@4.6.13-beta.12                # ECMAScript 5 compatibility for older browsers.
+ecmascript@0.5.7-beta.12              # Enable ECMAScript2015+ syntax in app code
 
 angular2-compilers
 barbatus:angular2-runtime
 fourseven:scss
 aldeed:simple-schema
-standard-minifier-css
-accounts-google
-service-configuration
-accounts-base
+standard-minifier-css@1.1.8-beta.12
+accounts-google@1.0.10
+service-configuration@1.0.10
+accounts-base@1.2.9-beta.12
 aldeed:collection2
 anti:gagarin@=0.4.12
 matb33:collection-hooks

diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.3.4.4
+METEOR@1.4-beta.12
diff --git a/.meteor/versions b/.meteor/versions
@@ -1,4 +1,4 @@
-[email protected].8
+[email protected].9-beta.12
 [email protected]
 [email protected]
 aldeed:[email protected]
@@ -11,11 +11,11 @@ [email protected]
 [email protected]
 anti:[email protected]
 [email protected]
-babel-compiler@6.8.4
-[email protected].9_1
+babel-compiler@6.9.0-beta.12
+[email protected].10-beta.12
 barbatus:[email protected]
-barbatus:[email protected].1
-barbatus:typescript-compiler@0.5.12
+barbatus:[email protected].3
+barbatus:typescript-compiler@0.6.1
 barbatus:[email protected]
 [email protected]
 [email protected]
@@ -34,10 +34,10 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-ecmascript@0.4.7
-ecmascript-runtime@0.2.12
+ecmascript@0.5.7-beta.12
+ecmascript-runtime@0.3.12-beta.12
 [email protected]
-es5-shim@4.5.13
+es5-shim@4.6.13-beta.12
 [email protected]
 fourseven:[email protected]_1
 [email protected]
@@ -51,21 +51,21 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-logging@1.0.14
+logging@1.1.14-beta.12
 matb33:[email protected]
 mdg:[email protected]
-meteor@1.1.16
+meteor@1.2.16-beta.12
 [email protected]
-minifier-css@1.1.13
-minifier-js@1.1.13
+minifier-css@1.2.13-beta.12
+minifier-js@1.2.13-beta.12
 [email protected]
 [email protected]
 [email protected]
-modules@0.6.5
-modules-runtime@0.6.5
-[email protected].9_1
+modules@0.7.5-beta.12
+modules-runtime@0.7.5-beta.12
+[email protected].10-beta.12
 [email protected]
-npm-mongo@1.4.45
+npm-mongo@1.5.45-beta.12
 [email protected]
 [email protected]
 [email protected]
@@ -75,7 +75,7 @@ peerlibrary:[email protected]
 peerlibrary:[email protected]
 peerlibrary:[email protected]
 peerlibrary:[email protected]
-promise@0.7.3
+promise@0.8.3-beta.12
 raix:[email protected]
 [email protected]
 [email protected]
@@ -86,13 +86,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-standard-minifier-css@1.0.8
-standard-minifier-js@1.0.8
+standard-minifier-css@1.1.8-beta.12
+standard-minifier-js@1.1.8-beta.12
 [email protected]
 [email protected]
-tracker@1.0.14
+tracker@1.1.0-beta.12
 [email protected]
 [email protected]
 [email protected]
-webapp@1.2.10
+webapp@1.3.10-beta.12
 [email protected]
diff --git a/client/imports/ui/components/explore/explore.ts b/client/imports/ui/components/explore/explore.ts
@@ -1,6 +1,6 @@
 // Meteor Imports
 	import { Meteor } from 'meteor/meteor';
-	import { Mongo }       from 'meteor/mongo';
+	import { Mongo } from 'meteor/mongo';
 	import 'reflect-metadata';
 	import 'zone.js/dist/zone';
 
@@ -22,26 +22,26 @@
 	import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
 
 // Courses Imports
-	import { courses } from "../../../../../collections/courses.ts";
+	import { courses } from '../../../../../collections/courses.ts';
 
 // Define ExploreView Component
 	@Component({
 		selector: 'tuxlab-exploreview',
 		templateUrl: '/client/imports/ui/components/explore/explore.html',
-		directives: [ 
-			MATERIAL_DIRECTIVES, 
-			MD_ICON_DIRECTIVES, 
+		directives: [
+			MATERIAL_DIRECTIVES,
+			MD_ICON_DIRECTIVES,
 			MD_TABS_DIRECTIVES,
 			MD_INPUT_DIRECTIVES,
-			MdToolbar 
+			MdToolbar
 		],
 		viewProviders: [ MdIconRegistry ],
 		encapsulation: ViewEncapsulation.None
 	})
-	
-// Export ExploreView Class 
+
+// Export ExploreView Class
 export class ExploreView extends MeteorComponent {
-		
+
 	courses: Array<any> = [];
 
 	constructor(mdIconRegistry: MdIconRegistry) {
@@ -55,4 +55,3 @@ export class ExploreView extends MeteorComponent {
 		}, true);
 	}
 }
-
diff --git a/client/imports/ui/pages/account/account.ts b/client/imports/ui/pages/account/account.ts
@@ -10,7 +10,6 @@
 
     import { APP_BASE_HREF, FORM_DIRECTIVES } from '@angular/common';
     import { HTTP_PROVIDERS } from '@angular/http';
-    import { RouterLink, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, RouteConfig } from '@angular/router-deprecated';
 
     import { InjectUser } from 'angular2-meteor-accounts-ui';
 
@@ -30,27 +29,27 @@
 @Component({
   selector: 'tuxlab-account',
   templateUrl: '/client/imports/ui/pages/account/account.html',
-  directives: [ 
+  directives: [
     MATERIAL_DIRECTIVES,
     MD_TOOLBAR_DIRECTIVES,
     MD_ICON_DIRECTIVES,
     MD_INPUT_DIRECTIVES,
-    FORM_DIRECTIVES 
+    FORM_DIRECTIVES
   ],
   viewProviders: [ MdIconRegistry ],
   encapsulation: ViewEncapsulation.None
 })
 
-@InjectUser("user")
 // Accounts Class
-export class Account extends MeteorComponent {
+@InjectUser('user')
+export default class Account extends MeteorComponent {
   user: Meteor.User;
 
   constructor(mdIconRegistry: MdIconRegistry) {
-    super();   
+    super();
     // Create Icon Font
     mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
-    mdIconRegistry.setDefaultFontSetClass('tuxicon');  
-    
+    mdIconRegistry.setDefaultFontSetClass('tuxicon');
+
   }
-}    
+}
diff --git a/client/imports/ui/pages/account/login.ts b/client/imports/ui/pages/account/login.ts
@@ -6,20 +6,14 @@
 
 // Angular Imports
   import { Component } from '@angular/core';
-
+  import { Router } from '@angular/router';
   import { APP_BASE_HREF } from '@angular/common';
   import { HTTP_PROVIDERS } from '@angular/http';
 
-  import { LoginButtons } from 'angular2-meteor-accounts-ui'
- // import { RouteParams } from '@angular/router-deprecated';
-
-
 // Angular Material Imports
   import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
   import { MeteorComponent } from 'angular2-meteor';
 
-  import { ROUTER_PROVIDERS, RouterLink, RouteConfig, Router, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
-
   // Icon
   import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon'
 
@@ -28,29 +22,30 @@
   @Component({
     selector: 'tuxlab-login',
     templateUrl: '/client/imports/ui/pages/account/login.html',
-    directives: [LoginButtons,RouterLink, MD_ICON_DIRECTIVES,ROUTER_DIRECTIVES]
+    directives: [MD_ICON_DIRECTIVES]
   })
 
-export class Login extends MeteorComponent {
+export default class Login extends MeteorComponent {
   user: Meteor.User;
 
   constructor(private router: Router) {
-
     super();
   }
 
   login(){
     var slf = this;
+
     Meteor.logout();
     Meteor.loginWithGoogle(function(res){
+
+      // Handle Login Success
       if(!res){
-	      //slf.router.navigate(['Account',{userid: Meteor.user()._id}]);
+	      slf.router.navigate(['account',Meteor.user()._id]);
       }
       else{
-        //slf.router.navigate(['Account',{userid: Meteor.user()._id}]);
+        //TODO Login Error
       }
     });
   }
 
 }
-
diff --git a/client/imports/ui/pages/course/course.ts b/client/imports/ui/pages/course/course.ts
@@ -43,7 +43,7 @@
 	})
 
 // Export CourseView Class
-  export class CourseView extends MeteorComponent {
+  export default class CourseView extends MeteorComponent {
     course;
     courseNumber: String = '15-131'; // TODO: Get from URL
     courseDescription: String = "Course Description Not Found";
@@ -54,10 +54,10 @@
       // Create Icon Font
       mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
       mdIconRegistry.setDefaultFontSetClass('tuxicon');
-      
+
       // Display Course Toolbar
       document.getElementById('course-toolbar').style.display = "block";
-      
+
       // Activate toolbar button
       document.getElementById('toolbar-course').className += " active-button";
 

diff --git a/client/imports/ui/pages/course/gradelist.ts b/client/imports/ui/pages/course/gradelist.ts
@@ -3,24 +3,24 @@
 	import { Mongo } from 'meteor/mongo';
 	import 'reflect-metadata';
 	import 'zone.js/dist/zone';
-	
-// Angular Imports 
+
+// Angular Imports
 	import { Component, ViewEncapsulation, provide } from '@angular/core';
 	import { bootstrap } from 'angular2-meteor-auto-bootstrap';
 	import { APP_BASE_HREF } from '@angular/common';
 	import { HTTP_PROVIDERS } from '@angular/http';
 	import { InjectUser } from 'angular2-meteor-accounts-ui';
-		
+
 // Angular Material Imports
 	import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
 	import { MeteorComponent } from 'angular2-meteor';
 
 // Icon
   	import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
-	
-// Grades import	  
+
+// Grades import
 	import { GradeList } from "../../components/gradelist/gradelist";
-	
+
 // Define GradeView Component
 	@Component({
 		selector: 'tuxlab-gradeview',
@@ -32,20 +32,20 @@
 		encapsulation: ViewEncapsulation.None
 	})
 
-// Export GradeView Class 
-	export class GradeView {
+// Export GradeView Class
+	export default class GradeView {
 
 		constructor(mdIconRegistry: MdIconRegistry) {
 			// Create Icon Font
 			mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
 			mdIconRegistry.setDefaultFontSetClass('tuxicon');
-			
+
 			// Display Course Toolbar
 			document.getElementById('course-toolbar').style.display = "block";
-			
+
 			// Activate toolbar button
 			document.getElementById('toolbar-grades').className += "active-button";
-			
+
 			document.getElementById('tux-content').style.marginTop = "20px";
 		}
-	}
+	}