when everything was normal

pranaysashank · Sep 9, 2016 · 20a9bf7 · 20a9bf7
1 parent cd4ce2c
commit 20a9bf7
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 58 deletions.
diff --git a/app/app.module.js b/app/app.module.js
diff --git a/app/app.module.js.map b/app/app.module.js.map
diff --git a/app/app.module.ts b/app/app.module.ts
@@ -14,11 +14,14 @@ import {AuthService} from "./login/auth.service";
 import {LoggedOutGuard} from "./login/logged-out.guard";
 import {MenuComponent} from "./menu/menu.component";
 import {ProfileComponent} from "./user/profile/profile.component";
+import {CoursesComponent} from "./user/courses/courses.component";
+import {PostsComponent} from "./user/posts/posts.component";
+import {PostsService} from "./user/posts/posts.service";
 
 @NgModule({
     imports: [BrowserModule, FormsModule, routing, HttpModule],
-    declarations: [AppComponent, UserComponent, LoginComponent, MenuComponent, ProfileComponent, KeysPipe],
-    providers: [UserService, LoggedInGuard, AuthService, LoggedOutGuard],
+    declarations: [AppComponent, UserComponent, LoginComponent, MenuComponent, ProfileComponent, CoursesComponent, PostsComponent, KeysPipe],
+    providers: [UserService, PostsService, LoggedInGuard, AuthService, LoggedOutGuard],
     bootstrap: [ AppComponent ]
 })
 export class AppModule {

diff --git a/app/app.routing.js b/app/app.routing.js
diff --git a/app/app.routing.js.map b/app/app.routing.js.map
diff --git a/app/app.routing.ts b/app/app.routing.ts
@@ -5,6 +5,7 @@ import {LoginComponent} from "./login/login.component";
 import {LoggedInGuard} from "./login/logged-in.guard";
 import {LoggedOutGuard} from "./login/logged-out.guard";
 import {ProfileComponent} from "./user/profile/profile.component";
+import {CoursesComponent} from "./user/courses/courses.component";
 /**
  * Created by Pranay Sashank on 9/4/2016.
  */
@@ -26,6 +27,11 @@ const appRoutes : Routes = [
         path: 'profile',
         component: ProfileComponent,
         canActivate: [LoggedInGuard]
+    },
+    {
+        path: 'courses',
+        component: CoursesComponent,
+        canActivate: [LoggedInGuard]
     }
 ]
 

diff --git a/app/login/login.component.html b/app/login/login.component.html
@@ -13,7 +13,7 @@ <h2 class="ui header">
                 <div class="field">
                     <input name="password" type="password" placeholder="password" required>
                 </div>
-                <button class="ui fluid large submit primary button">Login</button>
+                <button class="ui fluid large submit primary button"><i class="unlock alternate icon"></i>Login</button>
             </div>
         </form>
     </div>

diff --git a/app/menu/menu.component.html b/app/menu/menu.component.html
@@ -5,6 +5,7 @@
                 Upbeat
             </a>
             <div class="right item">
+                <a class="ui secondary button" routerLink="/courses" routerLinkActive="active">Courses</a>
                 <a class="ui secondary button" routerLink="/profile" routerLinkActive="active">Profile</a>
                 <button class="ui negative button" (click)="logout();">Logout</button>
             </div>

diff --git a/app/posts.component.js b/app/posts.component.js
diff --git a/app/posts.component.js.map b/app/posts.component.js.map
diff --git a/app/posts.component.ts b/app/posts.component.ts
diff --git a/app/user/profile/profile.component.html b/app/user/profile/profile.component.html
@@ -2,9 +2,25 @@
 <p *ngFor="let key of user['Personal Details'] | keys" class="ui segment" (click)="gotoCourse()">
     {{key}}:{{user['Personal Details'][key]}}
 </p>
-<div *ngFor="let key of user['Attendance_Dates'] | keys">
-    {{key}}
-<p *ngFor="let days of key | keys">
-    {{days}}
-</p>
-</div>
+<table>
+    <thead>
+    <tr>
+        <th>Attendance Date</th>
+        <th>P1 (9:40 - 10:30)</th>
+        <th>P2 (10:30 - 11:20)</th>
+        <th>P3 (11:20 - 12:10)</th>
+        <th>P4 (12:10 - 1:00)</th>
+        <th>P5 (1:40 - 2:30)</th>
+        <th>P6 (2:30 - 3:20)</th>
+        <th>P7 (3:20 - 4:10)</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr *ngFor="let key of user['Attendance_Dates'] | keys">
+        <td>{{key}}</td>
+        <td *ngFor="let days of user['Attendance_Dates'][key] | keys">
+            {{days}}
+        </td>
+    </tr>
+    </tbody>
+</table>
diff --git a/app/user/user.component.js b/app/user/user.component.js
diff --git a/app/user/user.component.js.map b/app/user/user.component.js.map
diff --git a/app/user/user.component.ts b/app/user/user.component.ts
@@ -4,7 +4,9 @@ import {AuthService} from "../login/auth.service";
 
 @Component({
     selector: 'user',
-    templateUrl: 'app/user/user.component.html',
+    template: `
+    <div class="ui main container"><posts></posts></div>`,
+    // templateUrl: 'app/user/user.component.html',
     styleUrls: ['app/user/user.component.css']
 })
 export class UserComponent implements OnInit {