Fixed Issue with multiple emails

circuit · Jan 4, 2018 · 69e40a7 · 69e40a7
1 parent a2d48e2
commit 69e40a7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 23 deletions.
diff --git a/customer-support b/customer-support
diff --git a/public/main.js b/public/main.js
@@ -48,26 +48,6 @@ document.addEventListener('DOMContentLoaded', event => {
   }
 
   function createComplaint(e) {
-<<<<<<< HEAD
-
-    if(model.name == undefined || model.email == undefined || model.topic == undefined || model.message == undefined){
-
-      let resp = "";
-
-      if(model.name == undefined){
-        resp+="**Name** is empty, please fill in your name. \n\n";
-      }
-      if(model.email == undefined){
-        resp+="**Email** is empty, please fill in your email adress. \n\n";
-      }
-      if(model.topic == undefined){
-        resp+="**Issue** You did not select a relevant issue, please select **other** if you're having a different problem not listed.\n\n";
-      }
-      if(model.message == undefined){
-        resp+="**Message** Please fill out a message decribing your issue.\n\n";
-      }
-
-=======
     e.preventDefault();
 
     if (!model.name || !model.email || !model.topic || !model.message) {
@@ -76,7 +56,6 @@ document.addEventListener('DOMContentLoaded', event => {
       !model.email && (resp += 'Please fill in your email adress. \n\n');
       !model.topic && (resp += `You did not select a relevant issue, please select **other** if you're having a different problem not listed.\n\n`);
       !model.message && (resp += 'Please fill out a message decribing your issue.\n\n');
->>>>>>> e707d85aa52167100430da7f0f9237421af08b6e
       alert(resp);
       return;
     }

diff --git a/server.js b/server.js
@@ -198,5 +198,4 @@ emitter.on('message-received', async data => {
 
 
 
-
 server.listen(port, _ => console.log(`Server listening at port ${port}`));
Original file line number	Diff line number	Diff line change
Expand Up		@@ -198,5 +198,4 @@ emitter.on('message-received', async data => {




		server.listen(port, _ => console.log(`Server listening at port ${port}`));