Skip to content

Commit 35c6230

Browse files
sandershihackerDerekTBrown
sandershihacker
authored and
DerekTBrown
committed
* Updated Schemas * Load Screen * Loading Screen * publish subscribe and dynamic explore page * deleted swap file * publish subscribe * template fixes * added start for reactive publication * template issue * . * . * course_records publish * course_records reactively publish * revert meteor update * publish subscribe and lineheight for searchpage icons * fixed indentation and removed test file * indentation * indentation * Accounts page and fixed random erro * toolbar for mobile devices * toolbar * account.html fixes * Toolbar made responsive * Responsive toolbar fixes * created userlist component * course_records course_id validation * indentation * markdown * import changes * validation addition * Forms Module Deprecated Warning. Issue #110 * indentation * Use routerLink * api changes (#126) * issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * method implementations (#127) * issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * method implementations * course pages now uses Child Routing * deleted LabData class * school name * search function * icon size and #136 * dashboard pull data from database
1 parent c003bb0 commit 35c6230

19 files changed

+336
-294
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
// Export LabList Class
3939
export class LabList extends MeteorComponent {
4040
user: Meteor.User;
41-
courseId: String; // TODO: Get from URL
42-
userId: String = Meteor.userId();
41+
courseId: string; // TODO: Get from URL
42+
userId: string = Meteor.userId();
4343
labs: Array<Object> = [];
4444
courseRecord;
4545

@@ -58,7 +58,7 @@
5858
// Method to subscribe to course_records database and set Lab data
5959
setLab(courseId: String, userId: String) {
6060
this.subscribe('course-records', [courseId, userId], () => {
61-
this.courseRecord = course_records.findOne({ user_id: userId, course_id: courseId });
61+
this.courseRecord = course_records.findOne({ course_id: courseId });
6262
if(typeof this.courseRecord !== "undefined") {
6363
let labs = this.courseRecord.labs;
6464
let totalCompleted = 0;
@@ -69,7 +69,7 @@
6969
let tasks = lab.tasks;
7070
for (let j = 0; j < tasks.length; j++) {
7171
let task = tasks[j];
72-
if (task.status === 'SUCCESS') {
72+
if (task.status === 'COMPLETED') {
7373
tasksCompleted++;
7474
}
7575
}

‎client/imports/ui/components/markdown/markdown.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,5 @@
2020
<!--Markdown-->
2121
<div class="markdown-content">
2222
<div id="task-markdown" [innerHTML]="convertedData">Task loading...</div>
23-
<div class="markdown-check-button">
24-
<md-dialog #alert>
25-
<md-dialog-title>Score: 3/10</md-dialog-title>
26-
Truth be told you may fail the course, perhaps drop it
27-
while you can?
28-
<md-dialog-actions ok="Fine"></md-dialog-actions>
29-
</md-dialog>
30-
<button md-raised-button (click)="alert.show()">
31-
Check
32-
<md-icon fontIcon="tuxicon-tick"></md-icon>
33-
</button>
34-
</div>
3523
</div>
3624
</div>

‎client/imports/ui/pages/course/course.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<a md-button [routerLink]="['/course']">More</a>
2020
<a md-button [routerLink]="['/course']">More</a>
2121
</div>
22+
<md-icon fontIcon="tuxicon-right"></md-icon>
2223
</md-toolbar>
2324
</div>
2425
<!--Course View Content-->

‎client/imports/ui/pages/course/course.routes.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import { RouterConfig } from '@angular/router';
22
import CourseView from './course.ts';
3-
import { GradeView } from './gradeview.ts';
3+
import { CourseGradeList } from './course_gradelist.ts';
4+
import { CourseLabList } from './course_lablist.ts';
5+
import { CourseDashboard } from './course_dashboard.ts';
46
import { LabView } from './labview.ts';
5-
import { MainCourseView } from './mainview.ts';
67

78
export const courseRoutes: RouterConfig = [
89
{
910
path: 'course',
1011
component: CourseView,
1112
children: [
12-
{ path: '', component: MainCourseView },
13-
{ path: 'grades', component: GradeView },
14-
{ path: 'labs', component: LabView }
13+
{ path: '', component: CourseDashboard },
14+
{ path: 'grades', component: CourseGradeList },
15+
{ path: 'labs', component: CourseLabList },
16+
{ path: 'labs/lab', component: LabView }
1517
// { path: '/:courseid', as: 'CourseView', component: CourseView },
1618
// { path: '/:courseid/users', as: 'UserList', component: UserList },
1719
// { path: '/:courseid/user/:userid', as: 'UserView', component: UserView },

‎client/imports/ui/pages/course/mainview.html renamed to ‎client/imports/ui/pages/course/course_dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="tuxlab-maincourseview">
1+
<div class="tuxlab-course-dashboard">
22
<!--Course Description Card-->
33
<a name="description"></a>
44
<md-card>

‎client/imports/ui/pages/course/mainview.ts renamed to ‎client/imports/ui/pages/course/course_dashboard.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import { courses } from "../../../../../collections/courses.ts";
2929
import { course_records } from "../../../../../collections/course_records.ts";
3030

31-
// Define CourseView Component
31+
// Define CourseDashboard Component
3232
@Component({
33-
selector: 'tuxlab-maincourseview',
34-
templateUrl: '/client/imports/ui/pages/course/mainview.html',
33+
selector: 'tuxlab-course-dashboard',
34+
templateUrl: '/client/imports/ui/pages/course/course_dashboard.html',
3535
directives: [
3636
MATERIAL_DIRECTIVES,
3737
MD_ICON_DIRECTIVES,
@@ -44,8 +44,8 @@
4444
encapsulation: ViewEncapsulation.None
4545
})
4646

47-
// Export MainCourseView Class
48-
export class MainCourseView extends MeteorComponent {
47+
// Export CourseDashboard Class
48+
export class CourseDashboard extends MeteorComponent {
4949
course;
5050
courseNumber: String = '15-131'; // TODO: Get from URL
5151
courseDescription: String = "Course Description Not Found";

‎client/imports/ui/pages/course/gradeview.ts renamed to ‎client/imports/ui/pages/course/course_gradelist.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@
2727
import { courses } from "../../../../../collections/courses.ts";
2828
import { course_records } from "../../../../../collections/course_records.ts";
2929

30-
// Define GradeView Component
30+
// Define CourseGradeList Component
3131
@Component({
32-
selector: 'tuxlab-gradeview',
33-
templateUrl: '/client/imports/ui/pages/course/gradeview.html',
32+
selector: 'tuxlab-course-gradelist',
33+
template : `
34+
<div class="tuxlab-course-gradelist">
35+
<tuxlab-gradelist></tuxlab-gradelist>
36+
</div>
37+
`,
3438
directives: [
3539
MATERIAL_DIRECTIVES,
3640
MD_ICON_DIRECTIVES,
@@ -42,8 +46,8 @@
4246
encapsulation: ViewEncapsulation.None
4347
})
4448

45-
// Export GradeView Class
46-
export class GradeView extends MeteorComponent {
49+
// Export CourseGradeList Class
50+
export class CourseGradeList extends MeteorComponent {
4751
constructor(mdIconRegistry: MdIconRegistry) {
4852
super();
4953
// Create Icon Font

‎client/imports/ui/pages/course/course_lablist.ts

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// Meteor Imports
2+
import { Meteor } from 'meteor/meteor';
3+
import { Mongo } from 'meteor/mongo';
4+
import 'reflect-metadata';
5+
import 'zone.js/dist/zone';
6+
7+
// Angular Imports
8+
import { Component, ViewEncapsulation, provide } from '@angular/core';
9+
import { bootstrap } from 'angular2-meteor-auto-bootstrap';
10+
import { APP_BASE_HREF } 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';
14+
15+
// Angular Material Imports
16+
import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
17+
import { MeteorComponent } from 'angular2-meteor';
18+
import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
19+
20+
// Icon
21+
import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
22+
23+
// LabList and Grades import
24+
import { LabList } from "../../components/lablist/lablist.ts";
25+
26+
// Courses and Course Record Imports
27+
import { courses } from "../../../../../collections/courses.ts";
28+
import { course_records } from "../../../../../collections/course_records.ts";
29+
30+
// Define CourseLabList Component
31+
@Component({
32+
selector: 'tuxlab-course-lablist',
33+
template: `
34+
<div class="tuxlab-course-lablist">
35+
<tuxlab-lablist></tuxlab-lablist>
36+
</div>
37+
`,
38+
directives: [
39+
MATERIAL_DIRECTIVES,
40+
MD_ICON_DIRECTIVES,
41+
ROUTER_DIRECTIVES,
42+
LabList
43+
],
44+
viewProviders: [MdIconRegistry],
45+
providers: [OVERLAY_PROVIDERS],
46+
encapsulation: ViewEncapsulation.None
47+
})
48+
49+
// Export CourseLabList Class
50+
export class CourseLabList extends MeteorComponent {
51+
constructor(mdIconRegistry: MdIconRegistry) {
52+
super();
53+
// Create Icon Font
54+
mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
55+
mdIconRegistry.setDefaultFontSetClass('tuxicon');
56+
}
57+
}

‎client/imports/ui/pages/course/gradeview.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎client/imports/ui/pages/course/labview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<div class="tuxlab-labview">
2-
<tuxlab-lablist></tuxlab-lablist>
2+
Single lab here.
33
</div>

‎client/imports/ui/pages/course/labview.ts

Lines changed: 10 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,18 @@
11
// Meteor Imports
2-
import { Meteor } from 'meteor/meteor';
3-
import { Mongo } from 'meteor/mongo';
4-
import 'reflect-metadata';
5-
import 'zone.js/dist/zone';
6-
2+
import { MeteorComponent } from 'angular2-meteor';
3+
74
// Angular Imports
8-
import { Component, ViewEncapsulation, provide } from '@angular/core';
9-
import { bootstrap } from 'angular2-meteor-auto-bootstrap';
10-
import { APP_BASE_HREF } 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';
14-
15-
// Angular Material Imports
16-
import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
17-
import { MeteorComponent } from 'angular2-meteor';
18-
import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
19-
20-
// Icon
21-
import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
22-
23-
// LabList and Grades import
24-
import { LabList } from "../../components/lablist/lablist.ts";
25-
26-
// Courses and Course Record Imports
27-
import { courses } from "../../../../../collections/courses.ts";
28-
import { course_records } from "../../../../../collections/course_records.ts";
5+
import { Component } from '@angular/core';
296

30-
// Define CourseView Component
31-
@Component({
32-
selector: 'tuxlab-labview',
33-
templateUrl: '/client/imports/ui/pages/course/labview.html',
34-
directives: [
35-
MATERIAL_DIRECTIVES,
36-
MD_ICON_DIRECTIVES,
37-
ROUTER_DIRECTIVES,
38-
LabList
39-
],
40-
viewProviders: [MdIconRegistry],
41-
providers: [OVERLAY_PROVIDERS],
42-
encapsulation: ViewEncapsulation.None
43-
})
7+
// Define LabView Component
8+
@Component({
9+
selector: 'tuxlab-labview',
10+
templateUrl: '/client/imports/ui/pages/course/labview.html'
11+
})
4412

4513
// Export LabView Class
4614
export class LabView extends MeteorComponent {
47-
constructor(mdIconRegistry: MdIconRegistry) {
15+
constructor() {
4816
super();
49-
// Create Icon Font
50-
mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
51-
mdIconRegistry.setDefaultFontSetClass('tuxicon');
5217
}
53-
}
18+
}

0 commit comments

Comments
 (0)