Skip to content

Commit 7c01cc3

Browse files
DerekTBrownDerekTBrown
committed
Upgrade Package Versions (#200)
* Cleaned up packages * Resolving dependencies Bug Fixes (#201) * Cleaned up packages * Resolving dependencies * Bug Fixes
1 parent 6eb26ed commit 7c01cc3

File tree

24 files changed

+198
-374
lines changed

24 files changed

+198
-374
lines changed

‎.meteor/packages

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,30 @@
44
# 'meteor add' and 'meteor remove' will edit this file for you,
55
# but you can also edit it by hand.
66

7-
[email protected] # Packages every Meteor app needs to have
8-
mobile-experience@1.0.4 # Packages for a great mobile UX
7+
## METEOR CORE
8+
meteor-base@1.0.4 # Packages every Meteor app needs to have
99
[email protected] # The database Meteor supports right now
10-
[email protected] # Reactive variable for tracker
11-
[email protected] # Meteor's client-side reactive programming library
12-
13-
[email protected] # JS minifier run for production mode
10+
[email protected] # Reactive variable for tracker
11+
[email protected] # Meteor's client-side reactive programming library
12+
[email protected] # JS minifier run for production mode
1413
[email protected] # ECMAScript 5 compatibility for older browsers.
15-
[email protected] # Enable ECMAScript2015+ syntax in app code
14+
[email protected] # Enable ECMAScript2015+ syntax in app code
15+
16+
## ANGULAR
17+
[email protected] # Compilers for Angular2
18+
barbatus:angular2-runtime # Angular2 Modules for SystemJS
19+
fourseven:scss # SASS Autocompilation
20+
[email protected] # CSS Minifier
21+
22+
## COLLECTIONS
23+
aldeed:collection2 # Collection Schemas
24+
peerlibrary:reactive-publish
25+
matb33:collection-hooks
1626

17-
angular2-compilers
18-
barbatus:angular2-runtime
19-
fourseven:scss
20-
aldeed:simple-schema
21-
[email protected]
27+
## GOOGLE ACCOUNTS
2228
[email protected]
23-
[email protected]
2429
[email protected]
25-
aldeed:collection2
30+
[email protected]
31+
32+
## GAGARIN TESTING
2633
anti:gagarin@=0.4.12
27-
matb33:collection-hooks
28-
peerlibrary:reactive-publish

‎.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[email protected]-beta.14
1+
[email protected]

‎.meteor/versions

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[email protected]-beta.12
1+
[email protected]
22
[email protected]
33
[email protected]
44
aldeed:[email protected]
@@ -8,14 +8,14 @@ aldeed:[email protected]
88
aldeed:[email protected]
99
[email protected]
1010
[email protected]
11-
[email protected].3
11+
[email protected].4
1212
anti:[email protected]
1313
[email protected]
14-
[email protected]-beta.12
15-
[email protected]-beta.12
14+
[email protected]
15+
[email protected]
1616
barbatus:[email protected]
17-
barbatus:[email protected].3
18-
barbatus:[email protected].1
17+
barbatus:[email protected].4_1
18+
barbatus:[email protected].11
1919
barbatus:[email protected]
2020
[email protected]
2121
[email protected]
@@ -26,19 +26,18 @@ [email protected]
2626
[email protected]
2727
[email protected]
2828
[email protected]
29-
[email protected].3
29+
[email protected].4
3030
[email protected]
3131
[email protected]
3232
[email protected]
3333
[email protected]
34-
[email protected].9
34+
[email protected].10
3535
[email protected]
3636
[email protected]
37-
[email protected]-beta.12
38-
[email protected]-beta.12
37+
[email protected]
38+
[email protected]
3939
[email protected]
40-
[email protected]
41-
[email protected]
40+
[email protected]
4241
fourseven:[email protected]_1
4342
[email protected]
4443
[email protected]
@@ -48,24 +47,21 @@ [email protected]
4847
[email protected]
4948
[email protected]
5049
[email protected]
51-
[email protected]
5250
[email protected]
5351
[email protected]
54-
[email protected]-beta.12
55-
matb33:[email protected].1
52+
[email protected]
53+
matb33:[email protected].3
5654
mdg:[email protected]
57-
[email protected]-beta.12
55+
[email protected]
5856
[email protected]
59-
[email protected]-beta.12
60-
[email protected]-beta.12
57+
[email protected]
58+
[email protected]
6159
[email protected]
62-
[email protected]
63-
[email protected]
64-
[email protected]
65-
[email protected]
66-
[email protected]
60+
[email protected]
61+
[email protected]
62+
[email protected]
6763
[email protected]
68-
[email protected]-beta.12
64+
[email protected]
6965
[email protected]
7066
[email protected]
7167
[email protected]
@@ -75,7 +71,7 @@ peerlibrary:[email protected]
7571
peerlibrary:[email protected]
7672
peerlibrary:[email protected]
7773
peerlibrary:[email protected]
78-
[email protected]-beta.12
74+
[email protected]
7975
raix:[email protected]
8076
[email protected]
8177
[email protected]
@@ -86,13 +82,13 @@ [email protected]
8682
[email protected]
8783
[email protected]
8884
[email protected]
89-
[email protected]-beta.12
90-
[email protected]-beta.12
91-
[email protected].13
85+
[email protected]
86+
[email protected]
87+
[email protected].14
9288
[email protected]
93-
[email protected]-beta.12
89+
[email protected]
9490
[email protected]
9591
[email protected]
9692
[email protected]
97-
[email protected]-beta.12
93+
[email protected]
9894
[email protected]

‎client/imports/ui/components/explore/explore.ts

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
// Meteor Imports
22
import { Meteor } from 'meteor/meteor';
3-
import { Mongo } from 'meteor/mongo';
4-
import 'reflect-metadata';
5-
import 'zone.js/dist/zone';
63

74
// Angular Imports
8-
import { Component, ViewEncapsulation, provide } from '@angular/core';
9-
import { bootstrap } from 'angular2-meteor-auto-bootstrap';
10-
import { APP_BASE_HREF, FORM_DIRECTIVES } from '@angular/common';
11-
import { HTTP_PROVIDERS } from '@angular/http';
12-
import { InjectUser } from 'angular2-meteor-accounts-ui';
13-
import { ROUTER_DIRECTIVES } from '@angular/router';
5+
import { Component } from '@angular/core';
146

157
// Angular Material Imports
16-
import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
8+
import { MATERIAL_DIRECTIVES } from 'ng2-material';
179
import { MeteorComponent } from 'angular2-meteor';
18-
import { MD_TABS_DIRECTIVES } from '@angular2-material/tabs'
19-
import { MD_INPUT_DIRECTIVES } from '@angular2-material/input';
20-
import { MdToolbar } from '@angular2-material/toolbar';
21-
22-
// Icon
23-
import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
2410

2511
// Collections
2612
declare var Collections: any;
@@ -30,30 +16,19 @@
3016
selector: 'tuxlab-exploreview',
3117
templateUrl: '/client/imports/ui/components/explore/explore.html',
3218
directives: [
33-
MATERIAL_DIRECTIVES,
34-
MD_ICON_DIRECTIVES,
35-
MD_TABS_DIRECTIVES,
36-
ROUTER_DIRECTIVES,
37-
MD_INPUT_DIRECTIVES,
38-
MdToolbar
19+
MATERIAL_DIRECTIVES
3920
],
40-
viewProviders: [ MdIconRegistry ],
41-
encapsulation: ViewEncapsulation.None
4221
})
4322

4423
// Export ExploreView Class
4524
export class ExploreView extends MeteorComponent {
4625

4726
exploreCourses: Array<any> = [];
4827

49-
constructor(mdIconRegistry: MdIconRegistry) {
28+
constructor() {
5029
super();
51-
// Create Icon Font
52-
mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
53-
mdIconRegistry.setDefaultFontSetClass('tuxicon');
5430

5531
this.subscribe('explore-courses', () => {
56-
this.exploreCourses = Collections.courses.find({ "featured": true }).fetch();
57-
}, true);
32+
this.courses = courses.find().fetch();}, true);
5833
}
5934
}

‎client/imports/ui/components/explore/search.ts

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
// Meteor Imports
22
import { Meteor } from 'meteor/meteor';
3-
import { Mongo } from 'meteor/mongo';
4-
import 'reflect-metadata';
5-
import 'zone.js/dist/zone';
63

74
// Angular Imports
8-
import { Component, ViewEncapsulation, provide, Input } from '@angular/core';
9-
import { bootstrap } from 'angular2-meteor-auto-bootstrap';
10-
import { APP_BASE_HREF, FORM_DIRECTIVES } from '@angular/common';
11-
import { HTTP_PROVIDERS } from '@angular/http';
12-
import { InjectUser } from 'angular2-meteor-accounts-ui';
13-
import { ROUTER_DIRECTIVES } from '@angular/router';
5+
import { Component, Input } from '@angular/core';
146

157
// Angular Material Imports
16-
import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
178
import { MeteorComponent } from 'angular2-meteor';
18-
import { MD_TABS_DIRECTIVES } from '@angular2-material/tabs'
19-
import { MD_INPUT_DIRECTIVES } from '@angular2-material/input';
20-
import { MdToolbar } from '@angular2-material/toolbar';
21-
22-
// Icon
23-
import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
9+
import { MATERIAL_DIRECTIVES } from 'ng2-material';
10+
import { MD_TABS_DIRECTIVES } from '@angular2-material/tabs';
2411

2512
// Courses Database Imports
2613
import { courses } from '../../../../../collections/courses.ts';
@@ -29,35 +16,28 @@
2916
@Component({
3017
selector: 'tuxlab-searchview',
3118
templateUrl: '/client/imports/ui/components/explore/search.html',
32-
directives: [ MATERIAL_DIRECTIVES,
33-
MD_ICON_DIRECTIVES,
34-
MD_TABS_DIRECTIVES,
35-
ROUTER_DIRECTIVES,
36-
MD_INPUT_DIRECTIVES,
37-
MdToolbar
38-
],
39-
viewProviders: [ MdIconRegistry ],
40-
encapsulation: ViewEncapsulation.None
19+
directives: [
20+
MATERIAL_DIRECTIVES,
21+
MD_TABS_DIRECTIVES
22+
]
4123
})
42-
43-
// Export Explore Class
24+
25+
// Export Explore Class
4426
export class SearchView extends MeteorComponent {
4527
@Input() searchQuery;
4628
@Input() searchResults;
4729
@Input() courseCount;
4830
@Input() currentPage;
4931
resultsPerPage = 15;
50-
constructor(mdIconRegistry: MdIconRegistry) {
32+
33+
constructor() {
5134
super();
52-
// Create Icon Font
53-
mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
54-
mdIconRegistry.setDefaultFontSetClass('tuxicon');
5535
}
5636

5737
// Go to next page function
5838
nextPage() {
5939
let self = this;
60-
if (this.currentPage * this.resultsPerPage < this.courseCount) {
40+
if (this.currentPage * this.resultsPerPage < this.courseCount) {
6141
this.currentPage++;
6242
Meteor.call('search_courses', this.searchQuery, this.resultsPerPage, this.currentPage, function(error, result) {
6343
if(error) {
@@ -71,7 +51,7 @@ export class SearchView extends MeteorComponent {
7151
}
7252

7353
// Go to previous page function
74-
prevPage() {
54+
prevPage() {
7555
let self = this;
7656
if(this.currentPage > 1) {
7757
this.currentPage--;
@@ -85,7 +65,7 @@ export class SearchView extends MeteorComponent {
8565
});
8666
}
8767
}
88-
68+
8969
getCurrentInfo() {
9070
var first = ((this.currentPage - 1) * this.resultsPerPage + 1);
9171
var last;
@@ -104,5 +84,5 @@ export class SearchView extends MeteorComponent {
10484
}
10585
return first + "-" + last + " of " + this.courseCount;
10686
}
107-
87+
10888
}

0 commit comments

Comments
 (0)