add display for WorkType

kontor-api/src/webapps/base.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter, Request
 from fastapi.templating import Jinja2Templates
 
+from src.core.config import settings
 from src.webapps.admin import route_admin
 from src.webapps.auth import route_login
 from src.webapps.comic import route_comics

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

@@ -0,0 +1,20 @@
+from fastapi import Request
+from typing import List, Optional
+
+
+class AddWorktypeForm:
+    def __init__(self, request: Request):
+        self.request = request
+        self.errors: List = []
+        self.worktype: Optional[str] = None
+
+    async def load_data(self):
+        form = await self.request.form()
+        self.worktype = form.get("worktype")
+
+    def is_valid(self):
+        if not self.worktype or (len(self.worktype) == 0):
+            self.errors.append("WorkType cannot be empty")
+        if not self.errors:
+            return True
+        return False

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

@@ -1,9 +1,13 @@
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, responses, status
 from fastapi.templating import Jinja2Templates
 from src.apis.utils import SessionDep
-from src.db.models.comic import Comic, Artist, Publisher, Issue
+from src.db.models.comic import Comic, Artist, Publisher, Issue, WorkType
 from typing import AnyStr
 
+from src.db.repository.comic import create_new_worktype
+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")
 
@@ -48,3 +52,33 @@ def get_issues(db: SessionDep, request: Request, msg: str = None):
 def issue_details(issue_id: AnyStr, request: Request, db: SessionDep):
     issue = db.get(Issue, issue_id)
     return templates.TemplateResponse("comic/issue_detail.html", {"request": request, "issue": issue})
+
+@router.get("/worktypes")
+def get_worktypes(db: SessionDep, request: Request, msg: str = None):
+    worktypes = db.query(WorkType).all()
+    return templates.TemplateResponse("comic/worktypes.html", {"request": request, "msg": msg, "worktypes": worktypes})
+
+@router.get("/worktypes/{worktype_id}")
+def worktype_detail(worktype_id: AnyStr, request: Request, db: SessionDep):
+    worktype = db.get(WorkType, worktype_id)
+    return templates.TemplateResponse("comic/worktype_detail.html", {"request": request, "worktype": worktype})
+
+@router.get("/add-worktype")
+def add_worktype(request: Request, db: SessionDep):
+    return templates.TemplateResponse("comic/add_worktype.html", {"request": request})
+
+@router.post("/add-worktype")
+async def post_worktype(request: Request, db: SessionDep):
+    form = AddWorktypeForm(request)
+    await form.load_data()
+    if form.is_valid():
+        try:
+            work = AddWorkType(**form.__dict__)
+            worktype = create_new_worktype(work=work, db=db)
+            return responses.RedirectResponse(f"/comic/worktypes/{worktype.id}", status_code=status.HTTP_302_FOUND)
+        except Exception as e:
+            print(e)
+            form.__dict__.get("errors").append("worktype already added")
+            return templates.TemplateResponse("comic/add_worktype.html", form.__dict__)
+    return templates.TemplateResponse("comic/add_worktype.html", form.__dict__)
+

kontor-api/src/webapps/media/route_videos.py

@@ -1,11 +1,14 @@
 from typing import AnyStr
 
 from fastapi import APIRouter, Request, status, responses
+from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
 
 from src.apis.utils import SessionDep
 from src.db.models.media import MediaVideo
 from src.db.repository.media import create_new_video
+from src.apis.version1.admin import get_current_user_from_token
+from src.db.models.admin import Profile
 from src.schema.media.video import AddLink
 from src.webapps.media.forms import AddLinkForm
 
@@ -15,7 +18,14 @@ router = APIRouter(include_in_schema=False, prefix="/media")
 @router.get("/videos")
 def get_mediavideos(db: SessionDep, request: Request, msg: str = None):
     mediavideos = db.query(MediaVideo).all()
-    return templates.TemplateResponse("media/videos.html", {"request": request, "msg": msg, "mediavideos": mediavideos})
+    try:
+        token = request.cookies.get("access_token")
+        _, param = get_authorization_scheme_param(token)  # scheme will hold "Bearer" and param will hold actual token value
+        current_user: Profile = get_current_user_from_token(token=param, db=db)
+        return templates.TemplateResponse("media/videos.html", {"request": request, "msg": msg, "user": current_user, "mediavideos": mediavideos})
+    except Exception as e:
+        print(e)
+    return templates.TemplateResponse("media/videos.html", {"request": request, "msg": msg, "user": None, "mediavideos": mediavideos})
 
 @router.get("/videos/{video_id}")
 def video_details(video_id: AnyStr, request: Request, db: SessionDep):
@@ -26,7 +36,6 @@ def video_details(video_id: AnyStr, request: Request, db: SessionDep):
 def add_video_link(request: Request, db: SessionDep):
     return templates.TemplateResponse("media/add_video_link.html", {"request": request})
 
-
 @router.post("/add-link")
 async def post_video_link(request: Request, db: SessionDep):
     form = AddLinkForm(request)