Merge pull request #17 from ArpithaVijayakumar/arpitha-dev

Arpitha dev
ArpithaVijayakumar · Nov 2, 2021 · a98abb6 · a98abb6
2 parents 84862ad + 657d996
commit a98abb6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Controller/home.py b/Controller/home.py
@@ -62,11 +62,11 @@ def loginUser():
     if(result == 0):
         error = "Email does not exits. Please enter a valid email."
         return render_template('login.html',loginError = error)
-    elif(result == 1):
-        return render_template('home.html', data=data, upcoming_events=upcoming_events)
     elif(result == 2):
         error="Password incorrect."
         return render_template('login.html',loginError = error)
+    else:
+        return render_template('home.html', data=result, upcoming_events=upcoming_events)
 
 
 @home_route.route('/signup', methods=['POST'])

diff --git a/DAO/user_dao.py b/DAO/user_dao.py
@@ -10,12 +10,14 @@ def create_user(self, name, email, password):
         return self.__db.run_query("CALL CreateUser('"+email+"','"+name+"','"+password+"');")
 
     def get_user(self, email, password):
-        result = self.__db.run_query("SELECT count(*),user_id,email FROM user WHERE email='"+email+"'")
+        data = {}
+        result = self.__db.run_query("SELECT count(*),user_id,email,full_name FROM user WHERE email='"+email+"'")
         if(result[0][0]==0):
             return 0
         if(email == result[0][2]):
             if(password == self.__db.run_query("SELECT password FROM user_login WHERE user_id="+str(result[0][1]))[0][0]):
-                return 1
+                data["ful_name"] = str(result[0][3])
+                return data
             else:
                 return 2
 

diff --git a/templates/layout/base.html b/templates/layout/base.html
@@ -55,7 +55,7 @@
 
           <div class="card" style="width: 18rem; text-align: left;">
             <div class="card-body">
-              <h5 class="card-title">Jessica Holds</h5>
+              <h5 class="card-title">{{data["full_name"]}}</h5>
               <div class="row">
                 <div class="col">
                   <b>Gender</b>