diff --git a/application/administration/__init__.py b/application/administration/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api_admin.py b/application/administration/administration_api.py similarity index 96% rename from api_admin.py rename to application/administration/administration_api.py index cbad775..70b54a0 100644 --- a/api_admin.py +++ b/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/') @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']) diff --git a/database_admin.py b/application/administration/administration_database.py similarity index 100% rename from database_admin.py rename to application/administration/administration_database.py diff --git a/application/administration/administration_processes.py b/application/administration/administration_processes.py new file mode 100644 index 0000000..e69de29 diff --git a/templates/admin.html b/application/administration/templates/admin.html similarity index 100% rename from templates/admin.html rename to application/administration/templates/admin.html diff --git a/templates/admin/index.html b/application/administration/templates/index.html similarity index 100% rename from templates/admin/index.html rename to application/administration/templates/index.html diff --git a/templates/admin/role.html b/application/administration/templates/role.html similarity index 100% rename from templates/admin/role.html rename to application/administration/templates/role.html diff --git a/templates/admin/site.html b/application/administration/templates/site.html similarity index 100% rename from templates/admin/site.html rename to application/administration/templates/site.html diff --git a/templates/admin/user.html b/application/administration/templates/user.html similarity index 100% rename from templates/admin/user.html rename to application/administration/templates/user.html diff --git a/application/items/items_API.py b/application/items/items_API.py index 0223169..d462d91 100644 --- a/application/items/items_API.py +++ b/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 - -# applications imports +# APPLICATION IMPORTS from config import config from user_api import login_required import application.postsqldb as db diff --git a/application/receipts/receipts_api.py b/application/receipts/receipts_api.py index 549e068..0632a2e 100644 --- a/application/receipts/receipts_api.py +++ b/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 -import psycopg2, math, datetime, process, database, MyDataclasses -from config import config -from user_api import login_required +# 3RD PARTY IMPORTS +from flask import (Blueprint, request, render_template, session, jsonify, current_app, send_from_directory) +import math import postsqldb -import mimetypes, os -import webpush +import mimetypes +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 diff --git a/application/receipts/receipts_database.py b/application/receipts/receipts_database.py index 8dd4232..e509527 100644 --- a/application/receipts/receipts_database.py +++ b/application/receipts/receipts_database.py @@ -1,5 +1,7 @@ +# 3RD PARTY IMPORTS import psycopg2 +# APPLICATION IMPORTS import config from application import postsqldb diff --git a/application/receipts/receipts_processes.py b/application/receipts/receipts_processes.py index 2444a80..2b2b594 100644 --- a/application/receipts/receipts_processes.py +++ b/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 diff --git a/application/shoppinglists/shoplist_api.py b/application/shoppinglists/shoplist_api.py index 314f831..1d79de7 100644 --- a/application/shoppinglists/shoplist_api.py +++ b/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(): diff --git a/webserver.py b/webserver.py index 232a214..e457a79 100644 --- a/webserver.py +++ b/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)