working

Author: iamsaquib8

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

@@ -22,6 +22,7 @@ import { AddProblemComponent } from './components/add-problem/add-problem.compon
 import { AuthGuard } from './guards/auth.guard';
 import { NotAuthGuard } from './guards/not-auth.guard';
 import { SolultionSubmitComponent } from './components/solultion-submit/solultion-submit.component';
+import { SolutionComponent } from './components/solultion-submit/solution/solution.component';
 
 
 const appRoutes: Routes = [
@@ -66,6 +67,10 @@ const appRoutes: Routes = [
       path: ':contest/submit/:code',
       component: SolultionSubmitComponent
     },
+    {
+      path: 'submit/complete',
+      component: SolutionComponent
+    },
     {
       path: 'contest/add-contest',
       component: AddContestComponent,

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

@@ -18,7 +18,6 @@ import { AboutComponent } from './components/about/about.component';
 
 import { AuthService } from './services/auth.service';
 import { ContestService } from './services/contest.service';
-import { FileUploadService } from './services/file-upload.service';
 
 import { HttpModule } from '@angular/http';
 import { IdeComponent } from './components/ide/ide.component';
@@ -27,7 +26,7 @@ import { AddContestComponent } from './components/add-contest/add-contest.compon
 import { EditContestComponent } from './components/edit-contest/edit-contest.component';
 import { SubmissionComponent } from './components/submission/submission.component';
 import { RanklistComponent } from './components/ranklist/ranklist.component';
-import { SolutionComponent } from './components/solution/solution.component';
+import { SolutionComponent } from './components/solultion-submit/solution/solution.component';
 import { ProblemComponent } from './components/problem/problem.component';
 import { AddProblemComponent } from './components/add-problem/add-problem.component';
 
@@ -65,7 +64,7 @@ import { SolultionSubmitComponent } from './components/solultion-submit/solultio
     AppRoutingModule,
     AceEditorModule
   ],
-  providers: [ AuthService, AuthGuard, NotAuthGuard, ContestService, FileUploadService],
+  providers: [ AuthService, AuthGuard, NotAuthGuard, ContestService],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

codecamp-front/src/app/components/solultion-submit/solultion-submit.component.html

@@ -1,10 +1,10 @@
 <div class="container">
-  <h1 class="display-4">Submit a Solution: {{code}}</h1>
+  <h1 class="display-4">Submit a Solution: {{problem}}</h1>
   <hr>
+  
   <div class="row select">
       <h5>Select language</h5>
-      <select (change)="selectLanguage($event)" class="options"
-      >
+      <select (change)="selectLanguage($event)" class="options">
           <option value="c_cpp">C</option>
           <option value="c_cpp">C++</option>
           <option value="java">Java</option>

codecamp-front/src/app/components/solultion-submit/solultion-submit.component.ts

@@ -1,31 +1,33 @@
-import { Component, OnInit, ViewChild} from '@angular/core';
-import { FileUploadService } from '../../services/file-upload.service';
+import { Component, OnInit, ViewChild, Output} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { AuthService } from '../../services/auth.service';
 import { ContestService } from '../../services/contest.service';
-declare var jquery:any;
-declare var $ :any;
+import { EventEmitter } from '@angular/core';
+import { Router } from '@angular/router';
+declare var jquery: any;
+declare var $: any;
 
 @Component({
   selector: 'app-solultion-submit',
   templateUrl: './solultion-submit.component.html',
   styleUrls: ['./solultion-submit.component.css']
 })
 export class SolultionSubmitComponent implements OnInit {
-  selectedLanguage =  'c_cpp';
-  content: string;
+  selectedLanguage = 'c_cpp';
+  content;
   problem;
   contest;
   username;
+  solution;
   language: string;
-  formData;
   currentFileUpload;
   value;
   @ViewChild('userFile') user_file;
   constructor(
     private contestService: ContestService,
     private route: ActivatedRoute,
-    private authService: AuthService
+    private authService: AuthService,
+    private router: Router
   ) {
     this.content = `#include<stdio.h>
 
@@ -44,8 +46,9 @@ export class SolultionSubmitComponent implements OnInit {
     });
   }
 
-  selectLanguage(event: any) {
+  selectLanguage(event) {
     this.selectedLanguage = event.target.value;
+    
     if (this.selectedLanguage === 'c_cpp') { 
       this.content =
       `#include<stdio.h>
@@ -60,11 +63,11 @@ export class SolultionSubmitComponent implements OnInit {
       this.content =
         `import java.util.*;
 
-        public class CodeCamp {
+        public class Solution {
 
           public static void main(String[] args) {
 
-              System.out.println("Welcome To Code Camp");
+              System.out.print("Welcome To CodeCamp");
 
           }
 
@@ -84,12 +87,16 @@ export class SolultionSubmitComponent implements OnInit {
         };
       }
     }
+
   onClickSubmit() {
     const lang = $('#select').val();
+
+    this.content = document.getElementsByClassName('ace_content');
+    const p = this.content[0].innerText;
     if (this.value) {
       this.currentFileUpload = this.value;
     } else {
-      this.currentFileUpload = btoa(this.content);
+      this.currentFileUpload = btoa(p);
     }
     const solution = {
       problem : this.problem,
@@ -99,11 +106,8 @@ export class SolultionSubmitComponent implements OnInit {
       description: this.currentFileUpload
     };
     this.contestService.addSolution(solution).subscribe(data => {
-      if (!data.success) {
-        console.log(data.msg);
-      } else {
-        console.log(data.msg);
-      }
+      this.contestService.setSolution(data.msg);
+      this.router.navigate(['/submit/complete']);
     });
   }
 }

…mponents/solution/solution.component.css …n-submit/solution/solution.component.csscodecamp-front/src/app/components/solution/solution.component.css renamed to codecamp-front/src/app/components/solultion-submit/solution/solution.component.css codecamp-front/src/app/components/solution/solution.component.css renamed to codecamp-front/src/app/components/solultion-submit/solution/solution.component.css

@@ -0,0 +1,6 @@
+<div class="container">
+    <p>
+        {{data}}
+      </p>
+      
+</div>

codecamp-front/src/app/components/solultion-submit/solution/solution.component.html

@@ -0,0 +1,20 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { SolultionSubmitComponent } from '../solultion-submit.component';
+import { ContestService } from '../../../services/contest.service';
+
+@Component({
+  selector: 'app-solution',
+  templateUrl: './solution.component.html',
+  styleUrls: ['./solution.component.css']
+})
+export class SolutionComponent implements OnInit {
+  data;
+  constructor(
+    private contestService: ContestService
+  ) { }
+
+  ngOnInit() {
+    this.data = this.contestService.getSolution();
+  }
+
+}