diff --git a/app/models/archive_content_model.py b/app/models/archive_content_model.py index c57d21c..1c4ab5b 100644 --- a/app/models/archive_content_model.py +++ b/app/models/archive_content_model.py @@ -34,15 +34,15 @@ class Archive_Content_Base(BaseModel): name: Optional[str] description: Optional[str] - html_content: Optional[str] - json_content: Optional[str] + content_html: Optional[str] + content_json: Optional[str] url: Optional[str] url_text: Optional[str] hosted_file_id_random: Optional[str] hosted_file_id: Optional[int] - path_file: Optional[str] + file_path: Optional[str] filename: Optional[str] file_extension: Optional[str] diff --git a/app/models/archive_model.py b/app/models/archive_model.py index ead4b16..a6b4252 100644 --- a/app/models/archive_model.py +++ b/app/models/archive_model.py @@ -30,10 +30,10 @@ class Archive_Base(BaseModel): name: Optional[str] description: Optional[str] - html_content: Optional[str] - json_content: Optional[str] - url_content: Optional[str] - url_content_text: Optional[str] + content_html: Optional[str] + content_json: Optional[str] + content_url: Optional[str] + content_url_text: Optional[str] original_datetime: Optional[datetime.datetime] = None original_datetime_timezone: Optional[datetime.datetime] = None diff --git a/app/models/site_model.py b/app/models/site_model.py index 600817d..c57782e 100644 --- a/app/models/site_model.py +++ b/app/models/site_model.py @@ -48,13 +48,13 @@ class Site_Base(BaseModel): html_menu_path: Optional[str] title: Optional[str] = None - html_menu: Optional[str] = None - html_header: Optional[str] = None - html_header_h1: Optional[str] = None - html_header_h2: Optional[str] = None - html_banner: Optional[str] = None - html_root_body: Optional[str] = None - html_tagline: Optional[str] = None + #html_menu: Optional[str] = None + #html_header: Optional[str] = None + #html_header_h1: Optional[str] = None + #html_header_h2: Optional[str] = None + #html_banner: Optional[str] = None + #html_root_body: Optional[str] = None + #html_tagline: Optional[str] = None logo_filename: Optional[str] banner_image_filename: Optional[str]