1.started removal of CDNs.\n 2. Improved modular structure for all parts of project including database.

routing/store/product_category.py

@@ -0,0 +1,95 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Store Product Category Routes
+
+Description:
+Initializes the Flask application, sets the configuration based on the environment, and defines two routes (/ and /about) that render templates with the specified titles.
+"""
+
+# internal
+from business_objects.store.product import Product, Product_Filters, Product_Permutation
+from business_objects.store.stock_item import Stock_Item, Stock_Item_Filters
+from forms import Form_Supplier, Form_Filters_Permutation, Form_Filters_Stock_Item
+from models.model_view_base import Model_View_Base
+from models.model_view_store import Model_View_Store
+from models.model_view_store_supplier import Model_View_Store_Supplier
+from models.model_view_store_product_category import Model_View_Store_Product_Category
+from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation
+from models.model_view_store_stock_items import Model_View_Store_Stock_Items
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app
+from extensions import db, oauth
+from urllib.parse import quote_plus, urlencode
+from authlib.integrations.flask_client import OAuth
+from authlib.integrations.base_client import OAuthError
+from urllib.parse import quote, urlparse, parse_qs
+
+
+routes_store_product_category = Blueprint('routes_store_product_category', __name__)
+
+
+@routes_store_product_category.route('/store/categories', methods=['GET'])
+def category():
+    # filters = Product_Filters.get_default()
+    model = Model_View_Store_Product_Category()
+    return render_template('_page_store_product_categories.html', model = model)
+
+@routes_store_product_category.route('/store/category_filter', methods=['POST'])
+def category_filter():
+    data = Helper_App.get_request_data(request)
+    # form_filters = None
+    try:
+        """
+        form_filters = get_Form_Filters_Permutation(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Form invalid.\n{form_filters.errors}'})
+        # ToDo: manually validate category, product
+        filters_form = Product_Filters.from_form(form_filters)
+        """
+        model = Model_View_Store_Product_Category()
+        return jsonify({'status': 'success', 'Success': True, 'data': model.category_list.to_list()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+
+"""
+def get_Form_Filters_Product_Category(data_request):
+    data_form = data_request[Model_View_Store_Product_Permutation.KEY_FORM]
+    form_filters = Form_Filters_Permutation(**data_form)
+    form_filters.is_out_of_stock.data = av.input_bool(data_form['is_out_of_stock'], 'is_out_of_stock', 'permutations_post')
+    return form_filters
+"""
+
+@routes_store_product_category.route('/store/category_save', methods=['POST'])
+def category_save():
+    data = Helper_App.get_request_data(request)
+    # form_filters = None
+    try:
+        """
+        form_filters = get_Form_Filters_Permutation(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Filters form invalid.\n{form_filters.errors}'})
+
+        # ToDo: manually validate category, product
+        filters_form = Product_Filters.from_form(form_filters)
+        """
+        
+        categories = data[Model_View_Store_Product_Permutation.FLAG_PRODUCT_CATEGORY]
+        if len(categories) == 0:
+            return jsonify({'status': 'failure', 'Message': f'No categories.'})
+        objsCategory = []
+        for category in categories:
+            objsCategory.append(Product_Permutation.from_json(category))
+        model_save = Model_View_Store_Product_Category() # filters_product=filters_form)
+        model_save.save_categories(data.comment, objsCategory)
+
+        model_return = Model_View_Store_Product_Permutation() # filters_product=filters_form)
+        return jsonify({'status': 'success', 'Success': True, 'data': model_return.category_list.to_list_rows_permutation()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+    

routing/store/product_permutation.py

@@ -0,0 +1,90 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Store Product Permutation Routes
+
+Description:
+Initializes the Flask application, sets the configuration based on the environment, and defines two routes (/ and /about) that render templates with the specified titles.
+"""
+
+
+# internal
+from business_objects.store.product import Product, Product_Filters, Product_Permutation
+from business_objects.store.stock_item import Stock_Item, Stock_Item_Filters
+from forms import Form_Supplier, Form_Filters_Permutation, Form_Filters_Stock_Item
+from models.model_view_base import Model_View_Base
+from models.model_view_store import Model_View_Store
+from models.model_view_store_supplier import Model_View_Store_Supplier
+from models.model_view_store_product_category import Model_View_Store_Product_Category
+from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation
+from models.model_view_store_stock_items import Model_View_Store_Stock_Items
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app
+from extensions import db, oauth
+from urllib.parse import quote_plus, urlencode
+from authlib.integrations.flask_client import OAuth
+from authlib.integrations.base_client import OAuthError
+from urllib.parse import quote, urlparse, parse_qs
+
+
+routes_store_product_permutation = Blueprint('routes_store_product_permutation', __name__)
+
+
+@routes_store_product_permutation.route('/store/permutations', methods=['GET'])
+def permutation():
+    filters = Product_Filters.get_default()
+    model = Model_View_Store_Product_Permutation(filters_product=filters)
+    return render_template('_page_store_product_permutations.html', model = model)
+
+@routes_store_product_permutation.route('/store/permutation_filter', methods=['POST'])
+def permutation_filter():
+    data = Helper_App.get_request_data(request)
+    form_filters = None
+    try:
+        form_filters = get_Form_Filters_Permutation(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Form invalid.\n{form_filters.errors}'})
+        # ToDo: manually validate category, product
+        filters_form = Product_Filters.from_form(form_filters)
+        model = Model_View_Store_Product_Permutation(filters_product=filters_form)
+        return jsonify({'status': 'success', 'Success': True, 'data': model.category_list.to_list_rows_permutation()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+
+def get_Form_Filters_Permutation(data_request):
+    data_form = data_request[Model_View_Store_Product_Permutation.KEY_FORM]
+    form_filters = Form_Filters_Permutation(**data_form)
+    form_filters.is_out_of_stock.data = av.input_bool(data_form['is_out_of_stock'], 'is_out_of_stock', 'permutations_post')
+    return form_filters
+
+@routes_store_product_permutation.route('/store/permutation_save', methods=['POST'])
+def permutation_save():
+    data = Helper_App.get_request_data(request)
+    form_filters = None
+    try:
+        form_filters = get_Form_Filters_Permutation(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Filters form invalid.\n{form_filters.errors}'})
+        
+        permutations = data[Model_View_Store_Product_Permutation.KEY_PERMUTATIONS]
+        if len(permutations) == 0:
+            return jsonify({'status': 'failure', 'Message': f'No permutations.'})
+        objsPermutation = []
+        for permutation in permutations:
+            objsPermutation.append(Product_Permutation.from_json(permutation))
+
+        # ToDo: manually validate category, product
+        filters_form = Product_Filters.from_form(form_filters)
+        model_save = Model_View_Store_Product_Permutation(filters_product=filters_form)
+        model_save.save_permutations(data.comment, objsPermutation)
+
+        model_return = Model_View_Store_Product_Permutation(filters_product=filters_form)
+        return jsonify({'status': 'success', 'Success': True, 'data': model_return.category_list.to_list_rows_permutation()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+    

routing/store/stock_item.py

@@ -0,0 +1,92 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Store Stock Item Routes
+
+Description:
+Initializes the Flask application, sets the configuration based on the environment, and defines two routes (/ and /about) that render templates with the specified titles.
+"""
+
+# internal
+from business_objects.store.product import Product, Product_Filters, Product_Permutation
+from business_objects.store.stock_item import Stock_Item, Stock_Item_Filters
+from forms import Form_Supplier, Form_Filters_Permutation, Form_Filters_Stock_Item
+from models.model_view_base import Model_View_Base
+from models.model_view_store import Model_View_Store
+from models.model_view_store_supplier import Model_View_Store_Supplier
+from models.model_view_store_product_category import Model_View_Store_Product_Category
+from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation
+from models.model_view_store_stock_items import Model_View_Store_Stock_Items
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app
+from extensions import db, oauth
+from urllib.parse import quote_plus, urlencode
+from authlib.integrations.flask_client import OAuth
+from authlib.integrations.base_client import OAuthError
+from urllib.parse import quote, urlparse, parse_qs
+
+
+routes_store_stock_item = Blueprint('routes_store_stock_item', __name__)
+
+
+@routes_store_stock_item.route('/store/stock_items', methods=['GET'])
+def stock():
+    filters = Stock_Item_Filters.get_default()
+    model = Model_View_Store_Stock_Items(filters_stock_item=filters)
+    return render_template('_page_store_stock_items.html', model = model)
+
+@routes_store_stock_item.route('/store/stock_item_filter', methods=['POST'])
+def stock_filter():
+    data = Helper_App.get_request_data(request)
+    form_filters = None
+    try:
+        form_filters = get_form_filters_stock_items(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Form invalid.\n{form_filters.errors}'})
+        # ToDo: manually validate category, product
+        filters_form = Stock_Item_Filters.from_form(form_filters)
+        model = Model_View_Store_Stock_Items(filters_stock_item=filters_form)
+        return jsonify({'status': 'success', 'Success': True, 'data': model.category_list.to_list_rows_permutation()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+
+def get_form_filters_stock_items(data_request):
+    data_form = data_request[Model_View_Store_Stock_Items.KEY_FORM]
+    form_filters = Form_Filters_Stock_Item(**data_form)
+    form_filters.is_out_of_stock.data = av.input_bool(data_form['is_out_of_stock'], 'is_out_of_stock', 'permutations_post')
+    return form_filters
+
+@routes_store_stock_item.route('/store/stock_item_save', methods=['POST'])
+def stock_save():
+    data = Helper_App.get_request_data(request)
+"""
+    form_filters = None
+    try:
+        form_filters = get_form_filters_stock_items(data)
+        if not form_filters.validate_on_submit():
+            return jsonify({'status': 'failure', 'Message': f'Filters form invalid.\n{form_filters.errors}'})
+        
+        stock_items = data[Model_View_Store_Stock.KEY_PERMUTATIONS]
+        print(f'stock_items: {stock_items}')
+        if len(stock_items) == 0:
+            return jsonify({'status': 'failure', 'Message': f'No stock items.'})
+        objsStockItem = []
+        for stock_item in stock_items:
+            objsStockItem.append(Product_Permutation.from_json(stock_item))
+        print(f'objsStockItem: {objsStockItem}')
+
+        # ToDo: manually validate category, product
+        filters_form = Stock_Filters.from_form(form_filters)
+        model_save = Model_View_Store_Stock(filters_product=filters_form)
+        model_save.save_stock_items(data.comment, objsPermutation)
+
+        model_return = Model_View_Store_Stock(filters_product=filters_form)
+        return jsonify({'status': 'success', 'Success': True, 'data': model_return.category_list.to_list_rows_permutation()})
+    except Exception as e:
+        return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+"""

routing/store/supplier.py

@@ -0,0 +1,68 @@
+"""
+Project:    PARTS Website
+Author:     Edward Middleton-Smith
+            Precision And Research Technology Systems Limited
+
+Technology: App Routing
+Feature:    Store Supplier Routes
+
+Description:
+Initializes the Flask application, sets the configuration based on the environment, and defines two routes (/ and /about) that render templates with the specified titles.
+"""
+
+
+# internal
+from business_objects.store.product import Product, Product_Filters, Product_Permutation
+from business_objects.store.stock_item import Stock_Item, Stock_Item_Filters
+from forms import Form_Supplier, Form_Filters_Permutation, Form_Filters_Stock_Item
+from models.model_view_base import Model_View_Base
+from models.model_view_store import Model_View_Store
+from models.model_view_store_supplier import Model_View_Store_Supplier
+from models.model_view_store_product_category import Model_View_Store_Product_Category
+from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation
+from models.model_view_store_stock_items import Model_View_Store_Stock_Items
+from helpers.helper_app import Helper_App
+import lib.argument_validation as av
+# external
+from flask import Flask, render_template, jsonify, request,  render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app
+from extensions import db, oauth
+from urllib.parse import quote_plus, urlencode
+from authlib.integrations.flask_client import OAuth
+from authlib.integrations.base_client import OAuthError
+from urllib.parse import quote, urlparse, parse_qs
+
+
+routes_store_supplier= Blueprint('routes_store_supplier', __name__)
+
+
+@routes_store_supplier.route('/supplier', methods=['GET'])
+def supplier():
+    try:
+        data = request.json
+    except:
+        data = {}
+    print(f'data={data}')
+    form_data = data[Model_View_Store_Supplier.key_form]
+    print(f'form_data: {form_data}')
+    form = Form_Supplier(**form_data)
+    print('form acquired')
+    print(form.__repr__)
+    if form.validate_on_submit():
+        print('valid form')
+        # model = input_JSON_basket(model, data)
+        # if not logged in:
+        try:
+            model = Model_View_Store_Supplier(form)
+            # print('importing basket')
+            # model.import_JSON_basket(data)
+            model.get_basket(data)
+            permutation_id, quantity = model.import_JSON_basket_item(data, form)
+            model.basket_item_edit(permutation_id, quantity, False) # new_basket = 
+        except Exception as e:
+            return jsonify({'status': 'failure', 'Message': f'Bad data received by controller.\n{e}'})
+        # return jsonify(Success = True, data = { html_block: render_template(), Model_View_Store.key_basket: new_basket })
+        # html_block = render_template('_block_store_basket.html', model = model)
+        # print(f'html_block:\n{html_block}')
+        # return jsonify(Success = True, data = { 'html_block': html_block, 'basket': {'items': model.basket.to_json_list()}})
+        return render_template('_page_supplier.html', model = model)
+    return jsonify({'status': 'failure', 'Message': f'Invalid supplier details.\n{form.errors}'})