Merge branch 'master' of https://git.cse.iitb.ac.in/ayushjangir/sfcode

Merge

.gitignore

 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 /users
+/user_execs
 .vscode
 # compiled output
 /dist

backend/execute.php

@@ -17,7 +17,7 @@ $postData = json_decode($postData, true);
 
 $uname = $postData['file']['username'];
 $filename = $postData['file']['filename'];
-$f_path = $postData['file']['file_path'];
+$f_path = $postData['file']['path'];
 $language = $postData['file']['language'];
 $input_data = $postData['input_data'];
 
@@ -37,7 +37,7 @@ if (strcmp($language, ".cpp") == 0) {
 } else if (strcmp($language, ".java") == 0) {
   system("java -cp ../user_execs/" . $uname . "/" . $f_path . "/ " . $filename . " < " . $in_fname . " > " . $out_fname, $ret_stat);
 } else if (strcmp($language, ".py") == 0) {
-  system("python3 ../users/" . $uname . "/" . $filename . ".py < " . $in_fname . " > " . $out_fname, $ret_stat);
+  system("python3 ../users/" . $uname . "/" . $f_path . "/" . $filename . ".py < " . $in_fname . " > " . $out_fname, $ret_stat);
 }
 
 if ($ret_stat != 0) {

backend/filedelete.php

@@ -35,7 +35,7 @@ if (isset($postData) && !empty($postData)) {
       mysqli_query($mysqli,$sql);
       $msg = "file successfully deleted";
       echo json_encode($msg);
-      unlink($exec_path);
+      if (file_exists($exec_path)) unlink($exec_path);
     }
     else{
       http_response_code(404);

backend/newdir.php

@@ -2,28 +2,29 @@
 
 header("Access-Control-Allow-Origin: *");
 header('Access-Control-Allow-Credentials: true');
-header("Access-Control-Allow-Methods: PUT, GET, POST, DELETE");
+header("Access-Control-Allow-Methods: PUT, GET, POST, DELETE, OPTIONS");
 header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept");
 header("Content-Type: application/json; charset=UTF-8");
 
 $postData = file_get_contents("php://input");
 
-if(isset($postData) && !empty($postData)) {
-    $request = json_decode($postData, true);
-    $username = $request['username'];
-    $dirname = $request['dirname'];
-    $path = "../users/" . $username . "/" . $request['path'] . "/" . $dirname;
+if (isset($postData) && !empty($postData)) {
+  $request = json_decode($postData, true);
+  $username = $request['username'];
+  $dirname = $request['dirname'];
+  $path = "../users/" . $username . "/" . $request['path'] . "/" . $dirname;
 
-    if(file_exists($path)) {
-        $msg = "directory already exists";
-        clearstatcache();
-        echo json_encode($msg);
-    }
-    else {
-        mkdir($path, 0777, true);
-        echo json_encode("Success");
-        clearstatcache();
-    }
+  if (file_exists($path)) {
+    $msg = "0";
+    clearstatcache();
+    echo json_encode($msg);
+  } else {
+    mkdir($path, 0777, true);
+    $path = "../user_execs/" . $username . "/" . $request['path'] . "/" . $dirname;
+    mkdir($path, 0777, true);
+    echo json_encode("1");
+    clearstatcache();
+  }
 
 }
 ?>

backend/questions/get_questions.php

@@ -26,9 +26,9 @@ if($result = $mysqli->query($sql2)){
         $data[$i]['username'] = $row['username'];
         $data[$i]['statement'] = $row['statement'];
         $data[$i]['tc1'] = $row['tc1'];
-        $data[$i]['out1'] = $row['out1'];
+        $data[$i]['out1'] = "";
         $data[$i]['tc2'] = $row['tc2'];
-        $data[$i]['out2'] = $row['out2'];
+        $data[$i]['out2'] = "";
         $data[$i]['stime'] = $row['stime'];
         $data[$i]['etime'] = $row['etime'];
         $i++;

backend/register.php

 <?php
 
-/** \file
-* This script registers a user using a username, password, name, and email (provided through POST). This script communicates with the MySQL server to save user data.
+/*!
+This script registers a user using a username, password, name, and email. This script communicates with the MySQL server to save
+user data.
 */
 
 header("Access-Control-Allow-Origin: *");
@@ -11,19 +12,11 @@ header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Ac
 header("Content-Type: application/json; charset=UTF-8");
 
 include_once("database.php");
-
-/** 
- * \brief POST data in json format.
- */
-/** \cond */
 $postData = file_get_contents("php://input");
-/**
- * \endcond
- */
 
 if (isset($postData) && !empty($postData)) {
     
-    
+  
     $request = json_decode($postData); /** \brief POST data decoded. */
     
     $name = trim($request->name);

src/app/file-dir-card/file-dir-card.component.html

@@ -6,9 +6,9 @@
   </div>
 
   <div *ngIf="isNew" class="title">
-    <input (input)="isErrorCreating = false" [(ngModel)]="newName" [disabled]="creating" id="newFilenameInput"
-           [placeholder]="'Name of new ' + (isFile ? 'file' : 'directory')" type="text">
-    <label for="newFilenameInput" *ngIf="isFile" (click)="lang = (lang + 1) % 3">{{extensions[lang]}}</label>
+    <input (input)="isErrorCreating = false" [(ngModel)]="newName" [disabled]="creating" [placeholder]="'Name of new ' + (isFile ? 'file' : 'directory')"
+           id="newFilenameInput" type="text">
+    <label (click)="lang = (lang + 1) % 3" *ngIf="isFile" for="newFilenameInput">{{extensions[lang]}}</label>
   </div>
 
   <div *ngIf="isNew || isFile"></div>
@@ -16,10 +16,11 @@
     <button (click)="onDelete()" [class.disabled]="deleting || isErrorDeleting"
             [disabled]="deleting || isErrorDeleting">{{isErrorDeleting ? 'Error' : (deleting ? 'Deleting...' : 'Delete')}}</button>
     <button (click)="isExpanded = !isExpanded" *ngIf="!isFile">{{isExpanded ? 'Collapse' : 'Expand'}}</button>
-    <button (click)="isExpanded = true; creatingNewSub = 1" *ngIf="!isFile">New Directory</button>
-    <button (click)="isExpanded = true; creatingNewSub = 2" *ngIf="!isFile">New File</button>
-    <button *ngIf="isFile" [routerLink]="getRouterLink()">Edit</button>
-    <button *ngIf="isFile">Run</button>
+    <button (click)="isExpanded = true; creatingNewSub = 1" *ngIf="!isFile && level < 3" [class.disabled]="deleting" [disabled]="deleting">New Directory</button>
+    <button (click)="isExpanded = true; creatingNewSub = 2" *ngIf="!isFile" [class.disabled]="deleting" [disabled]="deleting">New File</button>
+    <button *ngIf="isFile" [class.disabled]="deleting" [disabled]="deleting"
+            [routerLink]="getRouterLink()">Edit
+    </button>
   </div>
 
   <div *ngIf="isNew" class="file-buttons">
@@ -33,9 +34,10 @@
 
 <div *ngIf="!isNew && !isFile" [style.display]="isExpanded ? 'block' : 'none'" class="subs">
 
-  <app-file-dir-card (cancelled)="creatingNewSub = 0" (createDir)="createDirExec($event)" (createFile)="createFileExec($event)"
-                     *ngIf="creatingNewSub !== 0" [isFile]="creatingNewSub === 2" [level]="level + 1"
-                     [isNew]="true" [parentPath]="directory.path + directory.name + '/'"></app-file-dir-card>
+  <app-file-dir-card (cancelled)="creatingNewSub = 0" (createDir)="createDirExec($event)"
+                     (createFile)="createFileExec($event)"
+                     *ngIf="creatingNewSub !== 0" [isFile]="creatingNewSub === 2" [isNew]="true"
+                     [level]="level + 1" [parentPath]="directory.path + directory.name + '/'"></app-file-dir-card>
 
   <app-file-dir-card (deleteDir)="deleteDirExec($event)" (deleteFile)="deleteFileExec($event)"
                      *ngFor="let dir of directory.dirs" [directory]="dir"

src/app/file-dir-card/file-dir-card.component.ts

@@ -112,8 +112,10 @@ export class FileDirCardComponent implements OnInit {
       path: this.parentPath
     };
     this.fileService.upload(file).subscribe(data => {
+      console.log(data);
       this.createFile.emit(file);
-    }, () => {
+    }, error => {
+      console.log(error);
       this.creating = false;
       this.isErrorCreating = true;
     });

src/app/home/home.component.ts

 import {Component, OnInit} from '@angular/core';
-import {ProblemService} from '../problem.service';
+// import {ProblemService} from '../problem.service';
 import { ApiService } from '../api.service';
-import {Problem} from '../problem';
+// import {Problem} from '../problem';
 import { User } from '../user';
 import { Question } from '../question';
 import { QuestionService } from '../question.service';
@@ -14,7 +14,7 @@ import { QuestionService } from '../question.service';
 export class HomeComponent implements OnInit {
 
   user: User;
-  problems: Problem[];
+  // problems: Problem[];
   questiontoPost: Question = {
     title: "",
     username: "",
@@ -32,14 +32,13 @@ export class HomeComponent implements OnInit {
   errorMessage: any;
 
   constructor(private dataService: ApiService,
-    private problemService: ProblemService,
     private questionService: QuestionService) {
   }
 
   ngOnInit(): void {
     this.user = JSON.parse(this.dataService.getToken());
     this.questiontoPost.username = this.user.username;
-    this.getProblems();
+    // this.getProblems();
 
     this.questionService.getQues()
       .subscribe(data => {
@@ -64,10 +63,10 @@ export class HomeComponent implements OnInit {
     // console.log(this.ques_final);
   }
 
-  getProblems(): void {
-    this.problemService.getProblems()
-      .subscribe(problems => this.problems = problems);
-  }
+  // getProblems(): void {
+  //   this.problemService.getProblems()
+  //     .subscribe(problems => this.problems = problems);
+  // }
 
   openForm(): void {
     document.getElementById('popupForm').style.display = 'block';
@@ -100,10 +99,17 @@ export class HomeComponent implements OnInit {
           this.questiontoPost = null;
           (document.getElementById('quesform') as HTMLInputElement).value = '';
         }
-
+        let s = new Date(this.questiontoPost.stime);
+        let d = new Date();
+        console.log(d);
+        let e = new Date(this.questiontoPost.etime);
+        if(s < d && d < e) {
+          this.ques_final.push(this.questiontoPost);
+        }
         this.resetForm();
         this.closeForm();
       }
     );
+    
   }
 }

src/app/ide/ide.component.ts

@@ -157,6 +157,7 @@ int main() {
       .subscribe(data => {
         this.runCodeService.executeFile(this.file, this.inp)
           .subscribe(d => {
+            console.log(d);
             this.runField.status = '<div class="code">' + d + '</div>';
             this.runField.setState(true);
             this.isCompiling = false;