minor

.gitignore

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

backend/register.php

@@ -4,15 +4,11 @@
 * 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.
 */
 
-<<<<<<< HEAD
 header("Access-Control-Allow-Origin: *");
 header('Access-Control-Allow-Credentials: true');
 header("Access-Control-Allow-Methods: PUT, GET, POST, DELETE");
 header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept");
 header("Content-Type: application/json; charset=UTF-8");
-=======
-
->>>>>>> 8601987f1aa6573181cb9427847fcf57dc1afcf6
 
 include_once("database.php");
 

src/app/home/home.component.ts

@@ -100,10 +100,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();
       }
     );
+    
   }
 }