Marko (Hermes Implementer)
48db53c95d
Resolved merge conflicts integrating PR #13 (Home Page with MUI v2): Backend changes: - settings.py: Combined INSTALLED_APPS (accounts + jobs + corsheaders), kept HEAD's REST_FRAMEWORK (AllowAny + throttling) and SIMPLE_JWT, added origin/main's CORS config - urls.py: Combined admin/, api/auth/, api/ routes - pyproject.toml: Combined all dependencies (simplejwt + cors-headers) - uv.lock: Regenerated with updated dependencies Frontend changes: - package.json: Combined all deps (axios + MUI + emotion) - App.tsx: Integrated AuthProvider with MUI AppLayout, all routes - HomePage.tsx: Show landing view when unauthenticated, MUI dashboard when authenticated - main.tsx, tsconfig.json, vite-env.d.ts: Combined both versions - yarn.lock: Kept origin/main's version (regenerated on install)
22 lines
498 B
TOML
22 lines
498 B
TOML
[project]
|
|
name = "api"
|
|
version = "1.0.0"
|
|
description = "Job Tracker API"
|
|
requires-python = ">=3.12"
|
|
dependencies = [
|
|
"django>=5.1,<6.0",
|
|
"django-cors-headers>=4.9.0",
|
|
"djangorestframework>=3.17.1",
|
|
"djangorestframework-simplejwt>=5.3,<6.0",
|
|
"psycopg2-binary>=2.9",
|
|
"pydantic>=2.0",
|
|
"pydantic-settings>=2.0",
|
|
]
|
|
|
|
[build-system]
|
|
requires = ["setuptools"]
|
|
build-backend = "setuptools.build_meta"
|
|
|
|
[tool.setuptools.packages.find]
|
|
include = ["project*", "accounts*", "jobs*"]
|