timer and auth work for problem

amar1995 · amar1995 · commit 97863622ebb8 · 2018-03-22T19:04:29.000+05:30
diff --git a/codecamp-front/package-lock.json b/codecamp-front/package-lock.json
diff --git a/codecamp-front/src/app/app.module.ts b/codecamp-front/src/app/app.module.ts
@@ -41,7 +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: [
@@ -67,7 +67,8 @@ import { FlashMessagesModule } from 'angular2-flash-messages';
     SolultionSubmitComponent,
     PreloaderComponent,
     SidebarComponent,
-    EditProfileComponent
+    EditProfileComponent,
+    //CountDown
   ],
   imports: [
     BrowserModule,
diff --git a/codecamp-front/src/app/services/auth.service.ts b/codecamp-front/src/app/services/auth.service.ts
@@ -34,12 +34,12 @@ export class AuthService {
     this.authToken = localStorage.getItem('token'); // Get tokens and asssign to variable to be used elsewhere
   }
   public registerUser(user) {
-    return this.http.post(this.domain + 'users/signup', user)
+    return this.http.post('users/signup', user)
       .map(res => res.json());
   }
 
   public loginUser(user) {
-    return this.http.post(this.domain + 'users/signin', user)
+    return this.http.post('users/signin', user)
     .map(res => res.json());
   }
 
@@ -63,7 +63,7 @@ export class AuthService {
   }
 
   public getUsername() {
-    const  user = JSON.parse(localStorage.getItem('user'));
+    const user = JSON.parse(localStorage.getItem('user'));
     return user;
   }
 
@@ -78,6 +78,6 @@ export class AuthService {
   }
   getProfile() {
     this.createAuthenticationHeaders();
-    return this.http.get(this.domain + 'users/profile', this.options).map(res => res.json());
+    return this.http.get('users/profile', this.options).map(res => res.json());
   }
 }
diff --git a/codecamp-front/src/app/services/contest.service.ts b/codecamp-front/src/app/services/contest.service.ts
@@ -15,14 +15,14 @@ export class ContestService {
   public authToken: any;
   public user: any;
   public contest: any;
-   public domain = 'http://localhost:80/';
+  public domain = 'http://localhost:80/';
   public options;
   public sol;
   public toggler: boolean;
 
 
 
-  private contestSource = new BehaviorSubject<string>(' default contest ');
+  private contestSource = new BehaviorSubject<string>('default contest');
   currentContest = this.contestSource.asObservable();
 
   private Toggler = new BehaviorSubject<boolean>(true);
@@ -60,12 +60,12 @@ export class ContestService {
   }
 
   public addProblem(problem, contest): Observable<any> {
-    return this.http.post(this.domain + 'contest/' + contest, problem)
+    return this.http.post('contest/' + contest, problem)
       .map(res => res.json());
   }
 
   public getProblems(contest): Observable<any> {
-    return this.http.get( this.domain + 'contest/' + contest)
+    return this.http.get( 'contest/' + contest)
         .map(res => res.json());
   }
 
@@ -75,7 +75,7 @@ export class ContestService {
   }
 
   public addSolution(solution): Observable<any> {
-    return this.http.post(this.domain + 'solution', solution)
+    return this.http.post('solution', solution)
       .map(res => res.json());
   }
   public deleteContest(contest) {
@@ -94,7 +94,7 @@ export class ContestService {
   }
 
   getRankings(contest) {
-    return this.http.get(this.domain + 'rankings/' + contest)
+    return this.http.get('rankings/' + contest)
       .map(res => res.json());
   }
   ontoggle(value: boolean) {
diff --git a/contest/models/problem/problem.js b/contest/models/problem/problem.js
@@ -57,6 +57,9 @@ const ProblemSchema = new mongoose.Schema({
         type:mongoose.Schema.Types.String,
         refs:'User'
     }],
+    image:{
+        type:String
+    },
     author:{
         type:String
     },
diff --git a/judge/compileProblem.js b/judge/compileProblem.js
@@ -12,7 +12,7 @@ const compileProblem= async (lang , filename)=>{
     switch(lang){
         case "c":
             file = path.basename(filename,'.c') +".out ";
-            cmd="cd "+"\"" + path.join(__dirname,"result/source") +"\"" + " && gcc -o \"" +path.join(__dirname,"result/binary/") + "\""+file  +" "+ filename;
+            cmd="cd "+"\"" + path.join(__dirname,"result/source") +"\"" + " && gcc -o \"" +path.join(__dirname,"result/binary/") + "\""+file  +" "+ filename+" -lm";
             break
         case "c++":
         case "cpp":
@@ -26,7 +26,7 @@ const compileProblem= async (lang , filename)=>{
     return new Promise((resolve,reject)=>{
      exec(cmd, (error, stdout, stderr) => {
         if (error) {
-          //console.error(`${error}`);
+          console.error(`${error}`);
           reject(error);
         }
         resolve(file)
diff --git a/judge/result/binary/Solution.class b/judge/result/binary/Solution.class
diff --git a/judge/result/binary/Solution.out b/judge/result/binary/Solution.out
diff --git a/judge/result/source/Solution.c b/judge/result/source/Solution.c
@@ -1,3 +1,31 @@
+<<<<<<< HEAD
+#include <stdio.h>
+#include <string.h>
+int main()
+{
+    char S[100002];
+    long int T;
+    int i,t1,t2,l;
+    scanf("%ld",&T);
+    while(T)
+    {
+        T--;
+        t1=t2=0;
+       scanf("%s",S);
+       l=strlen(S);
+       for(i=0;i<l;i++){
+        if(S[i]=='a'|| S[i]=='e'||S[i]=='i'||S[i]=='o'||S[i]=='u'||S[i]=='A'||S[i]=='E'||S[i]=='I'||S[i]=='O'||S[i]=='U')
+            t1++;
+        else t2++;
+       }
+       if(t1>=t2)
+        printf("GOOD\n");
+       else
+        printf("BAD\n");
+    }
+    return 0;
+}
+=======
 import java.util.*;
 import java.lang.Math;
 class ordteams
@@ -88,4 +116,5 @@ class ordteams
 			
 		}
 	}
-} 
+} 
+>>>>>>> 6b9a84523259144e34994839aeeb1470ef83ebe7
diff --git a/judge/result/source/Solution.cpp b/judge/result/source/Solution.cpp
@@ -1,3 +1,57 @@
+<<<<<<< HEAD
+#include<bits/stdc++.h>
+#define pb push_back
+#define ll long long
+#define d double
+using namespace std;
+int main()
+{
+    ll t,i,a;
+    cin>>t;
+    while(t--)
+    {
+        ll c=0,index=0;
+        vector<ll>v;
+        ll n;
+        cin>>n;
+        for(i=0;i<n;i++)
+        {
+            cin>>a;
+            v.pb(a);
+        }
+        ll z=1;
+        for(i=1;i<n;i++)
+        {
+            if(v[i]!=v[0])
+            {
+                index=i;
+                break;
+            }
+            else
+            {
+                z++;
+            }
+        }
+        for(i=index;i<n;i++)
+        {
+            if(v[i]!=v[0] || v[i]!=v[i-1])
+            {
+                c++;
+            }
+        }
+            if(z==n)
+            {
+                c=0;
+                cout<<c<<endl;
+            }
+           else
+           {
+               cout<<c<<endl;
+           }
+    }
+    return 0;
+}
+=======
 #include <iostream>
 using namespace std;
  
@@ -43,3 +97,4 @@ int main() {
   }
   return 0;
 } 
+>>>>>>> 6b9a84523259144e34994839aeeb1470ef83ebe7
diff --git a/judge/result/source/Solution.java b/judge/result/source/Solution.java
@@ -1,3 +1,40 @@
+<<<<<<< HEAD
+public class Solution
+{
+     public static void main(String args[])throws IOException
+     {
+         Scanner in= new Scanner(System.in);
+         int t= in.nextInt();
+         long i;
+         while(t-->0)
+         {
+             long n= in.nextLong();
+             long m= in.nextLong();
+             long a[]= new long[(int)m];
+             boolean joined[]= new boolean[(int)m];
+             for(i=0; i<m; i++)
+             {
+                 a[(int)i]= in.nextLong();
+                 joined[(int)i]= false;
+             }
+             Arrays.sort(a);
+             long count=0, index=m-1;
+             for(i=0; i<m; i++)
+             {
+                 while(i<m && a[(int)i]!=0 && joined[(int)i]==false)
+                 {
+                     a[(int)i]--;
+                     count++;
+                     joined[(int)index]=true;
+                     joined[(int)index-1]=true;
+                     index--;
+                 }
+             }
+             System.out.println(count);
+         }
+     }
+ }
+=======
 import java.util.*;
 import java.lang.Math;
 class ordteams
@@ -88,4 +125,5 @@ public static void main(String args[])
 			
 		}
 	}
-} 
+} 
+>>>>>>> 6b9a84523259144e34994839aeeb1470ef83ebe7
diff --git a/judge/routes/solution.js b/judge/routes/solution.js
@@ -48,11 +48,56 @@ router.get('/:id',(req,res)=>{
         }});
     }
 
- })
+  }) 
+})
+
+
+
+router.get('/ide',(req,res)=>{
+  Solution.findOne({'id':req.params.id},function(err,solution){
+    if(err){
+       res.send(err)
+    }else if(!solution){
+       res.send('null')
+    }else if(solution){
+     const sol2 = Object.assign({}, solution);
+     const contest = sol2._doc.contest;
+     const problem = sol2._doc.problem;
+     const description=sol2._doc.description;
+     const id = sol2._doc.id;
+     const language= sol2._doc.language;
 
+     Problem.findOne({'code':problem},function(err,pro){
+       if(err){
+         res.send(err)
+      }else if(!pro){
+         res.send('null')
+      }else if(pro){
+         const option = {
+           timeout:pro.timelimit,
+           maxBuffer:pro.sourcelimit,
+           encoding:'utf8'
+         }
+     judge.compileAndRunProblem(contest,problem,id,language ,description,option).then((result)=>{      
+       res.send(result);
+     }).catch((e)=>{
+       var compileError = /(g[/++/]|gcc|javac)/;
+       if(e.toString().match(compileError)){
+         res.status(200).send('CE');
+       }else if(e.timelimit*1000>=option.timeout){
+         res.status(200).send('TLE');
+       }else{
+         console.log(e);
+         res.status(200).send('RE');
+       }
+   })
+
+     }});
+ }
 
-  
 })
+})
+
 
 
 module.exports=router;
diff --git a/server/app.js b/server/app.js
@@ -11,11 +11,12 @@ const mongoose = require('mongoose')
 
 mongoose.Promise = global.Promise
 mongoose.connect(process.env.MONGODB_URI || 'mongodb://127.0.0.1:27018/OnlineJudge')
-
+app.use(express.static(__dirname+'/public/'));
 const bodyParser = require('body-parser');
 app.use(cors())
-app.use( bodyParser.json() );
-app.use(bodyParser.urlencoded({     
+app.use( bodyParser.json({limit:'100mb'}) );
+app.use(bodyParser.urlencoded({   
+    limit:'100mb'  ,
     extended: true
 }));
 
diff --git a/server/routes/problems.js b/server/routes/problems.js
@@ -34,9 +34,14 @@ router.get('/',(req,res)=>{
 router.patch('/:code/edit',(req,res)=>{
     const code = req.params.code;
    // console.log(username);
+<<<<<<< HEAD
     var body = _.pick(req.body,['code','name','successfulSubmission','image','level','contest','description','input_format','output_format','constraints','input_example','output_example','explanation_example','date_added','timelimit','sourcelimit','author','testCaseInput','testCaseOutput']);
     Problem.findOneAndUpdate({'code':code},{$set: body})
     .then((problem)=>{
+=======
+    var body = _.pick(req.body,['code','name','successfulSubmission','level',,'image','contest','description','input_format','output_format','constraints','input_example','output_example','explanation_example','date_added','timelimit','sourcelimit','author','testCaseInput','testCaseOutput']);
+    Problem.findOneAndUpdate({'code':code},{$set: body}).then((problem)=>{
+>>>>>>> 997d61e6d6b49a8027293089340fa282717bad63
         res.json({
             'success':true,
             'msg':'Problem updated Successfully!'
diff --git a/server/routes/ranking.js b/server/routes/ranking.js
@@ -6,6 +6,11 @@ const Contest = require('./../../contest/models/contest/contest');
 const {compare} = require('./../utils/compare');
 
 router.get('/:id',(req,res)=>{
+
+    // res.json({
+    //     'success':true,
+    //     'msg':'Ranklist has been freezed '
+    // })
   
     const id = req.params.id;
     Contest.findOne({'id':id},(err,contest)=>{

Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,12 @@ export class AuthService {`
`34`	`34`	`this.authToken = localStorage.getItem('token'); // Get tokens and asssign to variable to be used elsewhere`
`35`	`35`	`}`
`36`	`36`	`public registerUser(user) {`
`37`		`- return this.http.post(this.domain + 'users/signup', user)`
	`37`	`+ return this.http.post('users/signup', user)`
`38`	`38`	`.map(res => res.json());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public loginUser(user) {`
`42`		`- return this.http.post(this.domain + 'users/signin', user)`
	`42`	`+ return this.http.post('users/signin', user)`
`43`	`43`	`.map(res => res.json());`
`44`	`44`	`}`
`45`	`45`
`@@ -63,7 +63,7 @@ export class AuthService {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public getUsername() {`
`66`		`- const user = JSON.parse(localStorage.getItem('user'));`
	`66`	`+ const user = JSON.parse(localStorage.getItem('user'));`
`67`	`67`	`return user;`
`68`	`68`	`}`
`69`	`69`
`@@ -78,6 +78,6 @@ export class AuthService {`
`78`	`78`	`}`
`79`	`79`	`getProfile() {`
`80`	`80`	`this.createAuthenticationHeaders();`
`81`		`- return this.http.get(this.domain + 'users/profile', this.options).map(res => res.json());`
	`81`	`+ return this.http.get('users/profile', this.options).map(res => res.json());`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ export class ContestService {`
`15`	`15`	`public authToken: any;`
`16`	`16`	`public user: any;`
`17`	`17`	`public contest: any;`
`18`		`- public domain = 'http://localhost:80/';`
	`18`	`+ public domain = 'http://localhost:80/';`
`19`	`19`	`public options;`
`20`	`20`	`public sol;`
`21`	`21`	`public toggler: boolean;`
`22`	`22`
`23`	`23`
`24`	`24`
`25`		`- private contestSource = new BehaviorSubject<string>(' default contest ');`
	`25`	`+ private contestSource = new BehaviorSubject<string>('default contest');`
`26`	`26`	`currentContest = this.contestSource.asObservable();`
`27`	`27`
`28`	`28`	`private Toggler = new BehaviorSubject<boolean>(true);`
`@@ -60,12 +60,12 @@ export class ContestService {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public addProblem(problem, contest): Observable<any> {`
`63`		`- return this.http.post(this.domain + 'contest/' + contest, problem)`
	`63`	`+ return this.http.post('contest/' + contest, problem)`
`64`	`64`	`.map(res => res.json());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public getProblems(contest): Observable<any> {`
`68`		`- return this.http.get( this.domain + 'contest/' + contest)`
	`68`	`+ return this.http.get( 'contest/' + contest)`
`69`	`69`	`.map(res => res.json());`
`70`	`70`	`}`
`71`	`71`
`@@ -75,7 +75,7 @@ export class ContestService {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public addSolution(solution): Observable<any> {`
`78`		`- return this.http.post(this.domain + 'solution', solution)`
	`78`	`+ return this.http.post('solution', solution)`
`79`	`79`	`.map(res => res.json());`
`80`	`80`	`}`
`81`	`81`	`public deleteContest(contest) {`
`@@ -94,7 +94,7 @@ export class ContestService {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`getRankings(contest) {`
`97`		`- return this.http.get(this.domain + 'rankings/' + contest)`
	`97`	`+ return this.http.get('rankings/' + contest)`
`98`	`98`	`.map(res => res.json());`
`99`	`99`	`}`
`100`	`100`	`ontoggle(value: boolean) {`