Skip to content

eCommerc Website fixed #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsitum wants to merge 5 commits into
base: master
Choose a base branch
from
Open

eCommerc Website fixed #28

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5fe170
Update main.py
vsitum Jun 23, 2020
de5a959
Update main.py
kulmiye73 Jun 23, 2020
2e81780
Merge pull request #1 from vsitum/AbdisCategoryB
vsitum Jun 23, 2020
ad5babc
Update main.py
igor-turcan Jun 23, 2020
0753887
Merge pull request #2 from vsitum/IgorsItemBranch
vsitum Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] + "'")
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))
no_of_items = cur.fetchone()[0]
conn.close()
return (logged_in, first_name, no_of_items)
Expand All @@ -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')
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')
category_data = cur.fetchall()
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)

Expand Down Expand Up @@ -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:
return redirect(url_for('root'))
#else:
# return render_template('login.html', error='')
else:
return render_template('login.html', error='')

@app.route("/login", methods = ['POST', 'GET'])
def login():
Expand Down