diff --git a/app/main.py b/app/main.py index d4e94c0..3b7f93d 100644 --- a/app/main.py +++ b/app/main.py @@ -20,7 +20,7 @@ from app.log import log, logging # Import the routers here first: # from app.routers import aether_cfg, api_crud, api, importing, sql, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, data_store, event, event_abstract, event_badge, event_badge_importing, event_badge_template, event_device, event_exhibit, event_exhibit_tracking, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, fundraising, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_v3, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, qr, site, site_domain, user, websockets_redis, e_confex, e_cvent, c_idaa, e_impexium, e_stripe -from app.routers import aether_cfg, api_crud +from app.routers import aether_cfg, api from app.db_sql import sql_select # , sql_connect @@ -95,19 +95,19 @@ app.include_router( aether_cfg.router, tags=['Aether Config'], ) -app.include_router( - api_crud.router, - prefix='/crud', - tags=['CRUD'], - #dependencies=[Depends(get_token_header)], - #dependencies=[Depends(get_account_header)], - #responses={404: {'description': 'Not found'}}, -) # app.include_router( -# api.router, -# prefix='/api', -# tags=['API'], +# api_crud.router, +# prefix='/crud', +# tags=['CRUD'], +# #dependencies=[Depends(get_token_header)], +# #dependencies=[Depends(get_account_header)], +# #responses={404: {'description': 'Not found'}}, # ) +app.include_router( + api.router, + prefix='/api', + tags=['API'], +) # app.include_router( # flask_cfg.router, # prefix='/flask_cfg', diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index d01f211..111289f 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -1,10 +1,11 @@ import datetime, time +#from datetime import datetime, time, timedelta from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Response, status from pydantic import BaseModel, EmailStr, Field from typing import Dict, List, Optional, Set, Union from app.lib_general import log, logging, common_route_params, Common_Route_Params, common_route_params_min, Common_Route_Params_Min -# from app.config import settings +from app.config import settings from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random, lookup_id_random_pop from app.models.response_models import *