diff --git a/app/api/index.py b/app/api/index.py index f543624..38bc600 100644 --- a/app/api/index.py +++ b/app/api/index.py @@ -1,7 +1,27 @@ -from flask_restful import Resource +from flask_restful import Resource, Api + +from app.api.apache_restart import ApacheRestartFlag +from app.api.config import Config, ConfigTest +from app.api.infobases import InfobasesAvailable, InfobasesAll +from app.api.module import EnterpriseModule +from app.api.publications import Publications, Publication, PublicationURL class APIIndex(Resource): def get(self): return ['infobases-available', 'infobases-all', 'publications', - 'module', 'config', 'config-test', 'apache-restart'] \ No newline at end of file + 'module', 'config', 'config-test', 'apache-restart'] + + +def add_api_resources(api: Api) -> None: + api.add_resource(InfobasesAvailable, '/infobases-available') + api.add_resource(InfobasesAll, '/infobases-all') + api.add_resource(Publications, '/publications', '/publications/') + api.add_resource(Publication, '/publications/') + api.add_resource(PublicationURL, '/publications//url') + api.add_resource(EnterpriseModule, '/module') + api.add_resource(Config, '/config') + api.add_resource(ConfigTest, '/config-test') + api.add_resource(ApacheRestartFlag, '/apache-restart') + api.add_resource(APIIndex, '/') + diff --git a/pub1c-rest.py b/pub1c-rest.py index 7888161..5218d26 100644 --- a/pub1c-rest.py +++ b/pub1c-rest.py @@ -2,12 +2,7 @@ from flask import Flask, render_template from flask_restful import Api from flask_cors import CORS -from app.api.apache_restart import ApacheRestartFlag -from app.api.config import Config, ConfigTest -from app.api.index import APIIndex -from app.api.infobases import InfobasesAvailable, InfobasesAll -from app.api.module import EnterpriseModule -from app.api.publications import Publications, Publication, PublicationURL +from app.api.index import add_api_resources from app.glob import get_config, get_manager frontend_dir = 'frontend/dist' @@ -15,16 +10,7 @@ app = Flask(__name__, static_url_path='/', static_folder=frontend_dir, template_ api = Api(app, '/api/v1/') cors = CORS(app, resources={r"/api/*": {"origins": "*"}}) -api.add_resource(InfobasesAvailable, '/infobases-available') -api.add_resource(InfobasesAll, '/infobases-all') -api.add_resource(Publications, '/publications', '/publications/') -api.add_resource(Publication, '/publications/') -api.add_resource(PublicationURL, '/publications//url') -api.add_resource(EnterpriseModule, '/module') -api.add_resource(Config, '/config') -api.add_resource(ConfigTest, '/config-test') -api.add_resource(ApacheRestartFlag, '/apache-restart') -api.add_resource(APIIndex, '/') +add_api_resources(api) @app.route('/')