changed in ranking.js

Author: shivkumar5

codecamp-front/package-lock.json

@@ -31,6 +31,7 @@
     "jquery": "3.3.1",
     "jquery-slimscroll": "1.3.8",
     "ng2-ace-editor": "0.3.4",
+    "ng2-date-countdown": "0.0.5",
     "ng2-file-upload": "1.3.0",
     "ngx-progressbar": "2.1.1",
     "popper.js": "1.12.9",

codecamp-front/package.json

@@ -41,6 +41,7 @@ import { NgProgressModule, NgProgressBrowserXhr } from 'ngx-progressbar';
 import { BrowserXhr } from '@angular/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FlashMessagesModule } from 'angular2-flash-messages';
+import { CountDown } from 'ng2-date-countdown';
 
 @NgModule({
   declarations: [
@@ -66,7 +67,8 @@ import { FlashMessagesModule } from 'angular2-flash-messages';
     SolultionSubmitComponent,
     PreloaderComponent,
     SidebarComponent,
-    EditProfileComponent
+    EditProfileComponent,
+    CountDown
   ],
   imports: [
     BrowserModule,

codecamp-front/src/app/app.module.ts

@@ -3,36 +3,36 @@
       <div class="col-md-12">
       <div class="display-4">Add Problem</div>
       <form [formGroup]="form" (submit)="onAddProblemSubmit()">
-        <div class="form-group">  
+        <div class="form-group">
           <label for="name">Problem Name</label>
-          <input type="text"  
-          name="name" 
-          formControlName="name" 
-          class="form-control" 
-          placeholder="Enter Name" 
+          <input type="text"
+          name="name"
+          formControlName="name"
+          class="form-control"
+          placeholder="Enter Name"
           autocomplete="off"
           [ngClass]="{'is-invalid': (form.controls.name.errors && form.controls.name.dirty) , 'is-valid': !form.controls.name.errors}">
         </div>
-    
+
         <div class="form-group">
           <label for="id">Problem Code</label>
           <input type="text"
-           name="code" 
-           formControlName="code" 
-           class="form-control" 
-           placeholder="Enter contest ID" 
+           name="code"
+           formControlName="code"
+           class="form-control"
+           placeholder="Enter contest ID"
            autocomplete="off"
            [ngClass]="{'is-invalid': (form.controls.code.errors && form.controls.code.dirty) , 'is-valid': !form.controls.code.errors}">
         </div>
         <div class="row">
             <div class="col-md-6">
               <div class="form-group">
                 <label for="level">Problem Level</label>
-                <input type="text" 
-                name="level" 
-                formControlName="level" 
-                class="form-control" 
-                placeholder="Problem Level" 
+                <input type="text"
+                name="level"
+                formControlName="level"
+                class="form-control"
+                placeholder="Problem Level"
                 autocomplete="off"
                 [ngClass]="{'is-invalid': (form.controls.level.errors && form.controls.level.dirty) , 'is-valid': !form.controls.level.errors}">
               </div>
@@ -41,10 +41,10 @@
               <div class="form-group">
                   <label for="Author">Author</label>
                   <input type="text"
-                  name="author" 
-                  formControlName="author" 
-                  class="form-control" 
-                  placeholder="Author Name" 
+                  name="author"
+                  formControlName="author"
+                  class="form-control"
+                  placeholder="Author Name"
                   autocomplete="off"
                   [ngClass]="{'is-invalid': (form.controls.author.errors && form.controls.author.dirty) , 'is-valid': !form.controls.author.errors}">
                 </div>
@@ -54,11 +54,11 @@
           <div class="col-md-6">
             <div class="form-group">
               <label for="Input Format">Input Format</label>
-              <textarea 
-              name="input_format" 
-              formControlName="input_format" 
-              class="form-control" 
-              placeholder="Input Format" 
+              <textarea
+              name="input_format"
+              formControlName="input_format"
+              class="form-control"
+              placeholder="Input Format"
               autocomplete="off"
               [ngClass]="{'is-invalid': (form.controls.input_format.errors && form.controls.input_format.dirty) , 'is-valid': !form.controls.input_format.errors}">
               </textarea>
@@ -68,10 +68,10 @@
             <div class="form-group">
                 <label for="output_format">Output format</label>
                 <textarea
-                name="output_format" 
-                formControlName="output_format" 
-                class="form-control" 
-                placeholder="output_format" 
+                name="output_format"
+                formControlName="output_format"
+                class="form-control"
+                placeholder="output_format"
                 autocomplete="off"
                 [ngClass]="{'is-invalid': (form.controls.output_format.errors && form.controls.output_format.dirty) , 'is-valid': !form.controls.output_format.errors}">
               </textarea>
@@ -80,41 +80,41 @@
         </div>
         <div class="form-group">
           <label for="Description">Description</label>
-          <textarea 
-          name="description" 
-          formControlName="description" 
-          class="form-control" placeholder="Enter Description" autocomplete="off" rows="10"> 
+          <textarea
+          name="description"
+          formControlName="description"
+          class="form-control" placeholder="Enter Description" autocomplete="off" rows="10">
           </textarea>
         </div>
         <div class="form-group">
           <label for="Constraint">Constraint</label>
-          <textarea 
-          name="constraints" 
-          formControlName="constraints" 
-          class="form-control" placeholder="Enter Constraints" autocomplete="off" rows="10"> 
+          <textarea
+          name="constraints"
+          formControlName="constraints"
+          class="form-control" placeholder="Enter Constraints" autocomplete="off" rows="10">
           </textarea>
         </div>
         <div class="row">
           <div class="col-md-6">
-          <div class="form-group">  
+          <div class="form-group">
             <label for="timelimit">Time Limit</label>
-            <input type="text"  
-            name="timelimit" 
-            formControlName="timelimit" 
-            class="form-control" 
-            placeholder="Enter Time Limit" 
+            <input type="text"
+            name="timelimit"
+            formControlName="timelimit"
+            class="form-control"
+            placeholder="Enter Time Limit"
             autocomplete="off"
             [ngClass]="{'is-invalid': (form.controls.timelimit.errors && form.controls.timelimit.dirty) , 'is-valid': !form.controls.timelimit.errors}">
           </div>
           </div>
           <div class="col-md-6">
-          <div class="form-group">  
+          <div class="form-group">
               <label for="sourcelimit">Source Limit</label>
-              <input type="text"  
-              name="sourcelimit" 
-              formControlName="sourcelimit" 
-              class="form-control" 
-              placeholder="Enter Source Limit" 
+              <input type="text"
+              name="sourcelimit"
+              formControlName="sourcelimit"
+              class="form-control"
+              placeholder="Enter Source Limit"
               autocomplete="off"
               [ngClass]="{'is-invalid': (form.controls.sourcelimit.errors && form.controls.sourcelimit.dirty) , 'is-valid': !form.controls.sourcelimit.errors}">
             </div>
@@ -124,11 +124,11 @@
               <div class="col-md-6">
                 <div class="form-group">
                   <label for="Input TestCase">Input Testcase</label>
-                  <textarea 
-                  name="input_example" 
-                  formControlName="input_example" 
-                  class="form-control" 
-                  placeholder="Input TestCase" 
+                  <textarea
+                  name="input_example"
+                  formControlName="input_example"
+                  class="form-control"
+                  placeholder="Input TestCase"
                   autocomplete="off"
                   [ngClass]="{'is-invalid': (form.controls.input_example.errors && form.controls.input_example.dirty) , 'is-valid': !form.controls.input_example.errors}">
                   </textarea>
@@ -138,10 +138,10 @@
                 <div class="form-group">
                     <label for="output_example">Output Testcase</label>
                     <textarea
-                    name="output_example" 
-                    formControlName="output_example" 
-                    class="form-control" 
-                    placeholder="Output Test case" 
+                    name="output_example"
+                    formControlName="output_example"
+                    class="form-control"
+                    placeholder="Output Test case"
                     autocomplete="off"
                     [ngClass]="{'is-invalid': (form.controls.output_example.errors && form.controls.output_example.dirty) , 'is-valid': !form.controls.output_example.errors}">
                   </textarea>
@@ -151,43 +151,33 @@
               <div class="col-md-6">
                 <div class="form-group">
                   <label for="Input File">Input File</label>
-                  <textarea 
-                  name="Input" 
-                  formControlName="Input" 
-                  class="form-control" 
-                  placeholder="Input TestCase" 
-                  autocomplete="off"
-                  [ngClass]="{'is-invalid': (form.controls.Input.errors && form.controls.Input.dirty) , 'is-valid': !form.controls.Input.errors}">
-                  </textarea>
+                  <input type="file" class="form-control-file" placeholder="Upload file" (change)="onFileChange1($event)">
                 </div>
                 </div>
                 <div class="col-md-6">
                 <div class="form-group">
                     <label for="output File">Output File</label>
-                    <textarea
-                    name="Output" 
-                    formControlName="Output" 
-                    class="form-control" 
-                    placeholder="Output Test case" 
-                    autocomplete="off"
-                    [ngClass]="{'is-invalid': (form.controls.Output.errors && form.controls.Output.dirty) , 'is-valid': !form.controls.Output.errors}">
-                  </textarea>
+                    <input type="file" class="form-control-file" placeholder="Upload file" (change)="onFileChange2($event)">
                   </div>
                 </div>
             </div>
+            <div class="form-group">
+              <label for="Explanation Example">Image Upload</label>
+              <input type="file" class="form-control-file" placeholder="Upload file" (change)="onFileChange3($event)">
+            </div>
         <div class="form-group">
             <label for="Explanation Example">Explanation Example</label>
-            <textarea 
-            name="explanation_example" 
-            formControlName="explanation_example" 
-            class="form-control" placehzolder="Explanation Example" autocomplete="off" rows="10"> 
+            <textarea
+            name="explanation_example"
+            formControlName="explanation_example"
+            class="form-control" placehzolder="Explanation Example" autocomplete="off" rows="10">
             </textarea>
           </div>
 
-        <input 
-        
+        <input
+
         type="submit" class="btn btn-primary" value="Add Problem">
       </form>
     </div>
     </div>
-  </div>
+  </div>

codecamp-front/src/app/components/add-problem/add-problem.component.html

@@ -11,6 +11,9 @@ import { FlashMessagesService } from 'angular2-flash-messages';
 export class AddProblemComponent implements OnInit {
   form: FormGroup;
   contest;
+  Input;
+  Output;
+  image;
   constructor(
     private contestService: ContestService,
     private router: Router,
@@ -43,6 +46,37 @@ export class AddProblemComponent implements OnInit {
       Output: ['', Validators.required]
     });
   }
+  onFileChange1(event) {
+    let reader = new FileReader();
+      if(event.target.files && event.target.files.length > 0) {
+        let file = event.target.files[0];
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+           this.Input = reader.result.split(',')[1];
+          };
+        }
+      }
+  onFileChange2(event) {
+    let reader = new FileReader();
+      if(event.target.files && event.target.files.length > 0) {
+        let file = event.target.files[0];
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+            this.Output = reader.result.split(',')[1];
+          };
+        }
+      }
+
+  onFileChange3(event) {
+    let reader = new FileReader();
+      if(event.target.files && event.target.files.length > 0) {
+        let file = event.target.files[0];
+        reader.readAsDataURL(file);
+        reader.onload = () => {
+            this.image = reader.result.split(',')[1];
+          };
+        }
+      }
 
   onAddProblemSubmit() {
     const problem = {
@@ -59,10 +93,12 @@ export class AddProblemComponent implements OnInit {
       timelimit: this.form.get('timelimit').value,
       sourcelimit: this.form.get('sourcelimit').value,
       author: this.form.get('author').value,
-      testCaseInput: this.form.get('Input').value,
-      testCaseOutput: this.form.get('Output').value
+      testCaseInput: this.Input,
+      testCaseOutput: this.Output,
+      image: this.image
     };
 
+
     this.contestService.addProblem(problem, this.contest).subscribe(data => {
       if (!data.success) {
         this._flashMessagesService.show(data.msg, { cssClass: 'alert-danger' } );

codecamp-front/src/app/components/add-problem/add-problem.component.ts

@@ -42,13 +42,12 @@ export class LoginComponent implements OnInit {
       password: this.form.get('password').value // Password input field
     };
     this.authService.loginUser(user).subscribe(data => {
-      if(!data.success){
+      if (!data.success) {
         this._flashMessagesService.show(data.msg, { cssClass: 'alert-danger', timeout: 2000});
-      }
-      else{
+      } else {
         this.authService.storeUserData(data.token, data.user);
+            this.authService.name.next(data.user);
             this.router.navigate(['/']);
-            this.message = false;
            }     // Navigate to dashboard view
       });
   }

codecamp-front/src/app/components/login/login.component.ts

@@ -24,26 +24,28 @@ import { ContestService } from '../../services/contest.service';
 export class NavbarComponent implements OnInit{
 
   user: any;
-  toggle: boolean = true;
+  toggle = true;
   constructor(
     public authService: AuthService,
     private router: Router,
     private contestService: ContestService
   ) {
+    this.authService.name.subscribe(value => {
+      this.user = value;
+    });
   }
 
   ngOnInit() {
     this.contestService.toggle.subscribe(toggle => this.toggle = toggle);
-    this.user = this.authService.getProfile().subscribe(profile => {
-      this.user = profile.msg;
-    });
   }
 
   onLogoutClick() {
     this.authService.logout(); // Logout user
     this.router.navigate(['/']); // Navigate back to home page
   }
+  onUndefined() {
 
+  }
   onToggle(){
     this.toggle = this.toggle? false:true;
     this.contestService.ontoggle(this.toggle);

codecamp-front/src/app/components/navbar/navbar.component.ts

@@ -45,6 +45,7 @@ <h6>Explanations</h6>
             <p [innerText]="problem?.explanation_example"></p>
           </div>
           </div>
+          <img *ngIf="base64Image" [src]="base64Image" >
     </div>
 
     <div class="col-md-4">