Marko (Hermes Implementer) 2e71eb73b8 Merge branch 'main' into fix/user-auth-error-handling ...

Resolved conflicts in:
  - api/accounts/urls.py: Took main's complete URL set (verify/refresh/logout/me)
  - web/src/App.tsx: Took main's route structure with PublicRoute/ProtectedRoute wrappers
  - web/src/services/authApi.ts: Combined main's robust interceptor with PR's extractErrorMessage + getAccessToken/getRefreshToken helpers
  - web/src/contexts/AuthContext.tsx: Combined main's full auth flow (refreshAccessToken, getProfile, logoutUser) with PR's extractErrorMessage and user_data persistence

2026-05-29 02:24:51 +00:00

..

components

Merge branch 'main' into fix/user-auth-error-handling

2026-05-29 02:24:51 +00:00

contexts

Merge branch 'main' into fix/user-auth-error-handling

2026-05-29 02:24:51 +00:00

hooks

feat: implement API security measures phase 1

2026-05-27 00:24:09 +00:00

pages

Merge branch 'main' into feature/user-auth

2026-05-26 19:07:02 +00:00

services

Merge branch 'main' into fix/user-auth-error-handling

2026-05-29 02:24:51 +00:00

types

Implement: Home Page with MUI Components (#13)

2026-05-26 06:21:33 +00:00

App.tsx

fix: proper Axios error extraction, token refresh, auth state restoration, ProtectedRoute

2026-05-29 00:13:31 +00:00

main.tsx

Merge branch 'main' into feature/user-auth

2026-05-26 19:07:02 +00:00

vite-env.d.ts

Implement: Home Page with MUI Components (#13)

2026-05-26 06:21:33 +00:00