some changes

Author: shweta3047

client/.env

@@ -1 +1 @@
-PORT=5000
+PORT=8000

client/.eslintcache

@@ -1 +1,5 @@
-[{"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js":"1","/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js":"2"},{"size":388,"mtime":1609927468679,"results":"3","hashOfConfig":"4"},{"size":1054,"mtime":1609927468682,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"kizngo",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js",[],"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js",[]]
+<<<<<<< HEAD
+[{"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js":"1","/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js":"2"},{"size":388,"mtime":1609927468679,"results":"3","hashOfConfig":"4"},{"size":1054,"mtime":1609927468682,"results":"5","hashOfConfig":"4"},{"filePath":"6","messages":"7","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"kizngo",{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/header/Header.js",[],"/media/shweta/New Volume/projects/RCE-aasf/remote-code-executor/client/src/components/output/InputOutput.js",[]]
+=======
+[{"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/header/Header.js":"1","/home/tomarviii88/Desktop/remote-code-executor/client/src/reducers/index.js":"2","/home/tomarviii88/Desktop/remote-code-executor/client/src/components/output/InputOutput.js":"3"},{"size":388,"mtime":1609839782860,"results":"4","hashOfConfig":"5"},{"size":111,"mtime":1609871540084,"results":"6","hashOfConfig":"5"},{"size":1054,"mtime":1609877085016,"results":"7","hashOfConfig":"5"},{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ld0h7m",{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/header/Header.js",[],"/home/tomarviii88/Desktop/remote-code-executor/client/src/reducers/index.js",[],"/home/tomarviii88/Desktop/remote-code-executor/client/src/components/output/InputOutput.js",[]]
+>>>>>>> 8ba1999345de29ac621848df532983f857213ca7

client/src/actions/code.js

@@ -32,7 +32,7 @@ export const executeCode = async (code, lang, input) => {
     console.log(error);
     return {
       type: SET_ERROR,
-      payload: 'Something wrong'
+      payload: 'Something went wrong'
     };
   }
 };

rce-server/server/api/services/code.service.js

@@ -8,12 +8,11 @@ const SOURCE_DIR = path.join(ROOT_DIR, "executor");
 const TARGET_DIR = `/app/codes`;
 const IMAGE_NAME = "executor:1.0";
 const VOL_NAME = `my_vol`;
-// const VOL_NAME = SOURCE_DIR;
+//const VOL_NAME = SOURCE_DIR;
 
 class CodeService {
   async execute(code, input, lang, id) {
-    // console.log('code', code);
-    console.log(SOURCE_DIR);
+    //console.log('code', code);
     try {
       !input ? (input = "") : null;
 
@@ -168,10 +167,11 @@ class CodeService {
         if (err) throw { message: err };
       });
     }
-    if (lang == "cpp") {
-      fs.unlinkSync(path.join(SOURCE_DIR, id), (err) => {
-        if (err) throw err;
-      });
+    if (lang == "cpp" || lang == "c") {
+      if (fs.existsSync(path.join(SOURCE_DIR, id)))
+        fs.unlinkSync(path.join(SOURCE_DIR, id), (err) => {
+          if (err) throw err;
+        });
     }
     if (lang == "java") {
       fs.unlinkSync(path.join(SOURCE_DIR, "Input.class"), (err) => {

rce-server/server/api/services/validation.service.js

@@ -25,7 +25,11 @@ class ValidationService {
             message: "You have unacceptable libs imported",
           };
         } else if (
+<<<<<<< HEAD
           words.every((el) => code.toLowerCase().includes(el.toLowerCase()))
+=======
+          !words.every(el => code.toLowerCase().includes(el.toLowerCase()))
+>>>>>>> 8ba1999345de29ac621848df532983f857213ca7
         ) {
           return {
             isValid: false,