change 2

drcoolsanjeev · drcoolsanjeev · commit 0fb5019c4723 · 2018-02-06T13:22:35.000+05:30
diff --git a/codecamp-front/.angular-cli.json b/codecamp-front/.angular-cli.json
@@ -19,8 +19,8 @@
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
-        "styles.css",
-        "../node_modules/bootstrap/dist/css/bootstrap.min.css"
+        "../node_modules/bootstrap/dist/css/bootstrap.min.css",
+        "styles.css"
       ],
       "scripts": [
 
diff --git a/codecamp-front/src/app/app-routing.module.ts b/codecamp-front/src/app/app-routing.module.ts
@@ -13,6 +13,7 @@ import { DiscussComponent } from './components/discuss/discuss.component';
 import { ContestComponent } from './components/contest/contest.component';
 import { AboutComponent } from './components/about/about.component';
 import { IdeComponent } from './components/ide/ide.component';
+import { ProblemsComponent } from './components/problems/problems.component';
 
 
 
@@ -21,16 +22,17 @@ const appRoutes: Routes = [
     {path: 'about', component: AboutComponent},
     {path: 'register' , component: RegisterComponent},
     {path: 'login' , component: LoginComponent},
-    {path: 'practice' , component: PracticeComponent},
+    {path: 'problems' , component: PracticeComponent},
     {path: 'contest' , component: ContestComponent},
     {path: 'discuss' , component: DiscussComponent},
     {path: 'profile' , component: ProfileComponent},
     {path: 'ide', component: IdeComponent},
+    {path: 'problems/:problem', component: ProblemsComponent}
 ];
 
 @NgModule({
   imports: [RouterModule.forRoot(appRoutes)],
   exports: [RouterModule]
 })
-export class AppRoutingModule  {    
-  }
+export class AppRoutingModule  {
+}
diff --git a/codecamp-front/src/app/app.module.ts b/codecamp-front/src/app/app.module.ts
@@ -19,6 +19,7 @@ import { AboutComponent } from './components/about/about.component';
 import { AuthService } from './services/auth.service';
 import { HttpModule } from '@angular/http';
 import { IdeComponent } from './components/ide/ide.component';
+import { ProblemsComponent } from './components/problems/problems.component';
 
 
 @NgModule({
@@ -33,7 +34,8 @@ import { IdeComponent } from './components/ide/ide.component';
     DiscussComponent,
     ContestComponent,
     AboutComponent,
-    IdeComponent
+    IdeComponent,
+    ProblemsComponent
   ],
   imports: [
     BrowserModule,
diff --git a/codecamp-front/src/app/components/contest/contest.component.html b/codecamp-front/src/app/components/contest/contest.component.html
@@ -1,3 +1,7 @@
-<p>
-  contest works!
-</p>
+<div class="container">
+  <div class="row">
+    <div class="col-md-12">
+      <button class="btn btn-warning" *ngIf="authService.checkisAdmin() === true">Add Contest</button>
+    </div>
+  </div>
+</div>
diff --git a/codecamp-front/src/app/components/contest/contest.component.ts b/codecamp-front/src/app/components/contest/contest.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { AuthService } from '../../services/auth.service';
 
 @Component({
   selector: 'app-contest',
@@ -7,7 +8,9 @@ import { Component, OnInit } from '@angular/core';
 })
 export class ContestComponent implements OnInit {
 
-  constructor() { }
+  constructor(
+    private authService: AuthService
+  ) { }
 
   ngOnInit() {
   }
diff --git a/codecamp-front/src/app/components/login/login.component.ts b/codecamp-front/src/app/components/login/login.component.ts
@@ -16,7 +16,7 @@ export class LoginComponent implements OnInit {
     private authService: AuthService,
     private router: Router,
     private formBuilder: FormBuilder
-  ) { 
+  ) {
     this.createForm();
   }
 
@@ -38,12 +38,11 @@ export class LoginComponent implements OnInit {
       username: this.form.get('username').value, // Username input field
       password: this.form.get('password').value // Password input field
     };
+    console.log(user);
     this.authService.loginUser(user).subscribe(data => {
-      this.authService.storeUserData(data.token, data.user);
+      this.authService.storeUserData(data.token, data.user, data.isAdmin);
         // After 2 seconds, redirect to dashboard page
-        setTimeout(() => {
-            this.router.navigate(['/']); // Navigate to dashboard view
-          }, 2000);
+          this.router.navigate(['/']); // Navigate to dashboard view
       });
   }
 }
diff --git a/codecamp-front/src/app/components/navbar/navbar.component.html b/codecamp-front/src/app/components/navbar/navbar.component.html
@@ -26,7 +26,7 @@
       </li>
       <li class="nav-item">
         <a class="nav-link"
-        routerLink="/practice" 
+        routerLink="/problems" 
         routerLinkActive="active"
         >Practice</a>
       </li>
@@ -42,6 +42,12 @@
         routerLinkActive="active"
         >Contest</a>
       </li>
+      <li class="nav-item" >
+          <a class="nav-link"
+          routerLink="/ide" 
+          routerLinkActive="active"
+          >Online IDE</a>
+        </li>
     </ul>
     <ul class="navbar-nav ml-auto">
       <li class="nav-item">
diff --git a/codecamp-front/src/app/components/navbar/navbar.component.ts b/codecamp-front/src/app/components/navbar/navbar.component.ts
@@ -17,4 +17,9 @@ export class NavbarComponent implements OnInit {
   ngOnInit() {
   }
 
+  onLogoutClick() {
+    this.authService.logout(); // Logout user
+    this.router.navigate(['/']); // Navigate back to home page
+  }
+
 }
diff --git a/codecamp-front/src/app/components/practice/practice.component.css b/codecamp-front/src/app/components/practice/practice.component.css
@@ -0,0 +1,22 @@
+p{
+    margin: 8px 0;
+}
+
+.title{
+    padding-top: 10px;
+    background: #343a40;
+    color: white;
+}
+a{
+    color: black;
+    padding: 0;
+}
+
+hr{
+    margin: 0;
+    border: 0.5px solid grey;
+}
+
+.problem{
+    background: white;
+}
diff --git a/codecamp-front/src/app/components/practice/practice.component.html b/codecamp-front/src/app/components/practice/practice.component.html
@@ -1,3 +1,28 @@
-<p>
-  practice works!
-</p>
+<div class="container box">
+  <div class="row title">
+    <div class="col-md-6">
+      <p>Name</p>
+    </div>
+    <div class="col-md-3">
+      <p>Code</p>
+    </div>
+    <div class="col-md-3">
+      <p>Submission</p>
+    </div>
+  </div>
+  <a href="#" class="nav-link">
+  <div class="row problem ">
+    <div class="col-md-6">
+      <p>A puzzle Game</p>
+    </div>
+    <div class="col-md-3">
+      <p>H1</p>
+    </div>
+    <div class="col-md-3">
+      <p>43.43</p>
+    </div>
+  </div>
+  </a>
+</div>
+
+<hr>
diff --git a/codecamp-front/src/app/components/problems/problems.component.css b/codecamp-front/src/app/components/problems/problems.component.css
diff --git a/codecamp-front/src/app/components/problems/problems.component.html b/codecamp-front/src/app/components/problems/problems.component.html
@@ -0,0 +1,3 @@
+<p>
+  problems works!
+</p>
diff --git a/codecamp-front/src/app/components/problems/problems.component.spec.ts b/codecamp-front/src/app/components/problems/problems.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProblemsComponent } from './problems.component';
+
+describe('ProblemsComponent', () => {
+  let component: ProblemsComponent;
+  let fixture: ComponentFixture<ProblemsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProblemsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProblemsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/codecamp-front/src/app/components/problems/problems.component.ts b/codecamp-front/src/app/components/problems/problems.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-problems',
+  templateUrl: './problems.component.html',
+  styleUrls: ['./problems.component.css']
+})
+export class ProblemsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/codecamp-front/src/app/components/register/register.component.html b/codecamp-front/src/app/components/register/register.component.html
@@ -1,10 +1,4 @@
 <div class="container">
-  <div class="row show-hide-message">
-    <div [ngClass]="messageClass">
-      {{ message }}
-    </div>
-  </div>
-
   <form [formGroup]="form" (submit)="onSignupSubmit()">
     <div class="form-group">  
       <label for="name">Name</label>
@@ -109,7 +103,7 @@
     </div>
 
     <input 
-    [disabled]="!form.valid|| processing "
+    [disabled]="!form.valid|| processing  "
     type="submit" class="btn btn-primary" value="Sign up">
   </form>
 </div>
diff --git a/codecamp-front/src/app/services/auth.service.ts b/codecamp-front/src/app/services/auth.service.ts
@@ -11,6 +11,7 @@ export class AuthService {
   user: any;
   domain = 'http://localhost:3000';
   options;
+  isAdmin;
 
   constructor(
   private http: Http
@@ -28,26 +29,38 @@ export class AuthService {
   }
 
   loadToken() {
+<<<<<<< HEAD
     this.authToken = localStorage.getItem('token');
     console.log(this.authToken); // Get token and asssign to variable to be used elsewhere
+=======
+    this.authToken = localStorage.getItem('token'); // Get token and asssign to variable to be used elsewhere
+>>>>>>> 284547cb710a93fde32823f40edc4d4f83454bdd
   }
   registerUser(user) {
     return this.http.post(this.domain + '/users/signup', user)
       .map(res => res.json());
   }
 
   loginUser(user) {
-    this.createAuthenticationHeaders();
-    return this.http.post(this.domain + '/users/signin', user, this.options)
+    return this.http.post(this.domain + '/users/signin', user)
     .map(res => res.json());
   }
 
-  storeUserData(token, user) {
+  storeUserData(token, user, isAdmin) {
 
     localStorage.setItem('token', token); // Set token in local storage
     localStorage.setItem('user', JSON.stringify(user)); // Set user in local storage as string
     this.authToken = token; // Assign token to be used elsewhere
     this.user = user; // Set user to be used elsewhere
+    this.isAdmin = isAdmin;
+  }
+
+  checkisAdmin() {
+    if (this.isAdmin) {
+      return true;
+    } else {
+      return false;
+    }
   }
 
   loggedIn() {
diff --git a/codecamp-front/src/styles.css b/codecamp-front/src/styles.css
@@ -1 +1,22 @@
 /* You can add global styles to this file, and also import other style files */
+body {
+    font-family: arial;
+    background: #f5f5f5;
+}
+
+html, body, ul, ol, li, form, fieldset, legend {
+    margin: 0;
+    padding: 0;
+}
+  
+h1, h2, h3, h4, h5, h6, p {
+  margin-top: 0;
+}
+  
+fieldset, img {
+    border: 0;
+}
+
+.container-fluid{
+    padding: 0;
+}
diff --git a/server/app.js b/server/app.js
@@ -45,7 +45,6 @@ app.use('/problem', problems);
 app.use('/users', users);
 app.use('/solution',solutions)
 
-
 const port = process.env.PORT || 3000;
 app.listen(port);
 console.log('magic is started at ' + port)
diff --git a/server/models/user/user.json b/server/models/user/user.json
@@ -42,6 +42,10 @@
     "bio":{
         "type":"string",
         "default":""
+    },
+    "isAdmin":{
+        "type":"boolean",
+        "default":false
     }
 
 
diff --git a/server/routes/users.js b/server/routes/users.js
@@ -85,8 +85,8 @@ router.post('/signin',(req,res)=>{
                 'success':false,
                 'msg':'User not found'
             })
-        }else if(user){
-            var token = jwt.sign({ username: user.username },'secret', {
+        }else if(user.isAdmin===true){
+            let token = jwt.sign({ username: user.username },'secret', {
                 expiresIn: 86400 // expires in 24 hours
               });
             res.json({
@@ -95,7 +95,22 @@ router.post('/signin',(req,res)=>{
                 'token': token,
                 'user': {
                     username: user.username
-                  }
+                  },
+                  'isAdmin': true
+            }) 
+            }
+        else if(user){
+            let token = jwt.sign({ username: user.username },'secret', {
+                expiresIn: 86400 // expires in 24 hours
+              });
+            res.json({
+                'success':true,
+                'msg':'Successfully logged In',
+                'token': token,
+                'user': {
+                    username: user.username
+                  },
+                  'isAdmin': false
             })
         }
     })

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,9 @@ export class NavbarComponent implements OnInit {`
`17`	`17`	`ngOnInit() {`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ onLogoutClick() {`
	`21`	`+ this.authService.logout(); // Logout user`
	`22`	`+ this.router.navigate(['/']); // Navigate back to home page`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`}`