remove MetaDataTable and MetaDataColumn to cleanup schema

kontor-api/src/apis/base.py

@@ -1,10 +1,9 @@
 from fastapi import APIRouter
 
-from src.apis.version1 import comic, media, tysc, admin, metadata
+from src.apis.version1 import comic, media, tysc, admin
 
 api_router =  APIRouter(prefix="/api")
 api_router.include_router(comic.router, prefix="/comics", tags=["comics"])
 api_router.include_router(media.router, prefix="/media", tags=["media"])
 api_router.include_router(tysc.router, prefix="/tysc", tags=["tysc"])
 api_router.include_router(admin.router, prefix="/login", tags=["login"])
-api_router.include_router(metadata.router, prefix="/metadata", tags=["metadata"])

kontor-api/src/apis/version1/metadata.py

@@ -1,26 +0,0 @@
-from typing import List
-
-from fastapi import APIRouter
-
-from src.apis.utils import SessionDep
-from src.db.models.metadata import MetaDataTable, MetaDataColumn
-from src.db.repository.metadata import get_tables, get_columns
-from src.schema.admin import MetaDataTableResponse, MetaDataColumnResponse
-
-router = APIRouter()
-
-
-
-@router.get("/tables")
-def get_meta_data_tables(db: SessionDep) -> List[MetaDataTableResponse]:
-    tables = db.query(MetaDataTable).all()
-    response: List[MetaDataTableResponse] = get_tables(tables)
-    return response
-
-
-
-@router.get("/columns")
-def get_meta_data_columns(db: SessionDep) -> List[MetaDataColumnResponse]:
-    columns = db.query(MetaDataColumn).all()
-    response: List[MetaDataColumnResponse] = get_columns(columns)
-    return response

kontor-api/src/db/models/metadata.py

@@ -1,39 +0,0 @@
-from sqlalchemy import Column, String, ForeignKey, Integer, Boolean
-from sqlalchemy.orm import relationship
-
-from src.db.models.base import Base, BaseMixin
-
-
-class MetaDataTable(Base, BaseMixin):
-    __tablename__ = 'meta_data_table'
-    table_name = Column(String, unique=True)
-    table_columns = relationship("MetaDataColumn")
-
-    def __repr__(self):
-        return f'MetaDataTable({self.id} {self.table_name})'
-
-    def __str__(self):
-        return f'{self.table_name}({self.id})'
-
-
-class MetaDataColumn(Base, BaseMixin):
-    __tablename__ = 'meta_data_column'
-    column_name = Column(String, nullable=False)
-    column_type = Column(String)
-    column_order = Column(Integer)
-    is_shown = Column(Boolean)
-    column_label = Column(String)
-    show_filter = Column(Boolean)
-    filter_label = Column(String)
-    ref_column = Column(String, nullable=True)
-    table_id = Column(String, ForeignKey('meta_data_table.id'))
-    table = relationship("MetaDataTable", back_populates="table_columns")
-
-    def __repr__(self):
-        if self.column_name is None:
-            return f'MetaDataColumn({self.id} {self.table.table_name}.__)'
-        else:
-            return f'MetaDataColumn({self.id} {self.table.table_name}.{self.column_name})'
-
-    def __str__(self):
-        return f'{self.column_name}({self.id})'

kontor-api/src/db/repository/metadata.py

@@ -1,30 +0,0 @@
-from typing import List
-
-from src.db.models.metadata import MetaDataTable, MetaDataColumn
-from src.schema.admin import MetaDataTableResponse, MetaDataColumnResponse
-
-
-def get_tables(tables: List[MetaDataTable]) -> List[MetaDataTableResponse]:
-    results: List[MetaDataTableResponse] = []
-    for table in tables:
-        result = MetaDataTableResponse(id=table.id, name=table.table_name)
-        results.append(result)
-    return results
-
-def get_columns(columns: List[MetaDataColumn]) -> List[MetaDataColumnResponse]:
-    results: List[MetaDataColumnResponse] = []
-    for column in columns:
-        result = MetaDataColumnResponse(
-            id=column.id,
-            table_name=column.table.table_name,
-            column_name=column.column_name,
-            column_type=column.column_type,
-            column_order=column.column_order,
-            is_shown=column.is_shown,
-            column_label=column.column_label,
-            show_filter=column.show_filter,
-            filter_label=column.filter_label,
-            ref_column=column.ref_column
-        )
-        results.append(result)
-    return results

kontor-api/src/schema/admin.py

@@ -6,21 +6,3 @@ from pydantic import BaseModel
 class Token(BaseModel):
     access_token: str
     token_type: str
-
-class MetaDataTableResponse(BaseModel):
-    id: str
-    name: str
-
-class MetaDataColumnResponse(BaseModel):
-    id: str
-    table_name: str
-    column_name: str
-    column_sync_name: str
-    column_type: str
-    column_modifier: Optional[str]
-    column_order: int
-    is_shown: bool
-    column_label: Optional[str]
-    show_filter: bool
-    filter_label: Optional[str]
-    ref_column: Optional[str]

kontor-api/src/templates/admin/metadata.html

@@ -1,21 +0,0 @@
-{% extends "shared/base.html" %}
-
-{% block title %}
-  <title>MetaData</title>
-{% endblock %}
-
-{% block content %}
-  {% with msg=msg %}
-    {% include "components/alerts.html" %}
-  {% endwith %}
-  <div class="container">
-    {% for table in data %}
-    <div class="row">
-        {% with obj=table %}
-      	  {% include "components/metadatatable_cards.html" %}
-        {% endwith %}
-      <br>
-    </div>
-    {% endfor %}
-  </div>
-{% endblock %}

kontor-api/src/templates/admin/permissions.html

@@ -0,0 +1,38 @@
+{% extends "shared/base.html" %}
+
+{% block title %}
+  <title>Permissions</title>
+{% endblock %}
+
+{% block content %}
+  {% with msg=msg %}
+    {% include "components/alerts.html" %}
+  {% endwith %}
+  <div class="container">
+    <div class="row">
+      <div class="col">
+        <h1 class="display-5">Permissions..</h1>
+      </div>
+    </div>
+    <div class="row">
+      <table class="table table-hover">
+        <thead><tr>
+          <th scope="col">Name</th>
+          <th colspan="2">Actions</th>
+        </tr></thead>
+        <tbody>
+        {% for permission in permissions %}
+          <tr>
+            <th scope="row"><a href="/admins/permissions/{{permission.id}}">{{permission.name}}</a></th>
+            <td><a href="/admin/permission/edit/{{permission.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a></td>
+            <td><a href="/admin/permission/delete/{{permission.id}}" class="btn btn-outline-danger btn-sm active" role="button" aria-pressed="true">Delete</a></td>
+         </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+      <div>
+        <a href="/admin/permission/add" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Add Permission</a>
+      </div>
+    </div>
+  </div>
+{% endblock %}

kontor-api/src/templates/admin/profiles.html

@@ -0,0 +1,43 @@
+{% extends "shared/base.html" %}
+
+{% block title %}
+  <title>Profiles</title>
+{% endblock %}
+
+{% block content %}
+  {% with msg=msg %}
+    {% include "components/alerts.html" %}
+  {% endwith %}
+  <div class="container">
+    <div class="row">
+      <div class="col">
+        <h1 class="display-5">Profiles..</h1>
+      </div>
+    </div>
+    <div class="row">
+      <table class="table table-hover">
+        <thead><tr>
+          <th scope="col">Username</th>
+          <th scope="col">First Name</th>
+          <th scope="col">Last Name</th>
+          <th colspan="2">Actions</th>
+        </tr></thead>
+        <tbody>
+        {% for profile in profiles %}
+          <tr>
+            <th scope="row"><a href="/admins/profiles/{{profile.id}}">{{profile.user_name}}</a></th>
+            <th scope="row">{{profile.first_name}}</th>
+            <th scope="row">{{profile.last_name}}</th>
+            <th scope="row">{{profile.email}}</th>
+            <td><a href="/admin/profile/edit/{{profile.id}}" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Edit</a></td>
+            <td><a href="/admin/profile/delete/{{profile.id}}" class="btn btn-outline-danger btn-sm active" role="button" aria-pressed="true">Delete</a></td>
+         </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+      <div>
+        <a href="/admin/profile/add" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Add Profile</a>
+      </div>
+    </div>
+  </div>
+{% endblock %}

kontor-api/src/templates/comic/comics.html

@@ -34,7 +34,9 @@
         {% endfor %}
         </tbody>
       </table>
-      <a href="/comic/comic/add" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Add Comic</a>
+      <div>
+        <a href="/comic/comic/add" class="btn btn-outline-primary btn-sm active" role="button" aria-pressed="true">Add Comic</a>
+      </div>
     </div>
   </div>
 {% endblock %}

kontor-api/src/templates/components/metadatatable_cards.html

@@ -1,31 +0,0 @@
-<div class="card shadow p-3 mb-2 bg-body rounded">
-  <div class="card-body">
-    <h5 class="card-title">{{obj.table_name}}</h5>
-    <table class="table table-hover">
-      <thead><tr>
-        <th scope="col">Column Name</th>
-        <th scope="col">Column Type</th>
-        <th scope="col">Column Order</th>
-        <th scope="col">Is Shown</th>
-        <th scope="col">Column Label</th>
-        <th scope="col">Show Filter</th>
-        <th scope="col">Filter Label</th>
-        <th scope="col">Ref Column</th>
-      </tr></thead>
-      <tbody>
-        {% for column in obj.table_columns %}
-        <tr>
-           <th scope="row"><a href="/admin/metadata/{{column.id}}">{{column.column_name}}</a></th>
-           <td>{{column.column_type}}</td>
-           <td>{{column.column_order}}</td>
-           <td>{% with check=column.is_shown %}{% include "components/check.html" %}{% endwith %}</td>
-           <td>{{column.column_label}}</td>
-           <td>{% with check=column.show_filter %}{% include "components/check.html" %}{% endwith %}</td>
-           <td>{{column.filter_label}}</td>
-           <td>{{column.ref_column}}</td>
-        </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-  </div>
-</div>

kontor-api/src/templates/components/navbar.html

@@ -41,7 +41,8 @@
             <li><a class="dropdown-item" href="/register/">Signup</a></li>
             <li><a class="dropdown-item" href="/login/">Login</a></li>
             <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" href="/admin/metadata">MetaData</a></li>
+            <li><a class="dropdown-item" href="/admin/profiles">Profiles</a></li>
+            <li><a class="dropdown-item" href="/admin/permissions">Permissions</a></li>
           </ul>
         </li>
       </ul>

kontor-api/src/webapps/admin/route_admin.py

@@ -1,24 +1,31 @@
+from typing import AnyStr
 from fastapi import APIRouter, Request
 from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
 
 from src.apis.utils import SessionDep
 from src.apis.version1.admin import get_current_user_from_token
-from src.db.models.admin import Profile
-from src.db.models.metadata import MetaDataColumn, MetaDataTable
-from src.db.repository.metadata import get_columns
+from src.db.models.admin import Permission, Profile
 
 templates = Jinja2Templates(directory="src/templates")
 router = APIRouter(include_in_schema=False, prefix="/admin")
 
-@router.get("/metadata")
-def get_metadata(db: SessionDep, request: Request, msg: str = None):
-    token = request.cookies.get("access_token")
-    scheme, param = get_authorization_scheme_param(token)
-    current_user: Profile = get_current_user_from_token(token=param, db=db)
-    data = []
-    if current_user is None:
-        msg = "You are not logged in"
-        return templates.TemplateResponse("admin/metadata.html", {"request": request, "msg": msg, "data": data})
-    tables= db.query(MetaDataTable).all()
-    return templates.TemplateResponse("admin/metadata.html", {"request": request, "msg": msg, "data": tables})
+@router.get("/profiles")
+def get_profiles(db: SessionDep, request: Request, msg: str | None = None):
+    profiles = db.query(Profile).all()
+    return templates.TemplateResponse("admin/profiles.html", {"request": request, "msg": msg, "profiles": profiles})
+
+@router.get("/profiles/{profile_id}")
+def comic_details(profile_id: AnyStr, request: Request, db: SessionDep):
+    profile = db.get(Profile, profile_id)
+    return templates.TemplateResponse("admin/profile_detail.html", {"request": request, "profile":profile})
+
+@router.get("/permissions")
+def get_permissions(db: SessionDep, request: Request, msg: str | None = None):
+    permissions = db.query(Permission).all()
+    return templates.TemplateResponse("admin/permissions.html", {"request": request, "msg": msg, "permissions": permissions})
+
+@router.get("/permissions/{permission_id}")
+def artist_detail(permission_id: AnyStr, request: Request, db: SessionDep):
+    permission= db.get(Permission, str(permission_id))
+    return templates.TemplateResponse("comic/permission_detail.html", {"request": request, "permission": permission})

kontor-api/src/webapps/comic/route_comics.py

@@ -1,16 +1,10 @@
-from fastapi import APIRouter, Request, responses, status
+from fastapi import APIRouter, Request
 from fastapi.templating import Jinja2Templates
-from fastapi.responses import RedirectResponse
 
 from src.apis.utils import SessionDep
-from src.db.models.comic import Comic, Artist, Publisher, Issue, WorkType
+from src.db.models.comic import Comic, Artist, Publisher, Issue
 from typing import AnyStr
 
-from src.db.repository.comic import create_new_worktype, update_worktype
-from src.main import logger
-from src.schema.comics.worktype import AddWorkType
-from src.webapps.comic.forms import AddWorktypeForm
-
 templates = Jinja2Templates(directory="src/templates")
 router = APIRouter(include_in_schema=False, prefix="/comic")