Arpitha dev

Controller/home.py

@@ -1,9 +1,11 @@
-from flask import Blueprint
+from flask import Blueprint, flash
 from flask import Flask, render_template, url_for, request
 from flask_login import login_required, logout_user
 from werkzeug.utils import redirect
+from Controller.user_controller import User
 home_route = Blueprint('home_route', __name__)
 
+user = User()
 
 data = {
     "wishlist": ["Microsoft", "Google", "Uber"],
@@ -41,11 +43,42 @@
 }
 
 
-@home_route.route('', methods=['GET'])
-@login_required
-def home():
-    return render_template('home.html', data=data, upcoming_events=upcoming_events)
+# @home_route.route('', methods=['GET'])
+# @login_required
+# def home():
+#     return render_template('home.html', data=data, upcoming_events=upcoming_events)
+
+@home_route.route('/', methods=['GET', 'POST'])
+@home_route.route('/login', methods=['GET', 'POST'])
+def login():
+    return render_template('login.html',loginError = "")
 
+@home_route.route('/loginUser', methods=['GET', 'POST'])
+def loginUser():
+    email = request.form["username"]
+    password = request.form["password"]
+    result = user.get(email,password)
+    error = ""
+    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)
+
+
+@home_route.route('/signup', methods=['POST'])
+def signup():
+    name =  request.form["name"]
+    email = request.form["email"]
+    password = request.form["password"]
+    result = user.post(name,email,password)
+    if(result ==0):
+        error = "This email already exists. Please try with different email"
+        return render_template('login.html/signup', emailError=error)
+    return render_template('home.html', data=data, upcoming_events=upcoming_events)
 
 @home_route.route('/view', methods=['GET'])
 @login_required
@@ -57,4 +90,7 @@ def view():
 @login_required
 def logout():
     logout_user()
-    return redirect("/login")
+    return redirect("/login")
+
+if __name__ == '__main__':
+    app.run(debug=True)

Controller/user_controller.py

@@ -12,16 +12,13 @@ def __init__(self):
         self.user = user_dao()
 
     #@login_required
-    def get(self):
-        self.user.get_user()
-        return make_response('Coming Soon!!')
-        # return make_response(render_template('home.html', data=data, upcoming_events=upcoming_events), 200, headers)
+    def get(self,email,password):
+        return self.user.get_user(email,password)
 
     #@login_required
-    def post(self):
-        self.user.create_user()
-        some_json=request.get_json()
-        return {'you sent': some_json}, 200
+    def post(self, name, email,password):
+        return self.user.create_user(name,email,password)
+
 
     #@login_required
     def put(self):

DAO/sql_helper.py

@@ -7,10 +7,10 @@ def __init__(self):
     def connect_database(self):
         try:
             self.connection_obj = pymysql.connect(
-                    host= os.environ['aws_rds_host'], 
+                    host= 'wolftrack.c2msdsmdjmxj.us-east-2.rds.amazonaws.com', 
                     port = 3306,
-                    user = os.environ['aws_rds_user'], 
-                    password = os.environ['aws_rds_password'],
+                    user = "admin", 
+                    password = "wolftrack123",
                     db = "wolftrack",
                     autocommit=True
                     ) 

DAO/user_dao.py

@@ -1,14 +1,24 @@
-
+from DAO.sql_helper import sql_helper
 
 class user_dao:
     def __init__(self):
-        pass
+        self.__db = sql_helper()
 
-    def create_user(self):
-        pass
-
-    def get_user(self):
-        pass
+    def create_user(self, name, email, password):
+        if(email == self.__db.run_query("SELECT email FROM user WHERE email='"+email+"'")[0][0]):
+            return 0
+        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+"'")
+        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
+            else:
+                return 2
+
 
     def update_details(self):
         pass

Login/login.py

@@ -1,84 +1,84 @@
-from flask import Blueprint, session, request, redirect, render_template, current_app, make_response, url_for
-from flask_login import LoginManager, login_user, UserMixin
-from datetime import datetime, timedelta
-
-login_route = Blueprint('admin', __name__)
-login_manager = LoginManager()
-headers = {'Content-Type': 'text/html'}
-
-data = {
-    "wishlist": ["Microsoft", "Google", "Uber"],
-    "inprogress": ["Twitter", "Pearson"],
-    "applied": ["Amazon", "NetApp"],
-    "offers": ["Perfios"]
-}
-
-upcoming_events = [
-    {"duedate": "28th Sept, 2021",
-     "company": "Apple"
-     },
-    {"duedate": "19th Dec, 2021",
-     "company": "Microsoft"
-     },
-    {"duedate": "21st Dec, 2021",
-     "company": "Amazon"
-     },
-    {"duedate": "21st Dec, 2021",
-     "company": "Amazon"
-     },
-    {"duedate": "21st Dec, 2021",
-     "company": "Amazon"
-     }
-]
-
-
-@login_route.record_once
-def on_load(state):
-    login_manager.init_app(state.app)
-
-@login_manager.user_loader
-def load_user(userid):
-    return User(session['userinfo']['userid'])
-
-@login_route.before_app_request
-def before_request():
-    session.modified = True
-    current_app.permanent_session_lifetime = timedelta(minutes=30)
-    if request.endpoint != 'login_manager.login':
-        if 'userinfo' not in session:
-            pass
-
-class User(UserMixin):
-    def __init__(self, username) -> None:
-        self.username = username
-
-    def is_active(self):
-        return self.active
-
-    def is_anonymous(self):
-        return False
-
-    def is_authenticated(self):
-        return True
-
-
-def is_valid(username, password):
-    ''' Validate the username and password with DB '''
-    return True
-
-
-@login_route.route('', methods=["GET", "POST"])
-def login():
-    if request.method == 'GET':
-        return make_response(render_template('login.html'), 200, headers)
-    username = request.form['username']
-    password = request.form['password']
-    if not is_valid(username, password):
-        pass
-    user = User(username)
-    session['userinfo'] = {'userid': username}
-    user.id = username
-    if request.method == 'POST':
-        login_user(user)
-
-    return redirect(url_for('home_route.home'))
+# from flask import Blueprint, session, request, redirect, render_template, current_app, make_response, url_for
+# from flask_login import LoginManager, login_user, UserMixin
+# from datetime import datetime, timedelta
+
+# login_route = Blueprint('admin', __name__)
+# login_manager = LoginManager()
+# headers = {'Content-Type': 'text/html'}
+
+# data = {
+#     "wishlist": ["Microsoft", "Google", "Uber"],
+#     "inprogress": ["Twitter", "Pearson"],
+#     "applied": ["Amazon", "NetApp"],
+#     "offers": ["Perfios"]
+# }
+
+# upcoming_events = [
+#     {"duedate": "28th Sept, 2021",
+#      "company": "Apple"
+#      },
+#     {"duedate": "19th Dec, 2021",
+#      "company": "Microsoft"
+#      },
+#     {"duedate": "21st Dec, 2021",
+#      "company": "Amazon"
+#      },
+#     {"duedate": "21st Dec, 2021",
+#      "company": "Amazon"
+#      },
+#     {"duedate": "21st Dec, 2021",
+#      "company": "Amazon"
+#      }
+# ]
+
+
+# @login_route.record_once
+# def on_load(state):
+#     login_manager.init_app(state.app)
+
+# @login_manager.user_loader
+# def load_user(userid):
+#     return User(session['userinfo']['userid'])
+
+# @login_route.before_app_request
+# def before_request():
+#     session.modified = True
+#     current_app.permanent_session_lifetime = timedelta(minutes=30)
+#     if request.endpoint != 'login_manager.login':
+#         if 'userinfo' not in session:
+#             pass
+
+# class User(UserMixin):
+#     def __init__(self, username) -> None:
+#         self.username = username
+
+#     def is_active(self):
+#         return self.active
+
+#     def is_anonymous(self):
+#         return False
+
+#     def is_authenticated(self):
+#         return True
+
+
+# def is_valid(username, password):
+#     ''' Validate the username and password with DB '''
+#     return True
+
+
+# @login_route.route('', methods=["GET", "POST"])
+# def login():
+#     if request.method == 'GET':
+#         return make_response(render_template('login.html'), 200, headers)
+#     username = request.form['username']
+#     password = request.form['password']
+#     if not is_valid(username, password):
+#         pass
+#     user = User(username)
+#     session['userinfo'] = {'userid': username}
+#     user.id = username
+#     if request.method == 'POST':
+#         login_user(user)
+
+#     return redirect(url_for('home_route.home'))

main.py

@@ -1,6 +1,6 @@
 from flask import Flask, request, render_template, make_response
 from flask_restful import Resource, Api
-from Login.login import login_route
+# from Login.login import login_route
 from Controller.activity_controller import Activity
 from Controller.application_controller import Application
 from Controller.profile_controller import Profile
@@ -14,7 +14,7 @@
 api.add_resource(Activity, '/activity')
 api.add_resource(Profile, '/profile')
 api.add_resource(Application, '/application')
-app.register_blueprint(login_route, url_prefix='/login')
+app.register_blueprint(home_route, url_prefix='/login')
 app.register_blueprint(home_route, url_prefix='/')
 app.app_context().push()