TOO MUCH STUFF

api/main.py

@@ -1,19 +1,15 @@
 from fastapi import FastAPI, Depends, Request, Path
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import RedirectResponse, JSONResponse
-from fastapi.templating import Jinja2Templates
-from fastapi.staticfiles import StaticFiles
-from app.routes.auth_routes import router as auth_router
-from app.routes.links_routes import router as links_router
-from app.routes.user_routes import router as user_router
-from typing import Annotated, Union
+from fastapi.responses import JSONResponse, RedirectResponse
+from api.routes.auth_routes import router as auth_router
+from api.routes.links_routes import router as links_router
+from api.routes.user_routes import router as user_router
+from typing import Annotated
 from fastapi.exceptions import HTTPException
 from starlette.status import HTTP_404_NOT_FOUND
 
-from app.util.authentication import get_current_user
-from app.util.db_dependency import get_db
-from app.util.log import log
-from app.schemas.auth_schemas import User
+from api.util.db_dependency import get_db
+from api.util.log import log
 from models import Link
 
 
@@ -28,45 +24,28 @@ app = FastAPI(
     },
 )
 
+origins = [
+    "http://localhost:3000",
+    "http://127.0.0.1:3000",
+    "localhost:3000",
+    "127.0.0.1:3000",
+    # f"{CUSTOM_DOMAIN}"
+]
+
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"],
+    allow_origins=origins,
+    allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
-    allow_credentials=True,
 )
 
-app.mount("/static", StaticFiles(directory="app/static"), name="static")
-templates = Jinja2Templates(directory="app/templates")
-
 # Import routes
 app.include_router(auth_router, prefix="/api")
 app.include_router(links_router, prefix="/api")
 app.include_router(user_router, prefix="/api")
 
 
-@app.get("/login")
-async def login(request: Request):
-    return templates.TemplateResponse("login.html", {"request": request})
-
-
-@app.get("/signup")
-async def signup(request: Request):
-    return templates.TemplateResponse("signup.html", {"request": request})
-
-
-@app.get("/dashboard")
-async def dashboard(
-    request: Request,
-    response: Union[User, RedirectResponse] = Depends(get_current_user),
-):
-    if isinstance(response, RedirectResponse):
-        return response
-    return templates.TemplateResponse(
-        "dashboard.html", {"request": request, "user": response.username}
-    )
-
-
 @app.get("/c/{link}")
 async def log_redirect(
     link: Annotated[str, Path(title="Redirect link")],

api/routes/auth_routes.py

@@ -0,0 +1,46 @@
+from fastapi import Depends, APIRouter, status, HTTPException
+from fastapi.security import OAuth2PasswordRequestForm
+from fastapi.responses import Response, JSONResponse
+from datetime import timedelta
+from typing import Annotated
+
+from api.util.authentication import (
+    create_access_token,
+    authenticate_user,
+)
+from api.util.db_dependency import get_db
+
+
+router = APIRouter(prefix="/auth", tags=["auth"])
+
+
+@router.post("/token", summary="Authenticate and get an access token")
+async def login_for_access_token(
+    form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
+    response: Response,
+    db=Depends(get_db),
+):
+    """
+    Return an access token for the user, if the given authentication details are correct
+    """
+    user = authenticate_user(db, form_data.username, form_data.password)
+
+    if not user:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Incorrect username or password",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    access_token_expires = timedelta(minutes=1)
+    access_token = create_access_token(
+        data={"sub": user.id, "username": user.username},
+        expires_delta=access_token_expires,
+    )
+    response = JSONResponse(content={"success": True})
+    response.set_cookie(
+        key="access_token",
+        value=access_token,
+        httponly=True,  # Prevents client-side access
+        # secure=True,  # Cookies are only sent over HTTPS
+    )
+    return response

api/routes/links_routes.py

@@ -6,11 +6,11 @@ import random
 import datetime
 import validators
 
-from app.util.db_dependency import get_db
+from api.util.db_dependency import get_db
 from models import Link, Log
-from app.schemas.links_schemas import URLSchema
-from app.schemas.auth_schemas import User
-from app.util.authentication import get_current_user
+from api.schemas.links_schemas import URLSchema
+from api.schemas.auth_schemas import User
+from api.util.authentication import get_current_user
 
 
 router = APIRouter(prefix="/links", tags=["links"])

api/routes/user_routes.py

@@ -6,12 +6,12 @@ import string
 import bcrypt
 import random
 
-from app.util.db_dependency import get_db
-from app.util.check_password_reqs import check_password_reqs
-from app.schemas.auth_schemas import User
-from app.schemas.user_schemas import *
+from api.util.db_dependency import get_db
+from api.util.check_password_reqs import check_password_reqs
+from api.schemas.auth_schemas import User
+from api.schemas.user_schemas import *
 from models import User as UserModel
-from app.util.authentication import (
+from api.util.authentication import (
     verify_password,
     get_current_user,
 )

api/schemas/auth_schemas.py

@@ -3,7 +3,6 @@ from pydantic import BaseModel
 
 class Token(BaseModel):
     access_token: str
-    refresh_token: str | None = None
     token_type: str
 
 

api/static/js/api.js

@@ -0,0 +1,26 @@
+// Description: This file contains functions to access the API with JWT authentication.
+
+/**
+ * Accept an API endpoint, method, and body to send to the API.
+ *  - If successful, return the response
+ *  - If not, return false
+ * @param {*} endpoint API endpoint
+ * @param {*} method String (GET, POST, PUT, DELETE)
+ * @param {*} body Data to send to the API
+ * @returns response.json or false
+ */
+async function accessAPI(endpoint, method, body) {
+    let response = await fetch(`/api${endpoint}`, {
+        method: method,
+        body: body,
+    });
+
+    if (response.ok) {
+        let data = await response.json();
+        data = await data;
+        return data;
+
+    }
+
+    return false;
+}

api/templates/dashboard.html

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>LinkLogger | Dashboard</title>
 
+    <link rel="stylesheet" href="/static/css/dashboard.css">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
     <script src="/static/js/jwt.js"></script>
 </head>
@@ -22,85 +23,6 @@
     </div>
 </body>
 </html>
-
-<style>
-    body {
-        margin: 0;
-        padding: 0;
-        font-family: Arial, sans-serif;
-        background-color: #2c3338;
-    }
-
-    div {
-        display: flex;
-        justify-content: center;
-        margin-top: 100px;
-    }
-
-
-    table {
-        margin: 20px 0 20px 0;
-        text-align: center;
-        font-size: 25px;
-        width: 1000px;
-        color: #ccc;
-        border-collapse: collapse;
-        overflow: hidden;
-    }
-
-    /* Center all sub tables */
-    .log-table-row table {
-        margin: 0 auto;
-    }
-
-    .log-table-row table {
-        width: 90%;
-    }
-
-    table th {
-        background-color: #415eac;
-        border: 2px solid #ccc;
-        padding: 10px;
-    }
-
-    .link-table-row {
-        border: 2px solid #ccc;
-    }
-
-    table td {
-        padding: 10px;
-    }
-
-    .link-table-row td {
-        padding: 20px;
-    }
-
-    .log-table-row table td {
-        background-color: #3b4148;
-        padding: 10px;
-    }
-
-    .log-table-row table tr {
-        border: 2px solid #ccc;
-    }
-
-    .link-button {
-        background-color: #3b4148;
-        color: #ccc;
-        border: none;
-        padding: 10px;
-        cursor: pointer;
-        font-size: 25px;
-        border-radius: 5px;
-    }
-
-    .fa-trash:hover {
-        color: rgb(238, 86, 86);
-        cursor: pointer;
-    }
-
-</style>
-
 <script>
     function createRow(index, link, logs) {
         // Create the sub-table with the logs

api/util/authentication.py

@@ -2,15 +2,14 @@ import random
 import bcrypt
 from fastapi import Depends, HTTPException, status, Request, Cookie
 from fastapi.security import OAuth2PasswordBearer
-from fastapi.responses import RedirectResponse
-from jwt.exceptions import InvalidTokenError
+from fastapi.responses import Response
+from jwt.exceptions import InvalidTokenError, ExpiredSignatureError
 from datetime import datetime, timedelta
-from typing import Annotated, Optional
 import jwt
 
-from app.util.db_dependency import get_db
+from api.util.db_dependency import get_db
 from sqlalchemy.orm import Session
-from app.schemas.auth_schemas import *
+from api.schemas.auth_schemas import *
 from models import User as UserModel
 
 secret_key = random.randbytes(32)
@@ -62,18 +61,12 @@ def create_access_token(data: dict, expires_delta: timedelta):
     return encoded_jwt
 
 
-# Backwards kind of way to get refresh token support
-# `refresh_get_current_user` is only called from /refresh
-# and alerts `get_current_user` that it should expect a refresh token
-async def refresh_get_current_user(
-    token: Annotated[str, Depends(oauth2_scheme)],
-    db=Depends(get_db),
-):
-    return await get_current_user(token, is_refresh=True, db=db)
-
-
-def process_refresh_token(token: str, db: Session):
-    return False
+def raise_unauthorized():
+    raise HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Could not validate credentials",
+        headers={"WWW-Authenticate": "Bearer"},
+    )
 
 
 async def get_current_user(
@@ -81,42 +74,19 @@ async def get_current_user(
     db=Depends(get_db),
 ):
     """
-    Return the current user based on the token
+    Return the current user object if the access token is valid
 
-    OR on error -
-    If is_ui=True, the request is from a UI page and we should redirect to login
-    Otherwise, the request is from an API and we should return a 401
+    All failed attempts will return a 401
     """
-
-    def raise_unauthorized():
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Could not validate credentials",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-
-    # If the request is from /api/auth/refresh, it is a request to get
-    # a new access token using a refresh token
-    if request.url.path == "/api/auth/refresh":
-        token = request.cookies.get("refresh_token")
-        user = process_refresh_token(token, db)
-        if user is None:
-            raise_unauthorized()
-    else:
-        token = request.cookies.get("access_token")
+    token = request.cookies.get("access_token")
 
     try:
         payload = jwt.decode(token, secret_key, algorithms=[algorithm])
         id: int = payload.get("sub")
         username: str = payload.get("username")
-        refresh: bool = payload.get("refresh")
         if not id or not username:
             return raise_unauthorized()
 
-        # Make sure that a refresh token was not passed to any other endpoint
-        if refresh and not is_refresh:
-            return raise_unauthorized()
-
     except InvalidTokenError:
         return raise_unauthorized()
 

app/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

app/README.md

@@ -0,0 +1,50 @@
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default tseslint.config({
+  languageOptions: {
+    // other options...
+    parserOptions: {
+      project: ['./tsconfig.node.json', './tsconfig.app.json'],
+      tsconfigRootDir: import.meta.dirname,
+    },
+  },
+})
+```
+
+- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
+- Optionally add `...tseslint.configs.stylisticTypeChecked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
+
+```js
+// eslint.config.js
+import react from 'eslint-plugin-react'
+
+export default tseslint.config({
+  // Set the react version
+  settings: { react: { version: '18.3' } },
+  plugins: {
+    // Add the react plugin
+    react,
+  },
+  rules: {
+    // other rules...
+    // Enable its recommended rules
+    ...react.configs.recommended.rules,
+    ...react.configs['jsx-runtime'].rules,
+  },
+})
+```

app/eslint.config.js

@@ -0,0 +1,28 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+
+export default tseslint.config(
+  { ignores: ['dist'] },
+  {
+    extends: [js.configs.recommended, ...tseslint.configs.recommended],
+    files: ['**/*.{ts,tsx}'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+    },
+    plugins: {
+      'react-hooks': reactHooks,
+      'react-refresh': reactRefresh,
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+      'react-refresh/only-export-components': [
+        'warn',
+        { allowConstantExport: true },
+      ],
+    },
+  },
+)

app/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>

app/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "app",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc -b && vite build",
+    "lint": "eslint .",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "axios": "^1.7.7",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.28.0"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.13.0",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@vitejs/plugin-react": "^4.3.3",
+    "eslint": "^9.13.0",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-refresh": "^0.4.14",
+    "globals": "^15.11.0",
+    "typescript": "~5.6.2",
+    "typescript-eslint": "^8.11.0",
+    "vite": "^5.4.10"
+  }
+}

app/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

app/routes/auth_routes.py

@@ -1,73 +0,0 @@
-from fastapi import Depends, APIRouter, status, HTTPException
-from fastapi.security import OAuth2PasswordRequestForm
-from fastapi.responses import Response, JSONResponse
-from datetime import timedelta
-from typing import Annotated
-
-from app.util.authentication import (
-    create_access_token,
-    authenticate_user,
-    refresh_get_current_user,
-)
-from app.schemas.auth_schemas import Token, User
-from app.util.db_dependency import get_db
-
-
-router = APIRouter(prefix="/auth", tags=["auth"])
-
-
-@router.post("/token", summary="Authenticate and get an access token")
-async def login_for_access_token(
-    form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
-    response: Response,
-    db=Depends(get_db),
-):
-    """
-    Return an access token for the user, if the given authentication details are correct
-    """
-    user = authenticate_user(db, form_data.username, form_data.password)
-
-    if not user:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    access_token_expires = timedelta(minutes=1)
-    access_token = create_access_token(
-        data={"sub": user.id, "username": user.username, "refresh": False},
-        expires_delta=access_token_expires,
-    )
-    # Create a refresh token - just an access token with a longer expiry
-    # and more restrictions ("refresh" is True)
-    refresh_token_expires = timedelta(days=1)
-    refresh_token = create_access_token(
-        data={"sub": user.id, "username": user.username, "refresh": True},
-        expires_delta=refresh_token_expires,
-    )
-    response = JSONResponse(content={"success": True})
-    response.set_cookie(key="access_token", value=access_token, httponly=True)
-    response.set_cookie(
-        key="refresh_token", value=refresh_token, httponly=True
-    )
-    return response
-
-
-# Full native JWT support is not complete in FastAPI yet :(
-# Part of that is token refresh, so we must implement it ourselves
-@router.post("/refresh")
-async def refresh_access_token(
-    current_user: Annotated[User, Depends(refresh_get_current_user)],
-    response: Response,
-) -> Token:
-    """
-    Return a new access token if the refresh token is valid
-    """
-    access_token_expires = timedelta(minutes=1)
-    access_token = create_access_token(
-        data={"sub": current_user.id, "refresh": False},
-        expires_delta=access_token_expires,
-    )
-    response = JSONResponse(content={"success": True})
-    response.set_cookie(key="access_token", value=access_token, httponly=True)
-    return response

app/src/App.tsx

@@ -0,0 +1,19 @@
+import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
+// Import components
+import Login from './components/Login'
+import Signup from './components/Signup'
+import Dashboard from './components/Dashboard'
+
+function App() {
+    return (
+        <Router>
+            <Routes>
+                <Route path="/login" element={<Login />} />
+                <Route path="/signup" element={<Signup />} />
+                <Route path="/dashboard" element={<Dashboard />} />
+            </Routes>
+        </Router>
+    )
+}
+
+export default App

app/src/assets/react.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

app/src/components/Dashboard.tsx

@@ -0,0 +1,47 @@
+import { useState, useEffect } from 'react';
+import Axios from 'axios';
+import styles from '../styles/Dashboard.module.css';
+// import { accessAPI } from '../helpers/api';
+
+
+function Dashboard() {
+    // Get the links from the API
+    const [links, setLinks] = useState([]);
+    useEffect(() => {
+        Axios.get('/api/links')
+            .then((res) => {
+                setLinks(res.data);
+            })
+            .catch((err) => {
+                console.log(err);
+            });
+    }, []);
+
+
+    return (
+        <div id={styles.container}>
+            <table>
+                <thead>
+                    <tr style={{ border: '2px solid #ccc' }}>
+                        <th>Link</th>
+                        <th>Visits</th>
+                        <th>Redirect</th>
+                        <th>Expire Date</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {/* {links.map((link: any) => (
+                        <tr key={link.id}>
+                            <td>{link.url}</td>
+                            <td>{link.visits}</td>
+                            <td>{link.redirect}</td>
+                            <td>{link.expire_date}</td>
+                        </tr>
+                    ))} */}
+                </tbody>
+            </table>
+        </div>
+    )
+}
+
+export default Dashboard;

app/src/components/Login.tsx

@@ -0,0 +1,84 @@
+import { useState, FormEvent } from 'react';
+import styles from '../styles/Login.module.css';
+import { Link } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
+import axios from 'axios';
+
+function Login() {
+    const [username, setUsername] = useState('');
+    const [password, setPassword] = useState('');
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [error, setError] = useState<string | null>(null);
+    const navigate = useNavigate();
+
+    const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        setIsSubmitting(true);
+        try {
+            const res = await axios.post(
+                '/api/auth/token',
+                new URLSearchParams({
+                    username: username,
+                    password: password,
+                }),
+                {
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                    },
+                }
+            );
+
+            if (res.status === 200) {
+                navigate('/dashboard');
+            }
+        } catch (error: unknown) {
+            if (axios.isAxiosError(error)) {
+                const customErrorMessage = error.response?.data?.detail || null;
+                setPassword('');
+                setError(customErrorMessage || 'An error occurred. Please try again.');
+            } else {
+                setPassword('');
+                setError('Unknown error. Please try again.');
+            }
+        } finally {
+            setIsSubmitting(false);
+        }
+    };
+
+    return (
+        <div id={styles.container}>
+            <p id={styles.loginText}>Log In</p>
+            <p id={styles.error} className={error ? 'visible' : 'hidden'}>
+                {error}
+            </p>
+            <div>
+                <header>
+                    <hr></hr>
+                    <form onSubmit={handleSubmit}>
+                        <input
+                            type="text"
+                            placeholder="username"
+                            value={username}
+                            onChange={(e) => setUsername(e.target.value)}
+                            required
+                        />
+                        <input
+                            type="password"
+                            placeholder="password"
+                            value={password}
+                            onChange={(e) => setPassword(e.target.value)}
+                            required
+                        />
+                        <button type="submit" disabled={isSubmitting}>
+                            {isSubmitting ? 'Submitting...' : 'Submit'}
+                        </button>
+                    </form>
+                    <hr></hr>
+                    <p id={styles.bottomText}>Don't have an account? <Link to="/signup" className={styles.link}>Create one now</Link></p>
+                </header>
+            </div>
+        </div>
+    );
+}
+
+export default Login;

app/src/components/Signup.tsx

@@ -0,0 +1,106 @@
+import { useState, FormEvent } from 'react';
+import styles from '../styles/Login.module.css';
+import { Link } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
+import axios from 'axios';
+
+function Signup() {
+    const [username, setUsername] = useState('');
+    const [password, setPassword] = useState('');
+    const [passwordConfirm, setPasswordConfirm] = useState('');
+    const [isSubmitting, setIsSubmitting] = useState(false);
+    const [error, setError] = useState<string | null>(null);
+
+    const navigate = useNavigate();
+
+    const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
+        e.preventDefault();
+        setIsSubmitting(true);
+
+        if (password !== passwordConfirm) {
+            setPassword('');
+            setPasswordConfirm('');
+            return setError('Passwords do not match.');
+        }
+
+        try {
+            const res = await axios.post(
+                '/api/users/register',
+                new URLSearchParams({
+                    username: username,
+                    password: password,
+                }),
+                {
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                    },
+                }
+            );
+
+            if (res.status === 200) {
+                navigate('/login');
+            }
+        } catch (error: unknown) {
+            if (axios.isAxiosError(error)) {
+                const customErrorMessage = error.response?.data?.detail || null;
+                setUsername('');
+                setPassword('');
+                setPasswordConfirm('');
+                setError(customErrorMessage || 'An error occurred. Please try again.');
+            } else {
+                setUsername('');
+                setPassword('');
+                setPasswordConfirm('');
+                setError('Unknown error. Please try again.');
+            }
+        } finally {
+            setIsSubmitting(false);
+        }
+    };
+
+    return (
+        <div id={styles.container}>
+            <p id={styles.signupText}>Sign up</p>
+            <p id={styles.error} className={error ? 'visible' : 'hidden'}>
+                {error}
+            </p>
+            <div>
+                <header>
+                    <hr></hr>
+                    <form onSubmit={handleSubmit}>
+                        <input
+                            type="text"
+                            placeholder="username"
+                            value={username}
+                            onChange={(e) => setUsername(e.target.value)}
+                            required
+                        />
+                        <input
+                            type="password"
+                            placeholder="password"
+                            value={password}
+                            minLength={8}
+                            onChange={(e) => setPassword(e.target.value)}
+                            required
+                        />
+                        <input
+                            type="password"
+                            placeholder="confirm password"
+                            value={passwordConfirm}
+                            minLength={8}
+                            onChange={(e) => setPasswordConfirm(e.target.value)}
+                            required
+                        />
+                        <button type="submit" disabled={isSubmitting}>
+                            {isSubmitting ? 'Submitting...' : 'Submit'}
+                        </button>
+                    </form>
+                    <hr></hr>
+                    <p id={styles.bottomText}>Already have an account? <Link to="/login" className={styles.link}>Log in here.</Link></p>
+                </header>
+            </div>
+        </div>
+    );
+}
+
+export default Signup;

app/src/helpers/api.js

@@ -0,0 +1,27 @@
+/**
+ * Accept an API endpoint, method, and body to send to the API.
+ *  - If successful, return the response
+ *  - If not, return false
+ * @param {*} endpoint API endpoint
+ * @param {*} method String (GET, POST, PUT, DELETE)
+ * @param {*} body Data to send to the API
+ * @returns response.json or false
+ */
+async function accessAPI(endpoint, method, body) {
+    let response = await fetch(`http://127.0.0.1:5252/api${endpoint}`, {
+        method: method,
+        credentials: 'include',
+        body: body,
+    });
+
+    if (response.ok) {
+        let data = await response.json();
+        data = await data;
+        return data;
+
+    }
+
+    return false;
+}
+
+export { accessAPI };

app/src/index.css

@@ -0,0 +1,68 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}

app/src/main.tsx

@@ -0,0 +1,10 @@
+import { StrictMode } from 'react'
+import { createRoot } from 'react-dom/client'
+import './index.css'
+import App from './App.tsx'
+
+createRoot(document.getElementById('root')!).render(
+  <StrictMode>
+    <App />
+  </StrictMode>,
+)

app/src/styles/Dashboard.module.css

@@ -0,0 +1,74 @@
+body {
+    margin: 0;
+    padding: 0;
+    font-family: Arial, sans-serif;
+    background-color: #2c3338;
+}
+
+#container {
+    display: flex;
+    justify-content: center;
+    margin-top: 100px;
+}
+
+
+table {
+    margin: 20px 0 20px 0;
+    text-align: center;
+    font-size: 25px;
+    width: 1000px;
+    color: #ccc;
+    border-collapse: collapse;
+    overflow: hidden;
+}
+
+/* Center all sub tables */
+.log-table-row table {
+    margin: 0 auto;
+}
+
+.log-table-row table {
+    width: 90%;
+}
+
+table th {
+    background-color: #415eac;
+    border: 2px solid #ccc;
+    padding: 10px;
+}
+
+.link-table-row {
+    border: 2px solid #ccc;
+}
+
+table td {
+    padding: 10px;
+}
+
+.link-table-row td {
+    padding: 20px;
+}
+
+.log-table-row table td {
+    background-color: #3b4148;
+    padding: 10px;
+}
+
+.log-table-row table tr {
+    border: 2px solid #ccc;
+}
+
+.link-button {
+    background-color: #3b4148;
+    color: #ccc;
+    border: none;
+    padding: 10px;
+    cursor: pointer;
+    font-size: 25px;
+    border-radius: 5px;
+}
+
+.fa-trash:hover {
+    color: rgb(238, 86, 86);
+    cursor: pointer;
+}

app/src/styles/Login.module.css

@@ -0,0 +1,87 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: Arial, sans-serif;
+  background-color: #2c3338;
+}
+
+#container {
+  font-size: 17px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
+}
+
+#loginText,
+#signupText {
+  color: #ccc;
+  font-size: 30px;
+  font-weight: 600;
+  border: 2px solid #606468;
+  padding: 10px;
+  border-radius: 5px;
+  margin: 0 auto;
+}
+
+input {
+  display: block;
+  margin: 10px auto;
+  width: 300px;
+  border-radius: 5px;
+  padding: 15px;
+  color: #ccc;
+  background-color: #3b4148;
+  border: none;
+  font-size: 17px;
+}
+
+button {
+  display: block;
+  margin: 10px auto;
+  width: 100%;
+  border-radius: 5px;
+  padding: 15px;
+  color: #ccc;
+  background-color: #415eac;
+  border: none;
+  font-size: 17px;
+  cursor: pointer;
+  transition: background-color 0.2s ease, transform 0.3s ease;
+}
+
+button:hover {
+  background-color: #2e4781;
+}
+
+button:active {
+  transform: scale(0.95);
+}
+
+#error {
+  color: #ee6161;
+}
+
+.link {
+  text-decoration: underline;
+  color: #ccc;
+
+}
+
+.link:hover {
+  text-decoration: none;
+  color: #415eac;
+}
+
+#bottomText {
+  color: #606468;
+}
+
+.visible {
+  visibility: visible;
+}
+
+.hidden {
+  visibility: hidden;
+}

app/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

app/static/js/jwt.js

@@ -1,58 +0,0 @@
-// Description: This file contains functions to access the API with JWT authentication.
-
-/**
- * Accept a full URL, method, and body to send to the API.
- *  - If successful, return the response
- *  - If first fail, attempt to refresh JWT token and try again
- *  - If second fail, return false
- * @param {*} endpoint API endpoint
- * @param {*} method String (GET, POST, PUT, DELETE)
- * @param {*} body Data to send to the API
- * @returns boolean
- */
-async function accessAPI(endpoint, method, body) {
-    let response = await fetch(`/api${endpoint}`, {
-        method: method,
-        body: body,
-    });
-
-    if (response.ok) {
-        let data = await response.json();
-        data = await data;
-        console.log(data);
-        return data;
-    } else if (response.status === 401) {
-        console.log('REFRESHING TOKEN')
-        if (await refreshAccessToken()) {
-            // Try the request again
-            let response = await fetch(`/api${endpoint}`, {
-                method: method,
-                body: body,
-            });
-            if (response.ok) {
-                let data = await response.json();
-                data = await data;
-                console.log("REFRESHED DATA")
-                return data;
-            }
-        }
-    }
-    return false;
-}
-
-/**
- * Attempt to refresh the JWT token
- * @returns boolean
- */
-async function refreshAccessToken () {
-    const response = await fetch('/api/auth/refresh', {
-        method: 'POST',
-    });
-    if (response.ok) {
-        console.log("TOKEN REFRESH")
-        return true;
-    } else {
-        console.log("TOKEN REFRESH FAILED")
-        return false;
-    }
-}

app/tsconfig.app.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
+  },
+  "include": ["src"]
+}

app/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.app.json" },
+    { "path": "./tsconfig.node.json" }
+  ]
+}

app/tsconfig.node.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "target": "ES2022",
+    "lib": ["ES2023"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
+  },
+  "include": ["vite.config.ts"]
+}

app/vite.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+
+// https://vite.dev/config/
+export default defineConfig({
+  plugins: [react()],
+
+  // Proxy to the backend server
+  server: {
+    proxy: {
+      '/api': 'http://localhost:5252',
+    },
+  },
+})

linklogger.py

@@ -1,7 +1,7 @@
 import uvicorn
 
 import config
-from app.main import app
+from api.main import app
 from database import Base, engine