Issue #160, Rename of TaskView to LabView, Enrollable field for explore buttons. (#182)

sandershihacker · DerekTBrown · commit 289428ed5be9 · 2016-07-26T15:25:00.000-04:00
* 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 * fix inappropriate file naming for gradelist and lablist * more templating issues * . * . * markdown default * lablist and gradelist * template changes * explore page changes * delete instructor page * user schema * indentation * indentation * explore publish and taskview sidenav * explore view links to course/courseId * taskview sidenav * taskview * taskview sidenav changes * Extend terminal on small width * . * . * Added UserList Component in Courses * Edit Course * . * course dashboard get courseid from url * delete userlist * input * delete userlist * publish for global admin * Fixed router params * Issue 161 fixed: instructor field in courses * . * fix nextButton * . * Issue #171 * Issue #168 * Issue 160: CourseList * Removed LabView * Enrollable field for buttons on explore pages * TaskView -> LabView
diff --git a/client/imports/ui/components/explore/explore.html b/client/imports/ui/components/explore/explore.html
@@ -15,7 +15,8 @@ <h2>{{ course.course_number }} | {{ course.course_name }}</h2>
             {{ course.course_description.content }}
           </p>
           <div class="course-link">
-            <a md-button [routerLink]="['/course/' + course._id]">Enroll</a>
+            <a md-button [routerLink]="['/course/' + course._id]" *ngIf="course.permissions.content == 'auth'">Enroll</a>
+            <a md-button [routerLink]="['/course/' + course._id]" *ngIf="course.permissions.content == 'any'" >View</a>
           </div>
         </md-content>
       </template>
diff --git a/client/imports/ui/components/explore/search.html b/client/imports/ui/components/explore/search.html
@@ -32,7 +32,8 @@ <h2 id="search-string">Search Results for '{{ searchQuery }}'</h2>
             </div>
           </td>
           <td>
-            <a md-button [routerLink]="['/course/' + course._id]">Enroll</a>
+            <a md-button [routerLink]="['/course/' + course._id]" *ngIf="course.permissions.content == 'auth'" >Enroll</a>
+            <a md-button [routerLink]="['/course/' + course._id]" *ngIf="course.permissions.content == 'any'" >View</a>
           </td>
         </tr>
       </tbody>
diff --git a/client/imports/ui/pages/course/labview.html b/client/imports/ui/pages/course/labview.html
diff --git a/client/imports/ui/pages/course/labview.ts b/client/imports/ui/pages/course/labview.ts
diff --git a/client/imports/ui/pages/courselist/courselist.html b/client/imports/ui/pages/courselist/courselist.html
@@ -0,0 +1,29 @@
+<div class="tuxlab-courselist">
+  <md-card>
+    <md-card-title>
+      <span class="md-headline">Course List</span>
+    </md-card-title>
+    <md-card-content>
+      <md-data-table layout-fill>
+        <thead>
+          <tr>
+            <th class="md-text-cell">Course Number</th>
+            <th class="md-text-cell">Course Name</th>
+            <th>Instructor(s)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let course of courses" (click)="toCourse(course)">
+            <td class="md-text-cell">{{ course.course_number }}</td>
+            <td class="md-text-cell">{{ course.course_name }}</td>
+            <td>
+              <div *ngFor="let instructor of course.instructors">
+                {{ instructor.name }}
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </md-data-table>  
+    </md-card-content>  
+  </md-card>
+</div>
diff --git a/client/imports/ui/pages/courselist/courselist.ts b/client/imports/ui/pages/courselist/courselist.ts
@@ -0,0 +1,41 @@
+// Meteor imports
+  import { Meteor } from 'meteor/meteor';
+  import { Mongo } from 'meteor/mongo';
+
+// Angular Imports
+  import { Component } from '@angular/core'
+  import { ROUTER_DIRECTIVES, Router } from '@angular/router';
+
+// Angular Meteor Imports
+  import { MeteorComponent } from 'angular2-meteor';
+  
+// Angular Material Imports
+  import { MATERIAL_DIRECTIVES } from 'ng2-material';
+
+// Declare Collections
+  declare var Collections: any;
+
+// Define CourseList Component
+  @Component({
+    selector: 'tuxlab-courselist',
+    templateUrl : '/client/imports/ui/pages/courselist/courselist.html',
+    directives: [ 
+      MATERIAL_DIRECTIVES,
+      ROUTER_DIRECTIVES 
+    ] 
+  })
+
+// Export CourseList Class
+  export default class CourseList extends MeteorComponent {
+    courses: Array<Object> = [];
+    constructor(private router: Router) {
+      super();
+      // Subscribe from user courses
+      this.subscribe('user-courses', () => {
+        this.courses = Collections.courses.find().fetch();
+      }, true);
+    }
+    toCourse(course: Object) {
+      this.router.navigate(['/course', (<any>course)._id]);
+    }
+  }
diff --git a/client/imports/ui/pages/dashboard/dashboard.html b/client/imports/ui/pages/dashboard/dashboard.html
@@ -16,7 +16,7 @@
           </a>
         </md-list>
         <div class="more-button">
-          <button md-button>More</button>
+          <a md-button [routerLink]="['/courses']">More</a>
         </div>
       </md-content>
     </div>
diff --git a/client/imports/ui/pages/dashboard/dashboard.ts b/client/imports/ui/pages/dashboard/dashboard.ts
@@ -54,7 +54,7 @@ export default class Dashboard extends MeteorComponent {
     mdIconRegistry.setDefaultFontSetClass('tuxicon');
 
 		this.subscribe('user-courses', () => {
-			this.courses = courses.find().fetch();
+			this.courses = courses.find({}, { limit: 5 }).fetch();
 		}, true);
     this.subscribe('course-records', () => {
       let records = course_records.find().fetch();
diff --git a/client/imports/ui/pages/lab/labview.html b/client/imports/ui/pages/lab/labview.html
@@ -1,7 +1,7 @@
-<div class="tuxlab-taskview">
+<div class="tuxlab-labview">
   
   <!--Markdown View-->
-  <div class="tuxlab-taskview-step">
+  <div class="tuxlab-labview-step">
   
     <md-sidenav-layout>
       <md-sidenav #left [opened]="false" layout-padding>
@@ -61,7 +61,7 @@
   </div>
   
   <!--Terminal View-->
-  <div class="tuxlab-taskview-terminal">
+  <div class="tuxlab-labview-terminal">
 		<terminal></terminal>
   </div>
   
diff --git a/client/imports/ui/pages/lab/labview.ts b/client/imports/ui/pages/lab/labview.ts
@@ -28,11 +28,11 @@
 
 // Meteor method imports
   import "../../../lab/methods.ts"
-// Define TaskView Component
-
+  
+// Define LabView Component
 @Component({
-  selector: 'tuxlab-taskview',
-  templateUrl: '/client/imports/ui/pages/lab/taskview.html',
+  selector: 'tuxlab-labview',
+  templateUrl: '/client/imports/ui/pages/lab/labview.html',
   directives: [
     MarkdownView,
     Terminal,
@@ -49,7 +49,7 @@
 })
 
 @InjectUser('user')
-export default class TaskView extends MeteorComponent {
+export default class LabView extends MeteorComponent {
   user: Meteor.User;
   public auth : any;
   labMarkdown: string;
diff --git a/client/imports/ui/routes/course.routes.ts b/client/imports/ui/routes/course.routes.ts
@@ -11,8 +11,8 @@ import { CourseGuardRecord } from './course.guard.record.ts';
 import { GradeList } from '../pages/course/gradelist.ts';
 import { LabList } from '../pages/course/lablist.ts';
 import { CourseDashboard } from '../pages/course/course_dashboard.ts';
-import { LabView } from '../pages/course/labview.ts';
 import { GradeView } from '../pages/course/gradeview.ts';
+import LabView from '../pages/lab/labview.ts';
 
 export const courseRoutes: RouterConfig = [
   {
diff --git a/client/imports/ui/routes/routes.ts b/client/imports/ui/routes/routes.ts
@@ -15,13 +15,15 @@ import { provideRouter, RouterConfig } from '@angular/router';
   import ErrorPage from '../pages/error/error.ts'
 
   // Lab
-  import TaskView from '../pages/lab/taskview.ts';
   import LabCreate from '../pages/lab/labcreate.ts'
 
   // Course
   import { courseRoutes } from './course.routes.ts';
   import { CourseGuardRecord } from './course.guard.record.ts';
 
+  // Course List
+  import CourseList from '../pages/courselist/courselist.ts';
+
   // Explore
   import Explore from '../pages/explore/explore.ts';
 
@@ -38,7 +40,9 @@ const routes : RouterConfig = [
   { path: 'login', component: Login },
   { path: 'terms', component: Terms },
   { path: 'privacy', component: Privacy },
+  { path: 'lab-create', component: LabCreate },
   { path: 'explore', component: Explore },
+  { path: 'courses', component: CourseList },
   { path: 'error/:code', component: ErrorPage },
   { path: '**', component: ErrorPage }
 ]
diff --git a/client/style/account/_login.scss b/client/style/account/_login.scss
@@ -29,7 +29,7 @@
 
   .google-login-button{
     margin:0 auto !important;
-
+    cursor: pointer;
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
diff --git a/client/style/courselist/_courselist.scss b/client/style/courselist/_courselist.scss
@@ -0,0 +1,10 @@
+.tuxlab-courselist {
+  max-width: $tuxlab-max-width;
+  margin: 0 auto;
+  width: 100%;
+  tbody {
+    tr {
+      cursor: pointer;
+    }
+  }
+}
diff --git a/client/style/lab/_labview.scss b/client/style/lab/_labview.scss
@@ -1,9 +1,9 @@
-.tuxlab-taskview {
+.tuxlab-labview {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
 
-  .tuxlab-taskview-terminal{
+  .tuxlab-labview-terminal{
     height: 100vh;
     width: 50%;
 
@@ -52,7 +52,7 @@
   /**
   Markdown
   **/
-  .tuxlab-taskview-step{
+  .tuxlab-labview-step{
     width: 50%;
     md-sidenav-layout {
       height: 100vh;
diff --git a/client/style/tuxlab.scss b/client/style/tuxlab.scss
@@ -25,6 +25,9 @@
 // Course Packages
 @import "{}/client/style/course/_courseview.scss";
 
+// Courselist Packages
+@import "{}/client/style/courselist/_courselist.scss";
+
 // Dashboard Packages
 @import "{}/client/style/dashboard/_dashboard.scss";
 
diff --git a/client/tuxlab.html b/client/tuxlab.html
@@ -49,7 +49,7 @@
             <div class="tux-toolbar-nav">
               <a md-button [routerLink]="['/']"> Dashboard </a>
               <a md-button [routerLink]="['/explore']"> Explore </a>
-              <a md-button [routerLink]="['/']"> Courses </a>
+              <a md-button [routerLink]="['/courses']"> Courses </a>
             </div>
             <span flex></span>
             <!-- Profile Dropdown -->
@@ -73,7 +73,7 @@ <h2> {{ user.profile.school }} </h2>
         <div class="mobile-toolbar-buttons">
           <a [routerLink]="['/']"><md-icon fontIcon="tuxicon-home"></md-icon></a>
           <a [routerLink]="['/explore']"><md-icon fontIcon="tuxicon-wire"></md-icon></a>
-          <a [routerLink]="['/']"><md-icon fontIcon="tuxicon-book"></md-icon></a>
+          <a [routerLink]="['/courses']"><md-icon fontIcon="tuxicon-book"></md-icon></a>
           <a (click)="right.toggle()" *ngIf="user">
             <md-icon fontIcon="tuxicon-person"></md-icon>
           </a>
diff --git a/server/imports/course/search.ts b/server/imports/course/search.ts
@@ -29,7 +29,8 @@ export function course_search(text : string, results_per_page : number, page_no
         "course_number" : 1,
         "course_name" : 1,
         "instructors" : 1,
-        "course_description" : 1
+        "course_description" : 1,
+        "permissions" : 1
       }
      };
    async.parallel(

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import { CourseGuardRecord } from './course.guard.record.ts';`
`11`	`11`	`import { GradeList } from '../pages/course/gradelist.ts';`
`12`	`12`	`import { LabList } from '../pages/course/lablist.ts';`
`13`	`13`	`import { CourseDashboard } from '../pages/course/course_dashboard.ts';`
`14`		`-import { LabView } from '../pages/course/labview.ts';`
`15`	`14`	`import { GradeView } from '../pages/course/gradeview.ts';`
	`15`	`+import LabView from '../pages/lab/labview.ts';`
`16`	`16`
`17`	`17`	`export const courseRoutes: RouterConfig = [`
`18`	`18`	`{`