Merge pull request #19 from olatundeee/development

Added a new sidenav item for viewing user lists and individual user p…

app.js

@@ -45,6 +45,7 @@ app.use('/users', usersRouter);
 app.post('/register', usersRouter);
 app.post('/login', usersRouter);
 app.get('/logout', usersRouter);
+app.post('/create-admin', usersRouter);
 
 // routes for tasks api
 app.get('/all-tasks', tasksRouter);

client/src/app/app-routing.module.ts

@@ -27,6 +27,11 @@ import { ViewEveryTeamComponent } from './view-every-team/view-every-team.compon
 import { ViewAllUserProjectsComponent } from './view-all-user-projects/view-all-user-projects.component';
 import { ViewAllUserTasksComponent } from './view-all-user-tasks/view-all-user-tasks.component';
 import { ViewAllUserTeamsComponent } from './view-all-user-teams/view-all-user-teams.component';
+import { TeamMembersComponent } from './team-members/team-members.component';
+import { UsersComponent } from './users/users.component';
+import { UserListComponent } from './user-list/user-list.component';
+import { ProfileComponent } from './profile/profile.component';
+
 
 // import route guard
 import { AuthGuard } from './guards/auth.guard';
@@ -158,6 +163,27 @@ const routes: Routes = [
           {
             path: 'all-teams',
             component: ViewAllTeamsComponent
+          },
+          {
+            path: 'team-members',
+            component: TeamMembersComponent
+          }
+        ]
+      },
+      {
+        // Route for viewing user information and data
+        path: 'users',
+        component: UsersComponent,
+        children: [
+          {
+            // Route for viewing list of users
+            path: '',
+            component: UserListComponent
+          },
+          {
+            // Route for viewing user profile
+            path: 'profile',
+            component: ProfileComponent
           }
         ]
       }

client/src/app/app.module.ts

@@ -48,6 +48,7 @@ import { TasksService } from './services/tasks.service';
 import { UserService } from './services/user.service';
 import { TeamsService } from './services/teams.service';
 import { TeamMembersComponent } from './team-members/team-members.component';
+import { UserListComponent } from './user-list/user-list.component';
 
 @NgModule({
   declarations: [
@@ -81,7 +82,8 @@ import { TeamMembersComponent } from './team-members/team-members.component';
     ViewAllUserProjectsComponent,
     ViewAllUserTasksComponent,
     ViewAllUserTeamsComponent,
-    TeamMembersComponent
+    TeamMembersComponent,
+    UserListComponent
   ],
   imports: [
     BrowserModule,

client/src/app/login/login.component.ts

@@ -61,11 +61,14 @@ export class LoginComponent implements OnInit {
           localStorage.removeItem('currentUserId');
           localStorage.setItem('currentUserId', r.user._id);
 
-          // if the role of the user returned from the backend is user the navigate to the dashboard area
+          // set the value for current user role in local storage
 
-          if (r.user.role === 'User') {
-            this.router.navigateByUrl('/dashboard');
-          }
+          localStorage.removeItem('currentUserRole');
+          localStorage.setItem('currentUserRole', r.user.role);
+
+          // navigate to the dashboard area
+
+          this.router.navigateByUrl('/dashboard');
         }
       },
       r => {

client/src/app/services/user.service.ts

@@ -79,4 +79,15 @@ export class UserService {
       }
     );
   }
+
+  // update role of the user with username administrator, new role is `administrator`
+
+  makeUserAdmin() {
+    console.log(localStorage.getItem('currentUser'));
+    console.log(localStorage.getItem('currentUserId'));
+
+    // send http request to backend
+
+    return this.http.post('http://localhost:3001/create-admin', {});
+  }
 }

client/src/app/sidenav/sidenav.component.html

@@ -5,4 +5,7 @@
   <li class="collection-item red white-text">
     <a routerLink="/dashboard/projects" class="white-text">Projects</a>
   </li>
+  <li class="collection-item red white-text" *ngIf="isUserAdmin">
+    <a routerLink="/dashboard/users" class="white-text">Users</a>
+  </li>
 </ul>

client/src/app/sidenav/sidenav.component.ts

@@ -7,9 +7,22 @@ import { Component, OnInit } from '@angular/core';
 })
 export class SidenavComponent implements OnInit {
 
+  isUserAdmin;
+
   constructor() { }
 
   ngOnInit() {
+    // get the user role for currently logged in user
+
+    const isAdmin = localStorage.getItem('currentUserRole');
+
+    console.log('User role: ' + isAdmin);
+
+    // if currently logged in user is the administrator, display the users collection list item
+
+    if (isAdmin === 'Administrator') {
+      this.isUserAdmin = true;
+    }
   }
 
 }

client/src/app/user-list/user-list.component.html

@@ -0,0 +1,3 @@
+<p>
+  user-list works!
+</p>

client/src/app/user-list/user-list.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserListComponent } from './user-list.component';
+
+describe('UserListComponent', () => {
+  let component: UserListComponent;
+  let fixture: ComponentFixture<UserListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UserListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

client/src/app/user-list/user-list.component.ts

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { UserService } from '../services/user.service';
+
+@Component({
+  selector: 'app-user-list',
+  templateUrl: './user-list.component.html',
+  styleUrls: ['./user-list.component.css']
+})
+export class UserListComponent implements OnInit {
+
+  constructor(private userService: UserService) { }
+
+  ngOnInit() {
+  }
+
+}

client/src/app/users/users.component.html

@@ -1,3 +1 @@
-<p>
-  users works!
-</p>
+<router-outlet></router-outlet>

client/src/app/view-user-teams/view-user-teams.component.html

@@ -8,7 +8,7 @@
     <a class="btn green lighten-2 add-btn" *ngIf="isNotTeamLead" (click)="joinTeam()">join team</a>
   </div>
   <div class="col l3 m3 s12 center">
-    <a class="btn blue add-btn">team members</a>
+    <a routerLink="/dashboard/teams/team-members" class="btn blue add-btn">team members</a>
   </div>
   <div class="col l3 m3 s12 center">
     <a class="btn green add-btn" routerLink="/dashboard/projects">back to projects list</a>

routes/users.js

@@ -102,4 +102,19 @@ router.get('/logout', function(req, res){
   })
 })
 
+// // update role of the user with username administrator, new role is `administrator`
+
+router.post('/create-admin', function(req, res) {
+  users.updateOne({
+    username: 'administrator'
+  },{ 
+    $set: {
+    role: 'Administrator'
+  }
+}, function(err, user){
+  console.log(user);
+  console.log('Admin role updated');
+})
+})
+
 module.exports = router;