Setting up to migrate administration Module

application/administration/administration_api.py

@@ -4,18 +4,25 @@ from config import config, sites_config
 from main import unfoldCostLayers, get_sites, get_roles, create_site_secondary, getUser
 from manage import create
 from user_api import login_required
-import postsqldb, process, hashlib, database_admin
+import postsqldb, process, hashlib
 
 
-admin_api = Blueprint('admin_api', __name__)
+# APPLICATION IMPORTS
+from application.administration import administration_database
 
-@admin_api.route('/admin')
+
+admin_api = Blueprint('admin_api', __name__, template_folder="templates", static_folder="static")
+
+
+# ROOT TEMPLATE ROUTES
+@admin_api.route('/')
 def admin_index():
     sites = [site[1] for site in main.get_sites(session['user']['sites'])]
-    return render_template("admin/index.html", 
+    return render_template("index.html", 
                            current_site=session['selected_site'], 
                            sites=sites)
 
+# API ROUTES
 @admin_api.route('/admin/site/<id>')
 @login_required
 def adminSites(id):
@@ -58,7 +65,7 @@ def adminUser(id):
             new_user = postsqldb.LoginsTable.Payload("", "", "", "")
             return render_template("admin/user.html", user=new_user.get_dictionary())
         else:
-            user = database_admin.selectLoginsUser(int(id))
+            user = administration_database.selectLoginsUser(int(id))
             return render_template('admin/user.html', user=user)
 
 @admin_api.route('/admin/getSites', methods=['GET'])

application/items/items_API.py

@@ -1,12 +1,11 @@
-# 3rd Party imports
+# 3RD PARTY IMPORTS
 from flask import (
     Blueprint, request, render_template, redirect, session, url_for, send_file, jsonify, Response
     )
 import psycopg2
 import math 
 
-
+# APPLICATION IMPORTS
-# applications imports
 from config import config
 from user_api import login_required
 import application.postsqldb as db

application/receipts/receipts_api.py

@@ -1,11 +1,13 @@
-from flask import Blueprint, request, render_template, redirect, session, url_for, send_file, jsonify, Response, current_app, send_from_directory
+# 3RD PARTY IMPORTS
-import psycopg2, math, datetime, process, database, MyDataclasses
+from flask import (Blueprint, request, render_template, session, jsonify, current_app, send_from_directory)
-from config import config
+import math
-from user_api import login_required
 import postsqldb
-import mimetypes, os
+import mimetypes
-import webpush
+import os
 
+# APPLICATION IMPORTS
+import webpush
+from user_api import login_required
 from application import postsqldb, database_payloads
 from application.receipts import receipts_processes, receipts_database
 

application/receipts/receipts_database.py

@@ -1,5 +1,7 @@
+# 3RD PARTY IMPORTS
 import psycopg2
 
+# APPLICATION IMPORTS
 import config
 from application import postsqldb
 

application/receipts/receipts_processes.py

@@ -1,3 +1,4 @@
+# 3RD PARTY IMPORTS
 import pymupdf
 import os
 import PIL
@@ -5,7 +6,7 @@ import openfoodfacts
 import psycopg2
 import datetime
 
-
+# APPLICATION IMPORTS
 from application.receipts import receipts_database
 from application import database_payloads
 from application.items.items_processes import postNewBlankItem

application/shoppinglists/shoplist_api.py

@@ -4,7 +4,7 @@ from flask import (
     )
 import math
 
-# applications imports
+# APPLICATION IMPORTS
 from application import postsqldb, database_payloads
 from user_api import login_required
 from application.shoppinglists import shoplist_database
@@ -12,7 +12,7 @@ from application.shoppinglists import shoplist_database
 shopping_list_api = Blueprint('shopping_list_API', __name__, template_folder="templates", static_folder="static")
 
 
-# ROOT TEMPLATE CALLS
+# ROOT TEMPLATE ROUTES
 @shopping_list_api.route("/")
 @login_required
 def shopping_lists():

webserver.py

@@ -1,10 +1,11 @@
 from flask import Flask, render_template, session, request, redirect, jsonify
 from flask_assets import Environment, Bundle
-import api, config, user_api, psycopg2, main, api_admin
+import api, config, user_api, psycopg2, main
 from user_api import login_required, update_session_user
 from workshop_api import workshop_api
 import database
 from webpush import trigger_push_notifications_for_subscriptions
+from application.administration import administration_api
 from application.recipes import recipes_api
 from application.items import items_API
 from application.poe import poe_api
@@ -26,7 +27,7 @@ assets = Environment(app)
 app.secret_key = '11gs22h2h1a4h6ah8e413a45'
 app.register_blueprint(api.database_api)
 app.register_blueprint(user_api.login_app)
-app.register_blueprint(api_admin.admin_api)
+app.register_blueprint(administration_api.admin_api, url_prefix='/admin')
 app.register_blueprint(items_API.items_api, url_prefix='/items')
 app.register_blueprint(poe_api.point_of_ease, url_prefix='/poe')
 app.register_blueprint(workshop_api)