From 77c63994c39224132a7292fdfcce125b3f3df086 Mon Sep 17 00:00:00 2001 From: Teddy Middleton-Smith Date: Thu, 10 Jul 2025 16:29:54 +0100 Subject: [PATCH] Fix(Python): Corrected module references for web server. --- app.py | 14 ++--- business_objects/api.py | 4 +- business_objects/base.py | 4 +- business_objects/db_base.py | 6 +-- .../dog/DEPRECATED - access_level.py | 8 +-- ...DEPRECATED - dog_command_link_container.py | 12 ++--- .../dog/DEPRECATED - understanding_level.py | 10 ++-- business_objects/dog/command.py | 16 +++--- business_objects/dog/command_category.py | 10 ++-- business_objects/dog/dog.py | 10 ++-- business_objects/dog/dog_command_link.py | 20 +++---- business_objects/dog/obedience_level.py | 10 ++-- business_objects/dog/user.py | 12 ++--- business_objects/sql_error.py | 6 +-- controllers/core/home.py | 4 +- controllers/dog/command.py | 20 +++---- controllers/dog/command_category.py | 18 +++---- controllers/dog/dog.py | 20 +++---- controllers/dog/dog_command_link.py | 20 +++---- controllers/dog/home.py | 20 +++---- controllers/legal/legal.py | 14 ++--- datastores/datastore_base.py | 14 ++--- datastores/datastore_dog.py | 22 ++++---- forms/base.py | 2 +- forms/dog/command.py | 16 +++--- forms/dog/command_category.py | 16 +++--- forms/dog/dog_command_link.py | 20 +++---- lib/argument_validation.py | 2 +- models/model_view_accessibility_report.py | 2 +- models/model_view_accessibility_statement.py | 2 +- models/model_view_base.py | 22 ++++---- models/model_view_dog_base.py | 10 ++-- models/model_view_dog_command.py | 12 ++--- models/model_view_dog_command_category.py | 14 ++--- models/model_view_dog_dog_command_link.py | 18 +++---- models/model_view_home.py | 2 +- models/model_view_license.py | 2 +- models/model_view_privacy_policy.py | 2 +- models/model_view_retention_schedule.py | 2 +- routes.py | 54 ------------------- 40 files changed, 219 insertions(+), 273 deletions(-) delete mode 100644 routes.py diff --git a/app.py b/app.py index a193556..8d076f7 100644 --- a/app.py +++ b/app.py @@ -17,16 +17,16 @@ Initializes the Flask application, sets the configuration based on the environme # IMPORTS # internal from config import app_config, Config -from dog_training.controllers.dog.command import routes_dog_command -from dog_training.controllers.dog.command_category import routes_dog_command_category -from dog_training.controllers.dog.dog import routes_dog -from dog_training.controllers.dog.dog_command_link import routes_dog_dog_command_link -from dog_training.controllers.dog.home import routes_dog_home +from controllers.dog.command import routes_dog_command +from controllers.dog.command_category import routes_dog_command_category +from controllers.dog.dog import routes_dog +from controllers.dog.dog_command_link import routes_dog_dog_command_link +from controllers.dog.home import routes_dog_home from controllers.core.home import routes_core_home from controllers.legal.legal import routes_legal from controllers.user.user import routes_user -from dog_training.extensions import db, csrf, mail, oauth -from dog_training.helpers.helper_app import Helper_App +from extensions import db, csrf, mail, oauth +from helpers.helper_app import Helper_App # external from flask import Flask, render_template, jsonify, request, render_template_string, send_from_directory, redirect, url_for, session # from flask_appconfig import AppConfig diff --git a/business_objects/api.py b/business_objects/api.py index c5427a8..4f004b8 100644 --- a/business_objects/api.py +++ b/business_objects/api.py @@ -11,8 +11,8 @@ Abstract business object """ # internal -from dog_training.extensions import db -import dog_training.lib.argument_validation as av +from extensions import db +import lib.argument_validation as av # external from typing import ClassVar from flask import jsonify diff --git a/business_objects/base.py b/business_objects/base.py index 781079e..aa43991 100644 --- a/business_objects/base.py +++ b/business_objects/base.py @@ -11,8 +11,8 @@ Abstract base class for all business objects in app """ # internal -from dog_training.extensions import db -import dog_training.lib.argument_validation as av +from extensions import db +import lib.argument_validation as av # external from typing import ClassVar diff --git a/business_objects/db_base.py b/business_objects/db_base.py index 1306397..af399d1 100644 --- a/business_objects/db_base.py +++ b/business_objects/db_base.py @@ -11,9 +11,9 @@ Abstract base class for database objects """ # internal -# from dog_training.helpers.DEPRECATED.helper_abc import Interface_ABC -from dog_training.extensions import db -import dog_training.lib.argument_validation as av +# from helpers.DEPRECATED.helper_abc import Interface_ABC +from extensions import db +import lib.argument_validation as av # external from typing import ClassVar from abc import abstractmethod, ABCMeta diff --git a/business_objects/dog/DEPRECATED - access_level.py b/business_objects/dog/DEPRECATED - access_level.py index 8154e1d..59b795d 100644 --- a/business_objects/dog/DEPRECATED - access_level.py +++ b/business_objects/dog/DEPRECATED - access_level.py @@ -11,10 +11,10 @@ Business object for product """ # internal -import dog_training.lib.argument_validation as av -from dog_training.business_objects.base import Base -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +import lib.argument_validation as av +from business_objects.base import Base +from extensions import db +from helpers.helper_app import Helper_App # external from pydantic import BaseModel from typing import ClassVar diff --git a/business_objects/dog/DEPRECATED - dog_command_link_container.py b/business_objects/dog/DEPRECATED - dog_command_link_container.py index 7cd1a51..87c2600 100644 --- a/business_objects/dog/DEPRECATED - dog_command_link_container.py +++ b/business_objects/dog/DEPRECATED - dog_command_link_container.py @@ -14,12 +14,12 @@ DEPRECATED AS NOT REQUIRED - USE A LIST """ # internal -import dog_training.lib.argument_validation as av -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +import lib.argument_validation as av +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base +from business_objects.dog.dog_command_link import Dog_Command_Link +from extensions import db +from helpers.helper_app import Helper_App # external from pydantic import BaseModel from typing import ClassVar diff --git a/business_objects/dog/DEPRECATED - understanding_level.py b/business_objects/dog/DEPRECATED - understanding_level.py index f21ad26..1499112 100644 --- a/business_objects/dog/DEPRECATED - understanding_level.py +++ b/business_objects/dog/DEPRECATED - understanding_level.py @@ -8,11 +8,11 @@ Feature: Understanding Level Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC +import lib.argument_validation as av +from extensions import db +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/command.py b/business_objects/dog/command.py index 1e6052a..50c9c5a 100644 --- a/business_objects/dog/command.py +++ b/business_objects/dog/command.py @@ -8,14 +8,14 @@ Feature: Command Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.forms.dog.command import Filters_Command -from dog_training.forms.dog.command_category import Filters_Command_Category -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.dog.command_category import Command_Category +from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base +import lib.argument_validation as av +from extensions import db +from forms.dog.command import Filters_Command +from forms.dog.command_category import Filters_Command_Category +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/command_category.py b/business_objects/dog/command_category.py index 3ab9470..c3c412b 100644 --- a/business_objects/dog/command_category.py +++ b/business_objects/dog/command_category.py @@ -8,11 +8,11 @@ Feature: Command Category Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC +import lib.argument_validation as av +from extensions import db +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/dog.py b/business_objects/dog/dog.py index ff65aef..e0bce93 100644 --- a/business_objects/dog/dog.py +++ b/business_objects/dog/dog.py @@ -8,11 +8,11 @@ Feature: Dog Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base +import lib.argument_validation as av +from extensions import db +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/dog_command_link.py b/business_objects/dog/dog_command_link.py index 77b1eac..8737516 100644 --- a/business_objects/dog/dog_command_link.py +++ b/business_objects/dog/dog_command_link.py @@ -8,16 +8,16 @@ Feature: Dog Command Link Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.dog.command import Command -# from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base -from dog_training.business_objects.dog.dog import Dog -from dog_training.business_objects.dog.obedience_level import Obedience_Level -from dog_training.extensions import db -from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av +from business_objects.base import Base +from business_objects.dog.command import Command +# from business_objects.dog.command_category import Command_Category +from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base +from business_objects.dog.dog import Dog +from business_objects.dog.obedience_level import Obedience_Level +from extensions import db +from forms.dog.dog_command_link import Filters_Dog_Command_Link +from helpers.helper_app import Helper_App +import lib.argument_validation as av # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/obedience_level.py b/business_objects/dog/obedience_level.py index 073be74..bf2b938 100644 --- a/business_objects/dog/obedience_level.py +++ b/business_objects/dog/obedience_level.py @@ -8,11 +8,11 @@ Feature: Obedience Level Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC +import lib.argument_validation as av +from extensions import db +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/dog/user.py b/business_objects/dog/user.py index d852b9e..70a9cae 100644 --- a/business_objects/dog/user.py +++ b/business_objects/dog/user.py @@ -8,12 +8,12 @@ Feature: User Business Object """ # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base -import dog_training.lib.argument_validation as av -from dog_training.extensions import db -from dog_training.forms.base import Form_Filters_User -from dog_training.helpers.helper_app import Helper_App +from business_objects.base import Base +from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base +import lib.argument_validation as av +from extensions import db +from forms.base import Form_Filters_User +from helpers.helper_app import Helper_App # external from dataclasses import dataclass from typing import ClassVar diff --git a/business_objects/sql_error.py b/business_objects/sql_error.py index 07788ab..0bb3a58 100644 --- a/business_objects/sql_error.py +++ b/business_objects/sql_error.py @@ -11,9 +11,9 @@ Business object for SQL errors returned by Get Many Stored Procedures """ # internal -from dog_training.business_objects.base import Base -import dog_training.lib.argument_validation as av -from dog_training.lib import data_types +from business_objects.base import Base +import lib.argument_validation as av +from lib import data_types # external from enum import Enum from datetime import datetime, timedelta diff --git a/controllers/core/home.py b/controllers/core/home.py index e2a7afa..f299424 100644 --- a/controllers/core/home.py +++ b/controllers/core/home.py @@ -11,8 +11,8 @@ Home Page Controller. """ # internal -from dog_training.business_objects.api import API -from dog_training.models.model_view_home import Model_View_Home +from business_objects.api import API +from models.model_view_home import Model_View_Home # external from flask import render_template, jsonify, Blueprint diff --git a/controllers/dog/command.py b/controllers/dog/command.py index 8fc8879..4e77f2d 100644 --- a/controllers/dog/command.py +++ b/controllers/dog/command.py @@ -12,19 +12,19 @@ Contact Page Controller. # IMPORTS # internal -from dog_training.business_objects.api import API -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.forms.dog.command import Filters_Command -from dog_training.helpers.helper_app import Helper_App -from dog_training.models.model_view_dog_command import Model_View_Dog_Command -from dog_training.models.model_view_home import Model_View_Home -import dog_training.lib.argument_validation as av +from business_objects.api import API +from business_objects.dog.command import Command +from business_objects.dog.dog_command_link import Dog_Command_Link +from datastores.datastore_dog import DataStore_Dog +from forms.dog.command import Filters_Command +from helpers.helper_app import Helper_App +from models.model_view_dog_command import Model_View_Dog_Command +from models.model_view_home import Model_View_Home +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, flash from flask_mail import Mail, Message -from dog_training.extensions import db, oauth, mail +from extensions import db, oauth, mail from urllib.parse import quote_plus, urlencode from authlib.integrations.flask_client import OAuth from authlib.integrations.base_client import OAuthError diff --git a/controllers/dog/command_category.py b/controllers/dog/command_category.py index dfcbf38..e8197c9 100644 --- a/controllers/dog/command_category.py +++ b/controllers/dog/command_category.py @@ -12,18 +12,18 @@ Contact Page Controller. # IMPORTS # internal -from dog_training.business_objects.api import API -from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.forms.dog.command_category import Filters_Command_Category -from dog_training.helpers.helper_app import Helper_App -from dog_training.models.model_view_dog_command_category import Model_View_Dog_Command_Category -from dog_training.models.model_view_home import Model_View_Home -import dog_training.lib.argument_validation as av +from business_objects.api import API +from business_objects.dog.command_category import Command_Category +from datastores.datastore_dog import DataStore_Dog +from forms.dog.command_category import Filters_Command_Category +from helpers.helper_app import Helper_App +from models.model_view_dog_command_category import Model_View_Dog_Command_Category +from models.model_view_home import Model_View_Home +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, flash from flask_mail import Mail, Message -from dog_training.extensions import db, oauth, mail +from extensions import db, oauth, mail from urllib.parse import quote_plus, urlencode from authlib.integrations.flask_client import OAuth from authlib.integrations.base_client import OAuthError diff --git a/controllers/dog/dog.py b/controllers/dog/dog.py index 804df5d..e69d63d 100644 --- a/controllers/dog/dog.py +++ b/controllers/dog/dog.py @@ -12,19 +12,19 @@ Contact Page Controller. # IMPORTS # internal -from dog_training.business_objects.api import API -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link -from dog_training.helpers.helper_app import Helper_App -from dog_training.models.model_view_dog_base import Model_View_Dog_Base -from dog_training.models.model_view_home import Model_View_Home -import dog_training.lib.argument_validation as av +from business_objects.api import API +from business_objects.dog.command import Command +from business_objects.dog.dog_command_link import Dog_Command_Link +from datastores.datastore_dog import DataStore_Dog +from forms.dog.dog_command_link import Filters_Dog_Command_Link +from helpers.helper_app import Helper_App +from models.model_view_dog_base import Model_View_Dog_Base +from models.model_view_home import Model_View_Home +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, flash, Response from flask_mail import Mail, Message -from dog_training.extensions import db, oauth, mail +from extensions import db, oauth, mail from urllib.parse import quote_plus, urlencode from authlib.integrations.flask_client import OAuth from authlib.integrations.base_client import OAuthError diff --git a/controllers/dog/dog_command_link.py b/controllers/dog/dog_command_link.py index ce8bb05..6799e46 100644 --- a/controllers/dog/dog_command_link.py +++ b/controllers/dog/dog_command_link.py @@ -12,19 +12,19 @@ Contact Page Controller. # IMPORTS # internal -from dog_training.business_objects.api import API -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link -from dog_training.helpers.helper_app import Helper_App -from dog_training.models.model_view_dog_dog_command_link import Model_View_Dog_Dog_Command_Link -from dog_training.models.model_view_home import Model_View_Home -import dog_training.lib.argument_validation as av +from business_objects.api import API +from business_objects.dog.command import Command +from business_objects.dog.dog_command_link import Dog_Command_Link +from datastores.datastore_dog import DataStore_Dog +from forms.dog.dog_command_link import Filters_Dog_Command_Link +from helpers.helper_app import Helper_App +from models.model_view_dog_dog_command_link import Model_View_Dog_Dog_Command_Link +from models.model_view_home import Model_View_Home +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, flash from flask_mail import Mail, Message -from dog_training.extensions import db, oauth, mail +from extensions import db, oauth, mail from urllib.parse import quote_plus, urlencode from authlib.integrations.flask_client import OAuth from authlib.integrations.base_client import OAuthError diff --git a/controllers/dog/home.py b/controllers/dog/home.py index 9cd8c79..48106d1 100644 --- a/controllers/dog/home.py +++ b/controllers/dog/home.py @@ -12,19 +12,19 @@ Contact Page Controller. # IMPORTS # internal -from dog_training.business_objects.api import API -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link -from dog_training.helpers.helper_app import Helper_App -from dog_training.models.model_view_dog_base import Model_View_Dog_Base -from dog_training.models.model_view_home import Model_View_Home -import dog_training.lib.argument_validation as av +from business_objects.api import API +from business_objects.dog.command import Command +from business_objects.dog.dog_command_link import Dog_Command_Link +from datastores.datastore_dog import DataStore_Dog +from forms.dog.dog_command_link import Filters_Dog_Command_Link +from helpers.helper_app import Helper_App +from models.model_view_dog_base import Model_View_Dog_Base +from models.model_view_home import Model_View_Home +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, flash from flask_mail import Mail, Message -from dog_training.extensions import db, oauth, mail +from extensions import db, oauth, mail from urllib.parse import quote_plus, urlencode from authlib.integrations.flask_client import OAuth from authlib.integrations.base_client import OAuthError diff --git a/controllers/legal/legal.py b/controllers/legal/legal.py index c072fa1..4161312 100644 --- a/controllers/legal/legal.py +++ b/controllers/legal/legal.py @@ -12,13 +12,13 @@ Legal Section Controller. # IMPORTS # internal -# from dog_training.models.model_view_home import Model_View_Home -from dog_training.models.model_view_license import Model_View_License -from dog_training.models.model_view_privacy_policy import Model_View_Privacy_Policy -from dog_training.models.model_view_accessibility_report import Model_View_Accessibility_Report -from dog_training.models.model_view_accessibility_statement import Model_View_Accessibility_Statement -from dog_training.models.model_view_retention_schedule import Model_View_Retention_Schedule -import dog_training.lib.argument_validation as av +# from models.model_view_home import Model_View_Home +from models.model_view_license import Model_View_License +from models.model_view_privacy_policy import Model_View_Privacy_Policy +from models.model_view_accessibility_report import Model_View_Accessibility_Report +from models.model_view_accessibility_statement import Model_View_Accessibility_Statement +from models.model_view_retention_schedule import Model_View_Retention_Schedule +import lib.argument_validation as av # external from flask import render_template, Blueprint diff --git a/datastores/datastore_base.py b/datastores/datastore_base.py index 912af5f..d46e045 100644 --- a/datastores/datastore_base.py +++ b/datastores/datastore_base.py @@ -12,13 +12,13 @@ Datastore for Store # internal # from routes import bp_home -import dog_training.lib.argument_validation as av -from dog_training.business_objects.sql_error import SQL_Error -from dog_training.business_objects.dog.user import User -# from dog_training.helpers.helper_db_mysql import Helper_DB_MySQL -# from dog_training.models.model_view_store_checkout import Model_View_Store_Checkout # circular! -from dog_training.extensions import db -from dog_training.helpers.helper_app import Helper_App +import lib.argument_validation as av +from business_objects.sql_error import SQL_Error +from business_objects.dog.user import User +# from helpers.helper_db_mysql import Helper_DB_MySQL +# from models.model_view_store_checkout import Model_View_Store_Checkout # circular! +from extensions import db +from helpers.helper_app import Helper_App # external from sqlalchemy import text from flask import Flask, session, current_app diff --git a/datastores/datastore_dog.py b/datastores/datastore_dog.py index 5cb46c4..0423d47 100644 --- a/datastores/datastore_dog.py +++ b/datastores/datastore_dog.py @@ -12,17 +12,17 @@ Datastore for Users # internal # from routes import bp_home -import dog_training.lib.argument_validation as av -from dog_training.business_objects.dog.command import Command, Command_Temp -from dog_training.business_objects.dog.command_category import Command_Category, Command_Category_Temp -from dog_training.business_objects.dog.dog import Dog -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link, Dog_Command_Link_Temp -from dog_training.business_objects.sql_error import SQL_Error -from dog_training.datastores.datastore_base import DataStore_Base -from dog_training.helpers.helper_app import Helper_App -from dog_training.helpers.helper_db_mysql import Helper_DB_MySQL -# from dog_training.models.model_view_store_checkout import Model_View_Store_Checkout # circular! -from dog_training.extensions import db +import lib.argument_validation as av +from business_objects.dog.command import Command, Command_Temp +from business_objects.dog.command_category import Command_Category, Command_Category_Temp +from business_objects.dog.dog import Dog +from business_objects.dog.dog_command_link import Dog_Command_Link, Dog_Command_Link_Temp +from business_objects.sql_error import SQL_Error +from datastores.datastore_base import DataStore_Base +from helpers.helper_app import Helper_App +from helpers.helper_db_mysql import Helper_DB_MySQL +# from models.model_view_store_checkout import Model_View_Store_Checkout # circular! +from extensions import db # external from flask_sqlalchemy import SQLAlchemy from datetime import datetime diff --git a/forms/base.py b/forms/base.py index 03a8867..4739f6d 100644 --- a/forms/base.py +++ b/forms/base.py @@ -11,7 +11,7 @@ Defines Flask-WTF base forms for handling user input. """ # internal -from dog_training.helpers.helper_app import Helper_App +from helpers.helper_app import Helper_App # external from flask_wtf import FlaskForm from abc import ABCMeta, abstractmethod diff --git a/forms/dog/command.py b/forms/dog/command.py index 8523668..60d204d 100644 --- a/forms/dog/command.py +++ b/forms/dog/command.py @@ -12,14 +12,14 @@ Defines Flask-WTF form for handling user input on Commands page. # IMPORTS # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.dog.command_category import Command_Category -# from dog_training.business_objects.dog.command import Command # Circular -from dog_training.helpers.helper_app import Helper_App -# from dog_training.models.model_view_store import Model_View_Store # circular -# from dog_training.models.model_view_base import Model_View_Base -from dog_training.forms.base import Form_Base -import dog_training.lib.argument_validation as av +from business_objects.base import Base +from business_objects.dog.command_category import Command_Category +# from business_objects.dog.command import Command # Circular +from helpers.helper_app import Helper_App +# from models.model_view_store import Model_View_Store # circular +# from models.model_view_base import Model_View_Base +from forms.base import Form_Base +import lib.argument_validation as av # external from flask import Flask, render_template, request, flash, redirect, url_for, current_app from flask_wtf import FlaskForm diff --git a/forms/dog/command_category.py b/forms/dog/command_category.py index f74b12c..7d4e93c 100644 --- a/forms/dog/command_category.py +++ b/forms/dog/command_category.py @@ -12,14 +12,14 @@ Defines Flask-WTF form for handling user input on Commands page. # IMPORTS # internal -from dog_training.business_objects.base import Base -# from dog_training.business_objects.dog.command_category import Command_Category # Circular -# from dog_training.business_objects.dog.command import Command # Circular -from dog_training.helpers.helper_app import Helper_App -# from dog_training.models.model_view_store import Model_View_Store # circular -# from dog_training.models.model_view_base import Model_View_Base -from dog_training.forms.base import Form_Base -import dog_training.lib.argument_validation as av +from business_objects.base import Base +# from business_objects.dog.command_category import Command_Category # Circular +# from business_objects.dog.command import Command # Circular +from helpers.helper_app import Helper_App +# from models.model_view_store import Model_View_Store # circular +# from models.model_view_base import Model_View_Base +from forms.base import Form_Base +import lib.argument_validation as av # external from flask import Flask, render_template, request, flash, redirect, url_for, current_app from flask_wtf import FlaskForm diff --git a/forms/dog/dog_command_link.py b/forms/dog/dog_command_link.py index e973288..23da5ca 100644 --- a/forms/dog/dog_command_link.py +++ b/forms/dog/dog_command_link.py @@ -12,16 +12,16 @@ Defines Flask-WTF form for handling user input on Dog Command Links page. # IMPORTS # internal -from dog_training.business_objects.base import Base -from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.dog import Dog -from dog_training.business_objects.dog.obedience_level import Obedience_Level -from dog_training.helpers.helper_app import Helper_App -# from dog_training.models.model_view_store import Model_View_Store # circular -# from dog_training.models.model_view_base import Model_View_Base -from dog_training.forms.base import Form_Base -import dog_training.lib.argument_validation as av +from business_objects.base import Base +from business_objects.dog.command_category import Command_Category +from business_objects.dog.command import Command +from business_objects.dog.dog import Dog +from business_objects.dog.obedience_level import Obedience_Level +from helpers.helper_app import Helper_App +# from models.model_view_store import Model_View_Store # circular +# from models.model_view_base import Model_View_Base +from forms.base import Form_Base +import lib.argument_validation as av # external from flask import Flask, render_template, request, flash, redirect, url_for, current_app from flask_wtf import FlaskForm diff --git a/lib/argument_validation.py b/lib/argument_validation.py index 8da7248..6a9081a 100644 --- a/lib/argument_validation.py +++ b/lib/argument_validation.py @@ -7,7 +7,7 @@ Created on Thu Apr 27 12:33:59 2023 Argument Validation """ -from dog_training.helpers.helper_app import Helper_App +from helpers.helper_app import Helper_App from typing import Optional def error_msg_str(v, v_name, method, v_type, suppress_errors = False, suppress_console_outputs = False, v_arg_type = 'argument'): diff --git a/models/model_view_accessibility_report.py b/models/model_view_accessibility_report.py index 6976405..1faf5d8 100644 --- a/models/model_view_accessibility_report.py +++ b/models/model_view_accessibility_report.py @@ -11,7 +11,7 @@ Data model for accessibility report view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/models/model_view_accessibility_statement.py b/models/model_view_accessibility_statement.py index edccb06..2ffcb79 100644 --- a/models/model_view_accessibility_statement.py +++ b/models/model_view_accessibility_statement.py @@ -11,7 +11,7 @@ Data model for accessibility statement view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/models/model_view_base.py b/models/model_view_base.py index 266175c..c85a835 100644 --- a/models/model_view_base.py +++ b/models/model_view_base.py @@ -17,17 +17,17 @@ Base data model for views # IMPORTS # internal # from routes import bp_home -from dog_training.business_objects.base import Base -from dog_training.business_objects.dog.user import User -from dog_training.business_objects.dog.command import Command -from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.business_objects.dog.dog import Dog -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link -from dog_training.datastores.datastore_base import DataStore_Base -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.datastores.datastore_user import DataStore_User -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av +from business_objects.base import Base +from business_objects.dog.user import User +from business_objects.dog.command import Command +from business_objects.dog.command_category import Command_Category +from business_objects.dog.dog import Dog +from business_objects.dog.dog_command_link import Dog_Command_Link +from datastores.datastore_base import DataStore_Base +from datastores.datastore_dog import DataStore_Dog +from datastores.datastore_user import DataStore_User +from helpers.helper_app import Helper_App +import lib.argument_validation as av # external from abc import ABC, abstractmethod from flask_sqlalchemy import SQLAlchemy diff --git a/models/model_view_dog_base.py b/models/model_view_dog_base.py index 5503f10..e9c60b4 100644 --- a/models/model_view_dog_base.py +++ b/models/model_view_dog_base.py @@ -13,11 +13,11 @@ Parent data model for store views # internal # from context import models -from dog_training.business_objects.dog.dog import Dog, Parameters_Dog -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av -from dog_training.models.model_view_base import Model_View_Base +from business_objects.dog.dog import Dog, Parameters_Dog +from datastores.datastore_dog import DataStore_Dog +from helpers.helper_app import Helper_App +import lib.argument_validation as av +from models.model_view_base import Model_View_Base # external from flask import send_file, jsonify from flask_sqlalchemy import SQLAlchemy diff --git a/models/model_view_dog_command.py b/models/model_view_dog_command.py index 862ddc2..f03465f 100644 --- a/models/model_view_dog_command.py +++ b/models/model_view_dog_command.py @@ -11,13 +11,13 @@ Data model for store permutations view """ # internal -from dog_training.business_objects.dog.command import Command, Parameters_Command -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.models.model_view_dog_base import Model_View_Dog_Base -from dog_training.forms.dog.command import Filters_Command +from business_objects.dog.command import Command, Parameters_Command +from datastores.datastore_dog import DataStore_Dog +from models.model_view_dog_base import Model_View_Dog_Base +from forms.dog.command import Filters_Command # from routes import bp_home -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av +from helpers.helper_app import Helper_App +import lib.argument_validation as av # external from pydantic import BaseModel diff --git a/models/model_view_dog_command_category.py b/models/model_view_dog_command_category.py index 4822c82..3ad6b6a 100644 --- a/models/model_view_dog_command_category.py +++ b/models/model_view_dog_command_category.py @@ -11,14 +11,14 @@ Data model for store permutations view """ # internal -from dog_training.business_objects.dog.command import Parameters_Command -from dog_training.business_objects.dog.command_category import Command_Category -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.models.model_view_dog_base import Model_View_Dog_Base -from dog_training.forms.dog.command_category import Filters_Command_Category +from business_objects.dog.command import Parameters_Command +from business_objects.dog.command_category import Command_Category +from datastores.datastore_dog import DataStore_Dog +from models.model_view_dog_base import Model_View_Dog_Base +from forms.dog.command_category import Filters_Command_Category # from routes import bp_home -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av +from helpers.helper_app import Helper_App +import lib.argument_validation as av # external from pydantic import BaseModel diff --git a/models/model_view_dog_dog_command_link.py b/models/model_view_dog_dog_command_link.py index c2dba3f..b44c01e 100644 --- a/models/model_view_dog_dog_command_link.py +++ b/models/model_view_dog_dog_command_link.py @@ -11,16 +11,16 @@ Data model for store permutations view """ # internal -from dog_training.business_objects.dog.command import Command, Parameters_Command -from dog_training.business_objects.dog.dog import Dog, Parameters_Dog -from dog_training.business_objects.dog.dog_command_link import Dog_Command_Link, Parameters_Dog_Command_Link -from dog_training.business_objects.dog.obedience_level import Obedience_Level -from dog_training.datastores.datastore_dog import DataStore_Dog -from dog_training.models.model_view_dog_base import Model_View_Dog_Base -from dog_training.forms.dog.dog_command_link import Filters_Dog_Command_Link +from business_objects.dog.command import Command, Parameters_Command +from business_objects.dog.dog import Dog, Parameters_Dog +from business_objects.dog.dog_command_link import Dog_Command_Link, Parameters_Dog_Command_Link +from business_objects.dog.obedience_level import Obedience_Level +from datastores.datastore_dog import DataStore_Dog +from models.model_view_dog_base import Model_View_Dog_Base +from forms.dog.dog_command_link import Filters_Dog_Command_Link # from routes import bp_home -from dog_training.helpers.helper_app import Helper_App -import dog_training.lib.argument_validation as av +from helpers.helper_app import Helper_App +import lib.argument_validation as av # external from pydantic import BaseModel diff --git a/models/model_view_home.py b/models/model_view_home.py index d3e1f25..f7bb6e2 100644 --- a/models/model_view_home.py +++ b/models/model_view_home.py @@ -11,7 +11,7 @@ Data model for home view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/models/model_view_license.py b/models/model_view_license.py index 0383bac..f891df1 100644 --- a/models/model_view_license.py +++ b/models/model_view_license.py @@ -11,7 +11,7 @@ Data model for license view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/models/model_view_privacy_policy.py b/models/model_view_privacy_policy.py index 4e47b99..0424333 100644 --- a/models/model_view_privacy_policy.py +++ b/models/model_view_privacy_policy.py @@ -11,7 +11,7 @@ Data model for privacy policy view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/models/model_view_retention_schedule.py b/models/model_view_retention_schedule.py index f665bf2..3f28d20 100644 --- a/models/model_view_retention_schedule.py +++ b/models/model_view_retention_schedule.py @@ -11,7 +11,7 @@ Data model for retention schedule view """ # internal -from dog_training.models.model_view_base import Model_View_Base +from models.model_view_base import Model_View_Base # from routes import bp_home # external diff --git a/routes.py b/routes.py deleted file mode 100644 index 73321d2..0000000 --- a/routes.py +++ /dev/null @@ -1,54 +0,0 @@ -""" -Project: PARTS Website -Author: Edward Middleton-Smith - Precision And Research Technology Systems Limited - -Technology: Backend -Feature: Controller - Webpage routing - -Description: -Defines the routes and view functions for each page. -Manages the interaction between the frontend and backend. -""" - -from flask import render_template, url_for, Blueprint -from app import app -from app.forms import Form_Contact -# from dog_training.forms import MyForm -# from app import MyForm -from model_view_contact import Model_View_Contact - -""" -@app.route('/', methods=['GET']) -def home(): - return render_template('_home.html', title='Home') - -@app.route('/store', methods=['GET']) -def store_home(): - return render_template('_store_home.html', title='Store Home') - -@app.route('/contact', methods=['GET', 'POST']) -def contact(): - form = Form_Contact() - if form.validate_on_submit(): - # Handle form submission - email = form.sender_email.data - CC = form.sender_CC.data - name = form.sender_name.data - msg = form.sender_message.data - # return render_template('contact.html', form=form) - # return render_template('_contact.html', title='Contact Us') - return render_template('contact.html', model=Model_View_Contact(form)) - -@app.route('/about') -def about(): - return render_template('about.html') - -@app.route('/contact', methods=['GET', 'POST']) -def contact(): - form = MyForm() - if form.validate_on_submit(): - # Handle form submission - pass - return render_template('contact.html', form=form) -""" \ No newline at end of file