diff --git a/store/routes.py b/store/routes.py index 69a50584e7dc89c11683d50d53e0951b26f41d10..e63b9cc3fd83d4fe3871c7446eac7ef1bccb2779 100644 --- a/store/routes.py +++ b/store/routes.py @@ -462,6 +462,47 @@ def item_page(item_id): ) +@app.route("/addAdress", methods=["GET", "POST"]) +@login_required +def addAdress(): + if request.method == "POST": + user_id = current_user.user_id + country = request.form["country"] + homeNumber = request.form["homeNumber"] + streetName = request.form["streetName"] + city = request.form["city"] + phoneNumber = request.form["phoneNumber"] + contactEmail = request.form["contactEmail"] + + # user = User.query.get(user_id) + + newAdress = Adresses.create_Adresses( + user_id=user_id, + country=country, + homeNumber=homeNumber, + streetName=streetName, + city=city, + phoneNumber=phoneNumber, + contactEmail=contactEmail, + ) + flash("Your address has been added!") + return redirect(url_for("addAdress")) + return render_template("userContent/address.html") + + +@app.route("/view_address", methods=["GET"]) +@login_required +def view_address(): + user_id = current_user.user_id + addresses = Adresses.query.filter_by(user_id=user_id).all() + + if not addresses: + flash("You don't have any saved addresses. you can add here") + return redirect(url_for("addAdress", user_id=user_id)) + else: + return render_template("userContent/view_address.html", addresses=addresses) + + @app.context_processor def base(): """So that search works on every page, and so that the search form does not need to be passed diff --git a/store/static/_main.css b/store/static/_main.css index 1599adf4513f95a2667470adf6a091faa1350191..c8a47b1c5ef278d1bf21d526315bd954eae6ddcb 100644 --- a/store/static/_main.css +++ b/store/static/_main.css @@ -121,10 +121,6 @@ section { margin: 0 auto; } - - - - body { line-height: 1; } @@ -147,7 +143,10 @@ q:after { content: none; } - +/* table { + border-collapse: collapse; + border-spacing: 0; +} */ /* End of resetting */ diff --git a/store/templates/userContent/user.html b/store/templates/userContent/user.html index eff6f6a4e4f1f2b5560892c22b8d9dfa49a26855..eb4a4c7d2de7c1339c6df657806125dd1e3a672c 100644 --- a/store/templates/userContent/user.html +++ b/store/templates/userContent/user.html @@ -5,5 +5,6 @@ <ul> <li><a href="{{ url_for('accountDetails', user_id=current_user.id)}}">View my Account details</a></li> <li><a href="{{ url_for('addAdress', user_id=current_user.id)}}">Add shipping address</a></li> + <li><a href="{{ url_for('view_address', user_id=current_user.id)}}">View your shipping address</a></li> </ul> {% endblock %} \ No newline at end of file diff --git a/store/utility.py b/store/utility.py index de79c0e5793b39d3a2d87fbfb855b1ce4a60ffab..aae06c2a84caa914ac84e37bfaf957b068039aba 100644 --- a/store/utility.py +++ b/store/utility.py @@ -26,6 +26,7 @@ def get_item_by_id(item_id): if item is not None: return item else: + # TODO error handling # TODO error handling pass