#15 finished

Source/assets/css/main.css

@@ -54,6 +54,10 @@ p{
     background-color: #b2dbfb !important
 }
 
+.loginMessage {
+    display: none;
+}
+
 .codebox{
     margin-top: 2em;
     margin-bottom: 2em;

Source/assets/html/base.twig

@@ -15,6 +15,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <script src="{{ app.frontjs }}/highlight.pack.js"></script>
     <script src="{{ app.frontjs }}/jquery-3.2.1.min.js"></script>
+    <script src="{{ app.frontjs }}/jquery.form.min.js"></script>
     <script src="{{ app.frontjs }}/bootstrap.min.js"></script>
     <script src='https://www.google.com/recaptcha/api.js'></script>
     <script src="{{ app.frontjs }}/functions.js"></script>

Source/assets/html/loginregister.twig

@@ -8,20 +8,15 @@
         </div>
         <div class="row">
             <div class="col-sm-12">
-            {% if page.state == 'BAD_CREDENTIAL' %}
+                <p class="text-danger loginMessage" id="BAD_CREDENTIAL">Bad credentials</p>
-                <p class="text-danger">Bad credentials</p>
+                <p class="text-danger loginMessage" id="POST_ERROR">Error during sign-up, check your data</p>
-            {% elseif page.state == 'POST_ERROR' %}
+                <p class="text-danger loginMessage" id="MAIL_IN_USE">The e-mail is currently in use</p>
-                <p class="text-danger">Error during sign-up, check your data</p>
+                <p class="text-danger loginMessage" id="NICK_IN_USE">The nickname is currently in use</p>
-            {% elseif page.state == 'MAIL_IN_USE' %}
-                <p class="text-danger">The e-mail is currently in use</p>
-            {% elseif page.state == 'NICK_IN_USE' %}
-                <p class="text-danger">The nickname is currently in use</p>
-            {% endif %}
             </div>
         </div>
     </div>
     <div id="login">
-        <form class="form-horizontal" method="post">
+        <form class="form-horizontal" method="post" id="loginForm">
             <div class="form-group">
                 <label class="control-label col-sm-2" for="email">Email:</label>
                 <div class="col-sm-10">
@@ -45,7 +40,7 @@
         </form>
     </div>
     <div id="register" style="display:none;">
-        <form class="form-horizontal" method="post">
+        <form class="form-horizontal" method="post" id="regForm">
             <div class="form-group">
                 <label class="control-label col-sm-2" for="emailre">Email:</label>
                 <div class="col-sm-10">
@@ -98,6 +93,28 @@
 {% block js %}
     <script>
 
+        doneFun = function(data){
+            console.log(data);
+            if (data == 'redirect'){
+                window.location.href = '{{path('home')}}';
+            }
+            var todos = $(".text-danger").each(function (){
+                $(this).css("display","none");
+            });
+            $("#"+data).css('display',"block");
+        }
+
+        $(document).ready(function() {
+            var options = {success: doneFun,
+                           url: '{{ path("login")}}',
+                           beforeSubmit: function(arr, $form, options){
+                               console.log(arr);
+                           }}  ;     
+            $("#regForm").ajaxForm(options);
+
+            $("#loginForm").ajaxForm(options);
+        });
+
         function checkPassword() {
             if ($('#pwdre').val() != $("#pwdre-re").val()) {
                 $("#pwdre-re")[0].setCustomValidity('Password do not match');

Source/src/DB.php

@@ -440,7 +440,7 @@ class DB
         else {
             $password = hash('sha256', $pass);
             dbw_query($this->conn, "INSERT INTO Users (`email`,`pass`,`nick`) VALUES ('$email','$password','$nick')");
-            return true;
+            return 'CORRECT';
         }
     }
 

Source/src/app.php

@@ -164,7 +164,9 @@ $app->get('/signup', function(Request $request) use ($app){
 
 function loginRegister($default,$state=''){
     global $app;
-
+    if($state!=''){
+        return $state;
+    }
     $page = array(
         "title"     =>  ucfirst($default),
         "description" => "Start now in CodeShare",
@@ -182,7 +184,7 @@ function loginOrRegister($state,$request){
             return loginRegister('login','BAD_CREDENTIAL');
         case 1:
             if(checklogin($request->get('email'),$request->get('pwd'))==''){
-                return $app->redirect($app["url_generator"]->generate('home'));
+                return 'redirect';
             }else{
                 return loginRegister("login",'BAD_CREDENTIAL');
             }
@@ -190,7 +192,7 @@ function loginOrRegister($state,$request){
             $state = register($request->get('emailre'),$request->get('emailre-re'),
             $request->get('pwdre'),  $request->get('pwdre-re'),$request->get('nick'));
             if ($state == '') 
-                return $app->redirect($app["url_generator"]->generate('home'));    
+                return 'redirect'; 
             else
                 return loginRegister("sing-up",$state);
             

Source/src/users.php

@@ -27,6 +27,7 @@ function checkInfo($request){
 function checklogin($email,$pass){
     $db = new DB();
     $bool = $db->checkPass($email,$pass);
+    
     if($bool){
         $idu = $db->loadIDU($email);
         $token = RandomString(50);
@@ -37,7 +38,7 @@ function checklogin($email,$pass){
         return '';
     }
     $db->close();
-    return false;
+    return 'BAD';
 }
 
 /**
@@ -53,7 +54,7 @@ function register($email,$emailre,$pass,$passre,$nick){
     if($emailre != $email || $pass != $passre)
         return 'POST_ERROR';
     $state = $db->register($email,$pass,$nick);
-    if($state) {
+    if($state == 'CORRECT') {
         $db->close();
         return checklogin($email, $pass);
     }else {