diff --git a/app.py b/app.py index 97f6a52..cb3f2a1 100644 --- a/app.py +++ b/app.py @@ -41,7 +41,9 @@ def index(): cash = db.execute("SELECT * FROM users where id = ?", user_id) stocks = db.execute( - "SELECT symbol, sum(shares) FROM transactions WHERE user_id = ? GROUP BY symbol HAVING sum(shares) > 0", user_id) + "SELECT symbol, sum(shares) FROM transactions WHERE user_id = ? GROUP BY symbol HAVING sum(shares) > 0", + user_id, + ) stocks_total = 0 @@ -60,13 +62,15 @@ def index(): # Get total value of stocks and cash total = cash[0]["cash"] + stocks_total - return render_template("home.html", cash=cash[0]["cash"], stocks=stocks, total=total) + return render_template( + "home.html", cash=cash[0]["cash"], stocks=stocks, total=total + ) # return apology("MOFO") @app.route("/buy", methods=["GET", "POST"]) @login_required -def buy():# +def buy(): """Buy shares of stock""" if request.method == "GET": return render_template("buy.html") @@ -90,7 +94,9 @@ def buy():# transaction_value = float(shares) * stock["price"] user_id = session["user_id"] - user_cash_db = db.execute("SELECT cash FROM users WHERE id = ?", user_id) + user_cash_db = db.execute( + "SELECT cash FROM users WHERE id = ?", user_id + ) user_cash = user_cash_db[0]["cash"] if user_cash < transaction_value: @@ -102,8 +108,14 @@ def buy():# date = datetime.datetime.now() - db.execute("INSERT INTO transactions (user_id, symbol, shares, price, date) VALUES (?, ?, ?, ?, ?)", - user_id, stock["symbol"], shares, stock["price"], date) + db.execute( + "INSERT INTO transactions (user_id, symbol, shares, price, date) VALUES (?, ?, ?, ?, ?)", + user_id, + stock["symbol"], + shares, + stock["price"], + date, + ) flash("Bought!") else: @@ -220,8 +232,11 @@ def register(): if username_exists: return apology("username already exists!", 400) - db.execute("INSERT INTO users(username, hash) VALUES(?, ?)", - username, generate_password_hash(password)) + db.execute( + "INSERT INTO users(username, hash) VALUES(?, ?)", + username, + generate_password_hash(password), + ) return redirect("/") else: return render_template("register.html") @@ -247,7 +262,10 @@ def sell(): return apology("Symbol not found") stocks = db.execute( - "SELECT symbol, sum(shares) FROM transactions WHERE user_id = ? AND symbol = ?", user_id, symbol) + "SELECT symbol, sum(shares) FROM transactions WHERE user_id = ? AND symbol = ?", + user_id, + symbol, + ) if stocks[0]["sum(shares)"] < shares: return apology("Not enough shares") @@ -263,8 +281,14 @@ def sell(): date = datetime.datetime.now() - db.execute("INSERT INTO transactions (user_id, symbol, shares, price, date) VALUES (?, ?, ?, ?, ?)", - user_id, stock["symbol"], -abs(shares), stock["price"], date) + db.execute( + "INSERT INTO transactions (user_id, symbol, shares, price, date) VALUES (?, ?, ?, ?, ?)", + user_id, + stock["symbol"], + -abs(shares), + stock["price"], + date, + ) flash("Sold!") @@ -272,6 +296,8 @@ def sell(): else: stocks = db.execute( - "SELECT symbol FROM transactions WHERE user_id = ? GROUP BY symbol HAVING sum(shares) > 0", user_id) + "SELECT symbol FROM transactions WHERE user_id = ? GROUP BY symbol HAVING sum(shares) > 0", + user_id, + ) return render_template("sell.html", stocks=stocks) # return apology("TODO") diff --git a/flask_session/16fa13c5890feb947b5d5c907cfedf5b b/flask_session/16fa13c5890feb947b5d5c907cfedf5b deleted file mode 100644 index 4bd85b0..0000000 Binary files a/flask_session/16fa13c5890feb947b5d5c907cfedf5b and /dev/null differ diff --git a/flask_session/2029240f6d1128be89ddc32729463129 b/flask_session/2029240f6d1128be89ddc32729463129 deleted file mode 100644 index 7f5741f..0000000 Binary files a/flask_session/2029240f6d1128be89ddc32729463129 and /dev/null differ diff --git a/flask_session/39b31c290f4b506fd545e82536ad3484 b/flask_session/39b31c290f4b506fd545e82536ad3484 deleted file mode 100644 index 2f7fa3a..0000000 Binary files a/flask_session/39b31c290f4b506fd545e82536ad3484 and /dev/null differ diff --git a/templates/buy.html b/templates/buy.html index b34ebb5..2659c6e 100644 --- a/templates/buy.html +++ b/templates/buy.html @@ -10,7 +10,7 @@