cleaned code

chuckthefrenchie · Oct 5, 2019 · 078106f · 078106f
1 parent 5dc6dc4
commit 078106f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 45 deletions.
diff --git a/config/config.json b/config/config.json
@@ -1,7 +1,7 @@
 {
   "development": {
     "username": "root",
-    "password": "abc12345",
+    "password": "",
     "database": "blackBookApp",
     "host": "localhost",
     "dialect": "mysql"

diff --git a/public/js/app.js b/public/js/app.js
@@ -25,33 +25,7 @@ let currentIndex = null;
 
     renderNotes();
     clearValue();
-<<<<<<< HEAD
-
-    // function renderNotesEditor() {
-
-    //     var title = $("#title-name").val();
-    //     var content = $("#write-notes").val();
-
-    //     const newNote = {
-    //         title,
-    //         content
-    //     }
-
-    //     notes[currentIndex] = newNote
-
-    //     if (currentIndex === null) {
-    //         return;
-    //         alert("Hey Im null")
-    //     }else {
-    //         notes.push(newNote)
-    //     }
-    // }
-
-    // renderNotesEditor();
-
-=======
   // });
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
 
   $(document).on("click", ".back-button", function() {
     backButtonandSave();
@@ -66,8 +40,6 @@ let currentIndex = null;
     $(".notes").hide();
   });
 
-<<<<<<< HEAD
-=======
   function renderNotes() {
     $(".items").html("");
     for (var i = 0; i < notes.length; i++) {
@@ -83,7 +55,6 @@ let currentIndex = null;
     }
   }
 
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
 
   //// SENDING INFO TO BACK END
 
@@ -170,10 +141,8 @@ let currentIndex = null;
   //     .then(res => res.json())
   //     .then(renderNotes);
   // }
-<<<<<<< HEAD
 // }); // to close document ready function
 
-=======
 
   function submitNote(note) {
     $.ajax({
@@ -195,7 +164,6 @@ let currentIndex = null;
     });
   }
 // }); // to close document ready function
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
 
 
  //notes
@@ -210,12 +178,10 @@ let currentIndex = null;
             content
         };
 
-<<<<<<< HEAD
             notes.push(note);
             renderNotes();
             // renderNotesEditor();
             clearValue();  
-=======
         notes.push(note);
         renderNotes();
 
@@ -225,7 +191,6 @@ let currentIndex = null;
         }); 
 
         clearValue();  
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
 
     })
 

diff --git a/views/login.html b/views/login.html
@@ -27,10 +27,7 @@ <h1>Already have an account?</h1>
       </form id="message">
       <div id="message"></div>
       <script>
-<<<<<<< HEAD
-=======
 
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
         function displayMessage(content) {
           $("#message").text(content);
         }
@@ -39,11 +36,8 @@ <h1>Already have an account?</h1>
             evt.preventDefault();
             var userPassword = $("#password").val();
             var userName = $("#username").val();
-<<<<<<< HEAD
-=======
 
 
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
             // console.log(userPassword);
             $.ajax({
                 method: 'POST', 
@@ -74,10 +68,7 @@ <h1>Already have an account?</h1>
                   break;
               }
             });
-<<<<<<< HEAD
-=======
 
->>>>>>> 1bd4491a5d65aee6b3ff536439b73a36d3bdf49e
           })
       </script>
 </body>