diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc new file mode 100644 index 0000000..ea81de3 Binary files /dev/null and b/__pycache__/main.cpython-312.pyc differ diff --git a/database.db b/database.db index 26fcec2..3e3e2d7 100644 Binary files a/database.db and b/database.db differ diff --git a/main.py b/main.py index 67fb91b..3b747d9 100644 --- a/main.py +++ b/main.py @@ -21,9 +21,9 @@ def get_login_details(): no_of_items = 0 else: logged_in = True - cur.execute("SELECT user_id, first_name FROM users WHERE email = '" + session['email'] + "'") + cur.execute("SELECT userId, firstName FROM users WHERE email = '" + session['email'] + "'") # Fixed user_id & first_name to userId & firstName, Yeab 11/21/2023 user_id, first_name = cur.fetchone() - cur.execute("SELECT count(productId) FROM kart WHERE user_id = " + str(user_id)) + cur.execute("SELECT count(productId) FROM kart WHERE userId = " + str(user_id)) #Fixed user_id to userId, Yeab 11/21/2023 no_of_items = cur.fetchone()[0] conn.close() return (logged_in, first_name, no_of_items) @@ -36,13 +36,13 @@ def root(): # Show last product added cur.execute('SELECT productId, name, price, description, image, stock FROM products ORDER BY productId DESC LIMIT 1 ') # Show all items - #cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') + cur.execute('SELECT productId, name, price, description, image, stock FROM products LIMIT 1') # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = cur.fetchall() # Show an error instead of the categories category_data = [(-1,"Error")] # Show all categories - #cur.execute('SELECT categoryId, name FROM categories') - #category_data = cur.fetchall() + cur.execute('SELECT categoryId, name FROM categories') # hashtag in front of line removed by Tyler Sabin 11/16/2023 + category_data = cur.fetchall() # hashtag in front of line removed by Tyler Sabin 11/16/2023 item_data = parse(item_data) return render_template('home.html', itemData=item_data, loggedIn=logged_in, firstName=first_name, noOfItems=no_of_items, categoryData=category_data) @@ -176,10 +176,10 @@ def update_profile(): @app.route("/loginForm") def login_form(): # Uncomment to enable logging in and registration - #if 'email' in session: + if 'email' in session: #Uncommented by Yeab 1/18/2023 return redirect(url_for('root')) - #else: - # return render_template('login.html', error='') + else: #Uncommented by Yeab 1/18/2023 + return render_template('login.html', error='') #Uncommented by Yeab 1/18/2023 @app.route("/login", methods = ['POST', 'GET']) def login():