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

..

src

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

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

.env.example

feat: complete user authentication with separate login and register pages

2026-05-26 04:35:27 +00:00

Dockerfile

feat: add user authentication with separate login and register pages

2026-05-26 00:54:27 +00:00

index.html

Implement: Home Page with MUI Components (#13)

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

package.json

Merge branch 'main' into feature/user-auth

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

tsconfig.json

Merge branch 'main' into feature/user-auth

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

vite.config.js

Implement: Home Page with MUI Components (#13)

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