Aaljabali1 patch 1

P3 CHANGELOG.md

@@ -0,0 +1,37 @@
+# P3 Implementation Changelog
+
+## **Changes by Alberto**
+### Website:
+
+- **REQ-1:** Added Homepage navbar with home button to redirect to homepage - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/18caea8cbcf944fd41e9b9a98fd1623d5565908e) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/370521892db1ca19dc27f95c0b657920d2da17db) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/0208311f4df315586c961a88ccda8a430d727032)
+- **REQ-2:** Users can register account into the database and login - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/9072eacd0b405eebb15afbdb7c6357a643ff2616) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/9072eacd0b405eebb15afbdb7c6357a643ff2616)
+- **REQ-3:** Users have their cart saved even after logging out - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/1d6dc85768a670a6f7f3af8e7404e2b336209318)
+- **REQ-4:** Customers can now add products to the shopping cart and view the content - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/238ba64e30c9bc58f8ff03d8792e8e08b91e144f)
+- **REQ-5:** `Admin Panel` added to manage some database functions. Only accessible through admin login - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/7696795c4466f83ee2be3e97e6510c5d14c7202d) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/9f6f53fca778f01a1dee26c16d15a982e1f17028) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/07e4b425f239c1ac5c1d221a535feda6e2512cfc) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/7696795c4466f83ee2be3e97e6510c5d14c7202d)
+- **REQ-6:** Customers can checkout product in the index page, but needs to have an account to checkout - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/b96975418ae36ef286ce214c9c54ddfb7066cafc)
+- **REQ-7:** Items are displayed neatly with name, image, info and price - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/a9f203fced50599f64ee3ad2aa8e51ccc65529a1) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/441ed3288de037ea8bcedc3eafb43a85aafa807f) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/441ed3288de037ea8bcedc3eafb43a85aafa807f)
+- **REQ-8:** Database storing inventory, sales and users' informations - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/545671b11dc075284acd5c714f931c56a2249de1) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/a9f203fced50599f64ee3ad2aa8e51ccc65529a1) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/0a0933441cafe76ac1258b12cb1671568431b363)
+- **REQ-9:** Added items stock function to keep track of items available, can't buy items if not enough in stock warning - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/789a41d5e2b3bb15d3d537a150a13fb8eeba81dc) 
+- **REQ-10:** Checkout page will now show total cost of the order - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/238ba64e30c9bc58f8ff03d8792e8e08b91e144f) - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/b76f8b0f67809ad985299cf0dce4e4e627a1d05f)
+- **REQ-11:** Admin Panel will now allow admin to update products information - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/07e4b425f239c1ac5c1d221a535feda6e2512cfc)
+- **REQ-12:** Admin Panel will now allow admin to add products to database  - [COMMIT](https://github.com/olivialba/onlineStoreTemplate/commit/7696795c4466f83ee2be3e97e6510c5d14c7202d)
+- Added Header
+- Added Logout
+- Added Order Page table to see a user's past orders
+- Added Users can update quantity of items at checkout
+- Changed overall CSS style of the Website
+- Changed Login and Register buttons
+
+### Admin Panel:
+- Bookstoremanager login will show an Admin panel, the panel is defined in 'admin_panel.html' and 'admin_panel.py'
+- Bookstoremanager login info: 
+  - Username: `Admin`
+  - Password: `Admin`
+
+### Fixed Bugs:
+- Prevent: users can't register with 'default' or 'admin' in their username, to prevent bugs
+- Fixed: login users didn't change session to their new login
+- Fixed: customers can't login if username or password invalid
+- Fixed: incorrect and uneven css style for login and register .html pages
+- Fixed: Incorrect backend for login-logout
+- Fixed: Users now keep their cart saved even after logging out

README.md

@@ -2,7 +2,7 @@
 
 ## Description
 
-This repository contains template code for a simple online store, built for my students in ITSC 3155 - Software Engineering at UNC Charlotte. Since the code is written as a starting template for students' group final projects, this repository should not be seen as a complete, production-ready online store. Functional features like user session management, database access, unit testing, and server-side rendering are included but kept at an abstract level. Users are instructed to fork this repository and customize it to the needs of their own project.
+This repository contains code for an online bookstore created by our team based on the ITSC 3155 template. the website displays list of items in stock but one must be logged in to place an order. A customer can log in using the login button or register a new user using the register button.
 
 ## How to Use
 
@@ -22,7 +22,7 @@ pip3 install -r requirements.txt
 The project uses a SQLite database, which is stored in the `database` directory. To create or reset the database, navigate to the `database` directory and run the following command:
 
 ```bash
-python3 reset_database.py
+python3 ./database/reset_database.py
 # Note: depending on your system, you may need to use `python3.10` or `py` instead of `python3`
 ```
 

admin_panel.py

@@ -0,0 +1,129 @@
+# Admin Panel by Alberto Olivi
+
+from authentication.auth_tools import login_pipeline, update_passwords, hash_password
+from flask import Blueprint, Flask, render_template, request
+from core_info import sessions, db, admin_add_new_item
+
+admin_panel_bp = Blueprint('admin_panel', __name__) 
+
+"""
+Used to update product info
+First is textfield from which to take value, second is method to use to update said value
+"""
+field_to_db_update = {
+    'itemname_update': db.set_item_name,
+    'info_update': db.set_item_info,
+    'price_update': db.set_item_price,
+    'stock_update': db.set_item_stock,
+    'image_url_update': db.set_item_image_url,
+    'category_update': db.set_item_category
+}
+
+
+@admin_panel_bp.route('/admin_panel/add-product', methods=['POST'])
+def add_product():
+    """
+    Renders the add-product request when the user is at the `/admin_panel/add-product` endpoint with a POST request.
+    Add product to the database.
+
+    args:
+        - None
+
+    returns:
+        - None
+
+    modifies:
+        - database/store_records.db: add a product to the inventory in the database.
+    """
+    item_name = request.form['itemname']
+    price = request.form['price']
+    info = request.form['info']
+    stock = request.form['stock']
+    image_url = request.form['image_url']
+    category = request.form['category']
+
+    success, message = admin_add_new_item(db, item_name, price, info, stock, image_url, category)
+    if success:
+        print(message)
+        return render_template('admin_panel.html', product_added=True)
+    else:
+        print("Error: ", message)
+        return render_template('admin_panel.html', error_message=message)
+
+
+@admin_panel_bp.route('/admin_panel/update-product', methods=['POST'])
+def update_product():
+    """
+    Renders the update-product page when the user is at the `/admin_panel/update-product` endpoint with a POST request.
+    Shows product data and allows for product data to be edited in the database.
+
+    args:
+        - None
+
+    returns:
+        - Data: shows product's data in the /update-product page
+
+    modifies:
+        - database/store_records.db: change a product data
+    """
+
+    # Button to search for product in database
+    if 'button_send' in request.form and request.form['button_send'] == 'find_product':
+        item_id = request.form['itemid']
+        return render_item_info(item_id)
+
+    # Button to update a product in database
+    elif 'button_send' in request.form and request.form['button_send'] == 'update_product':
+        item_id = request.form['id_update']
+        for field, update_info in field_to_db_update.items():
+            new_value = request.form[field].strip()
+            if new_value:
+                update_info(item_id, new_value)
+        return render_item_info(item_id)
+
+    else:
+        print('Error: Could not detect button pressed. How were you even able to cause this error?')
+        return render_template('admin_panel.html')
+
+
+@admin_panel_bp.route('/admin_panel/view-inventory', methods=['POST'])
+def view_inventory():
+    """
+    Renders the inventory products when the user is at the `/admin_panel/view-inventory` endpoint with a POST request.
+    With 'GET' you can go directly to the url even without admin access or log in?
+
+    args:
+        - None
+
+    returns:
+        - None
+    """
+    inventory = db.get_full_inventory()
+    return render_template('admin_panel.html', inventory=inventory)
+
+
+
+def render_item_info(item_id: int):
+    """
+    Get all the product data corresponding to the product item_id from the database.
+    Used to display data for the 'Update Product' panel
+
+    args:
+        - item_id: integer for product id
+
+    returns:
+        - Render admin_panel page with product/item information
+    """
+    check = db.get_item_name_by_id(item_id)
+
+    # Couldn't find item ID in database, send item_not_found error
+    if check is None:
+        return render_template('admin_panel.html', item_not_found=True)
+
+    name = check['item_name']
+    info = db.get_item_info_by_id(item_id)['info']
+    price = db.get_item_price_by_id(item_id)['price']
+    stock = db.get_item_stock_by_id(item_id)['stock']
+    image_url = db.get_item_image_url_by_id(item_id)['image_url']
+    category = db.get_item_category_by_id(item_id)['category']
+    return render_template('admin_panel.html', item_found=True, item_id=item_id, name=name, info=info, price=price, stock=stock, image_url=image_url, category=category)