update

Author: barreraalexander

src/routers/ui_routes.py

@@ -1,13 +1,14 @@
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends, status, Response, HTTPException
+from fastapi.responses import RedirectResponse
 from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
 from pathlib import Path
-import requests
-from src.config import Settings
 
+import src.oauth2 as oauth2
+from src.config import Settings
 from src import models
 from src import app
-# from app import TEMPLATES
+
 
 router = APIRouter(
     tags = ['User Interface']
@@ -17,14 +18,27 @@
 TEMPLATES = Jinja2Templates(directory=str(BASE_PATH / "../templates"))
 
 
-@router.get("/")
-def home(request: Request, response_model=HTMLResponse):
-    return TEMPLATES.TemplateResponse("home/index.html", {"request" : request})
+@router.get("/", status_code=status.HTTP_200_OK)
+async def home(request: Request, response_model=HTMLResponse):
+
+    token = request.headers.get('Authorization')
+
+    if (token):
+        return TEMPLATES.TemplateResponse("home/index.html", {"request" : request})
+
+    return RedirectResponse(url=router.url_path_for('signin'))
+
+
+
+@router.get("/login", status_code=status.HTTP_200_OK)
+async def signin(request: Request, response_model=HTMLResponse):
+
+    print('\n\n')
+    print(request.method)
+    print('\n\n')
 
-@router.get("/login")
-def signin(request: Request, response_model=HTMLResponse):
     return TEMPLATES.TemplateResponse("accounts/login.html", {"request" : request})
 
-@router.get("/register")
-def register(request: Request, response_model=HTMLResponse):
+@router.get("/register", status_code=status.HTTP_200_OK)
+async def register(request: Request, response_model=HTMLResponse):
     return TEMPLATES.TemplateResponse("accounts/register.html", {"request" : request})

src/templates/accounts/login.html

@@ -84,11 +84,14 @@ <h3 class="font-weight-bolder text-info text-gradient">
                       })
 
                       if (res.status == 200){
-                        login_form.reset()
+                        // login_form.reset()
                         let data = await res.json()
                         let access_token = data.access_token
                         window.localStorage.setItem('current_user', access_token)
+                        // Headers.setItem('Authorization', `Bearer ${access_token}`)
+                        Headers.set('Authorization', `Bearer ${access_token}`)
                         window.location.href = login_form.dataset.successful_redirect
+                        // Headers.set
                       }
                     })
 
@@ -103,7 +106,7 @@ <h3 class="font-weight-bolder text-info text-gradient">
             </div>
             <div class="col-md-6">
               <div class="oblique position-absolute top-0 h-100 d-md-block d-none me-n8">
-                <div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image:url({{url_for('static', path='/img/curved-images/curved6.jpg') }}')"></div>
+                <div class="oblique-image bg-cover position-absolute fixed-top ms-auto h-100 z-index-0 ms-n6" style="background-image: url({{url_for('static', path='/img/curved-images/curved6.jpg')}})"></div>
               </div>
             </div>
           </div>

src/templates/accounts/register.html

@@ -20,7 +20,7 @@
   <main class="main-content  mt-0">
 
     <section class="min-vh-100 mb-8">
-      <div class="page-header align-items-start min-vh-50 pt-5 pb-11 m-3 border-radius-lg" style="background-image: url('{{ url_for('static', path='img/curved-images/curved14.jpg') }}');">
+      <div class="page-header align-items-start min-vh-50 pt-5 pb-11 m-3 border-radius-lg" style="background-image: url("{{ url_for('static', path='img/curved-images/curved14.jpg')  }}">
         <span class="mask bg-gradient-dark opacity-6"></span>
         <div class="container">
           <div class="row justify-content-center">

src/templates/home/index.html

@@ -635,7 +635,7 @@ <h6 class="text-dark text-sm font-weight-bold mb-0">New order #9583120</h6>
 <!-- Specific JS goes HERE --> 
 {% block javascripts %}
 
-  <script src="{{ url_for('static', path='js/plugins/chartjs.min.js') }}"></script>
+  <!-- <script src="{{ url_for('static', path='js/plugins/chartjs.min.js') }}"></script> -->
   <script>
     var ctx = document.getElementById("chart-bars").getContext("2d");
 
@@ -807,5 +807,4 @@ <h6 class="text-dark text-sm font-weight-bold mb-0">New order #9583120</h6>
     });
   </script>
 
-{% endblock javascripts %}
-
+{% endblock javascripts %}