diff --git a/docker-compose.yml b/docker-compose.yml index 6dc8c8d..552fbda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,7 +167,7 @@ services: frontend: image: '${DOCKER_IMAGE_FRONTEND?Variable not set}:${TAG-latest}' build: - context: ./new-frontend + context: ./frontend labels: - traefik.enable=true - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set} diff --git a/new-frontend/.dockerignore b/frontend/.dockerignore similarity index 72% rename from new-frontend/.dockerignore rename to frontend/.dockerignore index 76add87..f06235c 100644 --- a/new-frontend/.dockerignore +++ b/frontend/.dockerignore @@ -1,2 +1,2 @@ node_modules -dist \ No newline at end of file +dist diff --git a/new-frontend/.env b/frontend/.env similarity index 100% rename from new-frontend/.env rename to frontend/.env diff --git a/new-frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs similarity index 100% rename from new-frontend/.eslintrc.cjs rename to frontend/.eslintrc.cjs diff --git a/new-frontend/.gitignore b/frontend/.gitignore similarity index 100% rename from new-frontend/.gitignore rename to frontend/.gitignore diff --git a/new-frontend/.prettierignore b/frontend/.prettierignore similarity index 100% rename from new-frontend/.prettierignore rename to frontend/.prettierignore diff --git a/new-frontend/.prettierrc b/frontend/.prettierrc similarity index 100% rename from new-frontend/.prettierrc rename to frontend/.prettierrc diff --git a/new-frontend/Dockerfile b/frontend/Dockerfile similarity index 94% rename from new-frontend/Dockerfile rename to frontend/Dockerfile index c676821..3fe5f97 100644 --- a/new-frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Stage 0, "build-stage", based on Node.js, to build and compile the frontend -FROM node:20 as build-stage +FROM node:20 as build-stage WORKDIR /app diff --git a/new-frontend/README.md b/frontend/README.md similarity index 100% rename from new-frontend/README.md rename to frontend/README.md diff --git a/new-frontend/index.html b/frontend/index.html similarity index 100% rename from new-frontend/index.html rename to frontend/index.html diff --git a/new-frontend/modify-openapi-operationids.js b/frontend/modify-openapi-operationids.js similarity index 100% rename from new-frontend/modify-openapi-operationids.js rename to frontend/modify-openapi-operationids.js diff --git a/new-frontend/nginx-backend-not-found.conf b/frontend/nginx-backend-not-found.conf similarity index 100% rename from new-frontend/nginx-backend-not-found.conf rename to frontend/nginx-backend-not-found.conf diff --git a/new-frontend/nginx.conf b/frontend/nginx.conf similarity index 96% rename from new-frontend/nginx.conf rename to frontend/nginx.conf index ed11d3a..fd4472f 100644 --- a/new-frontend/nginx.conf +++ b/frontend/nginx.conf @@ -1,11 +1,11 @@ server { listen 80; - + location / { root /usr/share/nginx/html; index index.html index.htm; try_files $uri $uri/ /index.html =404; } - + include /etc/nginx/extra-conf.d/*.conf; } diff --git a/new-frontend/package-lock.json b/frontend/package-lock.json similarity index 99% rename from new-frontend/package-lock.json rename to frontend/package-lock.json index b9e843e..9e28762 100644 --- a/new-frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "new-frontend", + "name": "frontend", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "new-frontend", + "name": "frontend", "version": "0.0.0", "dependencies": { "@chakra-ui/icons": "2.1.1", diff --git a/new-frontend/package.json b/frontend/package.json similarity index 98% rename from new-frontend/package.json rename to frontend/package.json index 0f1846f..22da180 100644 --- a/new-frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "new-frontend", + "name": "frontend", "private": true, "version": "0.0.0", "type": "module", diff --git a/new-frontend/src/assets/images/fastapi-logo.svg b/frontend/src/assets/images/fastapi-logo.svg similarity index 100% rename from new-frontend/src/assets/images/fastapi-logo.svg rename to frontend/src/assets/images/fastapi-logo.svg diff --git a/new-frontend/src/assets/images/favicon.png b/frontend/src/assets/images/favicon.png similarity index 100% rename from new-frontend/src/assets/images/favicon.png rename to frontend/src/assets/images/favicon.png diff --git a/new-frontend/src/client/core/ApiError.ts b/frontend/src/client/core/ApiError.ts similarity index 100% rename from new-frontend/src/client/core/ApiError.ts rename to frontend/src/client/core/ApiError.ts diff --git a/new-frontend/src/client/core/ApiRequestOptions.ts b/frontend/src/client/core/ApiRequestOptions.ts similarity index 100% rename from new-frontend/src/client/core/ApiRequestOptions.ts rename to frontend/src/client/core/ApiRequestOptions.ts diff --git a/new-frontend/src/client/core/ApiResult.ts b/frontend/src/client/core/ApiResult.ts similarity index 100% rename from new-frontend/src/client/core/ApiResult.ts rename to frontend/src/client/core/ApiResult.ts diff --git a/new-frontend/src/client/core/CancelablePromise.ts b/frontend/src/client/core/CancelablePromise.ts similarity index 100% rename from new-frontend/src/client/core/CancelablePromise.ts rename to frontend/src/client/core/CancelablePromise.ts diff --git a/new-frontend/src/client/core/OpenAPI.ts b/frontend/src/client/core/OpenAPI.ts similarity index 100% rename from new-frontend/src/client/core/OpenAPI.ts rename to frontend/src/client/core/OpenAPI.ts diff --git a/new-frontend/src/client/core/request.ts b/frontend/src/client/core/request.ts similarity index 100% rename from new-frontend/src/client/core/request.ts rename to frontend/src/client/core/request.ts diff --git a/new-frontend/src/client/index.ts b/frontend/src/client/index.ts similarity index 100% rename from new-frontend/src/client/index.ts rename to frontend/src/client/index.ts diff --git a/new-frontend/src/client/models/Body_login_login_access_token.ts b/frontend/src/client/models/Body_login_login_access_token.ts similarity index 100% rename from new-frontend/src/client/models/Body_login_login_access_token.ts rename to frontend/src/client/models/Body_login_login_access_token.ts diff --git a/new-frontend/src/client/models/HTTPValidationError.ts b/frontend/src/client/models/HTTPValidationError.ts similarity index 100% rename from new-frontend/src/client/models/HTTPValidationError.ts rename to frontend/src/client/models/HTTPValidationError.ts diff --git a/new-frontend/src/client/models/ItemCreate.ts b/frontend/src/client/models/ItemCreate.ts similarity index 100% rename from new-frontend/src/client/models/ItemCreate.ts rename to frontend/src/client/models/ItemCreate.ts diff --git a/new-frontend/src/client/models/ItemOut.ts b/frontend/src/client/models/ItemOut.ts similarity index 100% rename from new-frontend/src/client/models/ItemOut.ts rename to frontend/src/client/models/ItemOut.ts diff --git a/new-frontend/src/client/models/ItemUpdate.ts b/frontend/src/client/models/ItemUpdate.ts similarity index 100% rename from new-frontend/src/client/models/ItemUpdate.ts rename to frontend/src/client/models/ItemUpdate.ts diff --git a/new-frontend/src/client/models/ItemsOut.ts b/frontend/src/client/models/ItemsOut.ts similarity index 100% rename from new-frontend/src/client/models/ItemsOut.ts rename to frontend/src/client/models/ItemsOut.ts diff --git a/new-frontend/src/client/models/Message.ts b/frontend/src/client/models/Message.ts similarity index 100% rename from new-frontend/src/client/models/Message.ts rename to frontend/src/client/models/Message.ts diff --git a/new-frontend/src/client/models/NewPassword.ts b/frontend/src/client/models/NewPassword.ts similarity index 100% rename from new-frontend/src/client/models/NewPassword.ts rename to frontend/src/client/models/NewPassword.ts diff --git a/new-frontend/src/client/models/Token.ts b/frontend/src/client/models/Token.ts similarity index 100% rename from new-frontend/src/client/models/Token.ts rename to frontend/src/client/models/Token.ts diff --git a/new-frontend/src/client/models/UpdatePassword.ts b/frontend/src/client/models/UpdatePassword.ts similarity index 100% rename from new-frontend/src/client/models/UpdatePassword.ts rename to frontend/src/client/models/UpdatePassword.ts diff --git a/new-frontend/src/client/models/UserCreate.ts b/frontend/src/client/models/UserCreate.ts similarity index 100% rename from new-frontend/src/client/models/UserCreate.ts rename to frontend/src/client/models/UserCreate.ts diff --git a/new-frontend/src/client/models/UserCreateOpen.ts b/frontend/src/client/models/UserCreateOpen.ts similarity index 100% rename from new-frontend/src/client/models/UserCreateOpen.ts rename to frontend/src/client/models/UserCreateOpen.ts diff --git a/new-frontend/src/client/models/UserOut.ts b/frontend/src/client/models/UserOut.ts similarity index 100% rename from new-frontend/src/client/models/UserOut.ts rename to frontend/src/client/models/UserOut.ts diff --git a/new-frontend/src/client/models/UserUpdate.ts b/frontend/src/client/models/UserUpdate.ts similarity index 100% rename from new-frontend/src/client/models/UserUpdate.ts rename to frontend/src/client/models/UserUpdate.ts diff --git a/new-frontend/src/client/models/UserUpdateMe.ts b/frontend/src/client/models/UserUpdateMe.ts similarity index 100% rename from new-frontend/src/client/models/UserUpdateMe.ts rename to frontend/src/client/models/UserUpdateMe.ts diff --git a/new-frontend/src/client/models/UsersOut.ts b/frontend/src/client/models/UsersOut.ts similarity index 100% rename from new-frontend/src/client/models/UsersOut.ts rename to frontend/src/client/models/UsersOut.ts diff --git a/new-frontend/src/client/models/ValidationError.ts b/frontend/src/client/models/ValidationError.ts similarity index 100% rename from new-frontend/src/client/models/ValidationError.ts rename to frontend/src/client/models/ValidationError.ts diff --git a/new-frontend/src/client/schemas/$Body_login_login_access_token.ts b/frontend/src/client/schemas/$Body_login_login_access_token.ts similarity index 100% rename from new-frontend/src/client/schemas/$Body_login_login_access_token.ts rename to frontend/src/client/schemas/$Body_login_login_access_token.ts diff --git a/new-frontend/src/client/schemas/$HTTPValidationError.ts b/frontend/src/client/schemas/$HTTPValidationError.ts similarity index 100% rename from new-frontend/src/client/schemas/$HTTPValidationError.ts rename to frontend/src/client/schemas/$HTTPValidationError.ts diff --git a/new-frontend/src/client/schemas/$ItemCreate.ts b/frontend/src/client/schemas/$ItemCreate.ts similarity index 100% rename from new-frontend/src/client/schemas/$ItemCreate.ts rename to frontend/src/client/schemas/$ItemCreate.ts diff --git a/new-frontend/src/client/schemas/$ItemOut.ts b/frontend/src/client/schemas/$ItemOut.ts similarity index 100% rename from new-frontend/src/client/schemas/$ItemOut.ts rename to frontend/src/client/schemas/$ItemOut.ts diff --git a/new-frontend/src/client/schemas/$ItemUpdate.ts b/frontend/src/client/schemas/$ItemUpdate.ts similarity index 100% rename from new-frontend/src/client/schemas/$ItemUpdate.ts rename to frontend/src/client/schemas/$ItemUpdate.ts diff --git a/new-frontend/src/client/schemas/$ItemsOut.ts b/frontend/src/client/schemas/$ItemsOut.ts similarity index 100% rename from new-frontend/src/client/schemas/$ItemsOut.ts rename to frontend/src/client/schemas/$ItemsOut.ts diff --git a/new-frontend/src/client/schemas/$Message.ts b/frontend/src/client/schemas/$Message.ts similarity index 100% rename from new-frontend/src/client/schemas/$Message.ts rename to frontend/src/client/schemas/$Message.ts diff --git a/new-frontend/src/client/schemas/$NewPassword.ts b/frontend/src/client/schemas/$NewPassword.ts similarity index 100% rename from new-frontend/src/client/schemas/$NewPassword.ts rename to frontend/src/client/schemas/$NewPassword.ts diff --git a/new-frontend/src/client/schemas/$Token.ts b/frontend/src/client/schemas/$Token.ts similarity index 100% rename from new-frontend/src/client/schemas/$Token.ts rename to frontend/src/client/schemas/$Token.ts diff --git a/new-frontend/src/client/schemas/$UpdatePassword.ts b/frontend/src/client/schemas/$UpdatePassword.ts similarity index 100% rename from new-frontend/src/client/schemas/$UpdatePassword.ts rename to frontend/src/client/schemas/$UpdatePassword.ts diff --git a/new-frontend/src/client/schemas/$UserCreate.ts b/frontend/src/client/schemas/$UserCreate.ts similarity index 100% rename from new-frontend/src/client/schemas/$UserCreate.ts rename to frontend/src/client/schemas/$UserCreate.ts diff --git a/new-frontend/src/client/schemas/$UserCreateOpen.ts b/frontend/src/client/schemas/$UserCreateOpen.ts similarity index 100% rename from new-frontend/src/client/schemas/$UserCreateOpen.ts rename to frontend/src/client/schemas/$UserCreateOpen.ts diff --git a/new-frontend/src/client/schemas/$UserOut.ts b/frontend/src/client/schemas/$UserOut.ts similarity index 100% rename from new-frontend/src/client/schemas/$UserOut.ts rename to frontend/src/client/schemas/$UserOut.ts diff --git a/new-frontend/src/client/schemas/$UserUpdate.ts b/frontend/src/client/schemas/$UserUpdate.ts similarity index 100% rename from new-frontend/src/client/schemas/$UserUpdate.ts rename to frontend/src/client/schemas/$UserUpdate.ts diff --git a/new-frontend/src/client/schemas/$UserUpdateMe.ts b/frontend/src/client/schemas/$UserUpdateMe.ts similarity index 100% rename from new-frontend/src/client/schemas/$UserUpdateMe.ts rename to frontend/src/client/schemas/$UserUpdateMe.ts diff --git a/new-frontend/src/client/schemas/$UsersOut.ts b/frontend/src/client/schemas/$UsersOut.ts similarity index 100% rename from new-frontend/src/client/schemas/$UsersOut.ts rename to frontend/src/client/schemas/$UsersOut.ts diff --git a/new-frontend/src/client/schemas/$ValidationError.ts b/frontend/src/client/schemas/$ValidationError.ts similarity index 100% rename from new-frontend/src/client/schemas/$ValidationError.ts rename to frontend/src/client/schemas/$ValidationError.ts diff --git a/new-frontend/src/client/services/ItemsService.ts b/frontend/src/client/services/ItemsService.ts similarity index 100% rename from new-frontend/src/client/services/ItemsService.ts rename to frontend/src/client/services/ItemsService.ts diff --git a/new-frontend/src/client/services/LoginService.ts b/frontend/src/client/services/LoginService.ts similarity index 100% rename from new-frontend/src/client/services/LoginService.ts rename to frontend/src/client/services/LoginService.ts diff --git a/new-frontend/src/client/services/UsersService.ts b/frontend/src/client/services/UsersService.ts similarity index 100% rename from new-frontend/src/client/services/UsersService.ts rename to frontend/src/client/services/UsersService.ts diff --git a/new-frontend/src/client/services/UtilsService.ts b/frontend/src/client/services/UtilsService.ts similarity index 100% rename from new-frontend/src/client/services/UtilsService.ts rename to frontend/src/client/services/UtilsService.ts diff --git a/new-frontend/src/components/Admin/AddUser.tsx b/frontend/src/components/Admin/AddUser.tsx similarity index 100% rename from new-frontend/src/components/Admin/AddUser.tsx rename to frontend/src/components/Admin/AddUser.tsx diff --git a/new-frontend/src/components/Admin/EditUser.tsx b/frontend/src/components/Admin/EditUser.tsx similarity index 100% rename from new-frontend/src/components/Admin/EditUser.tsx rename to frontend/src/components/Admin/EditUser.tsx diff --git a/new-frontend/src/components/Common/ActionsMenu.tsx b/frontend/src/components/Common/ActionsMenu.tsx similarity index 100% rename from new-frontend/src/components/Common/ActionsMenu.tsx rename to frontend/src/components/Common/ActionsMenu.tsx diff --git a/new-frontend/src/components/Common/DeleteAlert.tsx b/frontend/src/components/Common/DeleteAlert.tsx similarity index 100% rename from new-frontend/src/components/Common/DeleteAlert.tsx rename to frontend/src/components/Common/DeleteAlert.tsx diff --git a/new-frontend/src/components/Common/Navbar.tsx b/frontend/src/components/Common/Navbar.tsx similarity index 100% rename from new-frontend/src/components/Common/Navbar.tsx rename to frontend/src/components/Common/Navbar.tsx diff --git a/new-frontend/src/components/Common/NotFound.tsx b/frontend/src/components/Common/NotFound.tsx similarity index 100% rename from new-frontend/src/components/Common/NotFound.tsx rename to frontend/src/components/Common/NotFound.tsx diff --git a/new-frontend/src/components/Common/Sidebar.tsx b/frontend/src/components/Common/Sidebar.tsx similarity index 100% rename from new-frontend/src/components/Common/Sidebar.tsx rename to frontend/src/components/Common/Sidebar.tsx diff --git a/new-frontend/src/components/Common/SidebarItems.tsx b/frontend/src/components/Common/SidebarItems.tsx similarity index 100% rename from new-frontend/src/components/Common/SidebarItems.tsx rename to frontend/src/components/Common/SidebarItems.tsx diff --git a/new-frontend/src/components/Common/UserMenu.tsx b/frontend/src/components/Common/UserMenu.tsx similarity index 100% rename from new-frontend/src/components/Common/UserMenu.tsx rename to frontend/src/components/Common/UserMenu.tsx diff --git a/new-frontend/src/components/Items/AddItem.tsx b/frontend/src/components/Items/AddItem.tsx similarity index 100% rename from new-frontend/src/components/Items/AddItem.tsx rename to frontend/src/components/Items/AddItem.tsx diff --git a/new-frontend/src/components/Items/EditItem.tsx b/frontend/src/components/Items/EditItem.tsx similarity index 100% rename from new-frontend/src/components/Items/EditItem.tsx rename to frontend/src/components/Items/EditItem.tsx diff --git a/new-frontend/src/components/UserSettings/Appearance.tsx b/frontend/src/components/UserSettings/Appearance.tsx similarity index 100% rename from new-frontend/src/components/UserSettings/Appearance.tsx rename to frontend/src/components/UserSettings/Appearance.tsx diff --git a/new-frontend/src/components/UserSettings/ChangePassword.tsx b/frontend/src/components/UserSettings/ChangePassword.tsx similarity index 100% rename from new-frontend/src/components/UserSettings/ChangePassword.tsx rename to frontend/src/components/UserSettings/ChangePassword.tsx diff --git a/new-frontend/src/components/UserSettings/DeleteAccount.tsx b/frontend/src/components/UserSettings/DeleteAccount.tsx similarity index 100% rename from new-frontend/src/components/UserSettings/DeleteAccount.tsx rename to frontend/src/components/UserSettings/DeleteAccount.tsx diff --git a/new-frontend/src/components/UserSettings/DeleteConfirmation.tsx b/frontend/src/components/UserSettings/DeleteConfirmation.tsx similarity index 100% rename from new-frontend/src/components/UserSettings/DeleteConfirmation.tsx rename to frontend/src/components/UserSettings/DeleteConfirmation.tsx diff --git a/new-frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx similarity index 100% rename from new-frontend/src/components/UserSettings/UserInformation.tsx rename to frontend/src/components/UserSettings/UserInformation.tsx diff --git a/new-frontend/src/hooks/useAuth.ts b/frontend/src/hooks/useAuth.ts similarity index 100% rename from new-frontend/src/hooks/useAuth.ts rename to frontend/src/hooks/useAuth.ts diff --git a/new-frontend/src/hooks/useCustomToast.ts b/frontend/src/hooks/useCustomToast.ts similarity index 100% rename from new-frontend/src/hooks/useCustomToast.ts rename to frontend/src/hooks/useCustomToast.ts diff --git a/new-frontend/src/index.css b/frontend/src/index.css similarity index 100% rename from new-frontend/src/index.css rename to frontend/src/index.css diff --git a/new-frontend/src/main.tsx b/frontend/src/main.tsx similarity index 100% rename from new-frontend/src/main.tsx rename to frontend/src/main.tsx diff --git a/new-frontend/src/routeTree.gen.ts b/frontend/src/routeTree.gen.ts similarity index 100% rename from new-frontend/src/routeTree.gen.ts rename to frontend/src/routeTree.gen.ts diff --git a/new-frontend/src/routes/__root.tsx b/frontend/src/routes/__root.tsx similarity index 100% rename from new-frontend/src/routes/__root.tsx rename to frontend/src/routes/__root.tsx diff --git a/new-frontend/src/routes/_layout.tsx b/frontend/src/routes/_layout.tsx similarity index 100% rename from new-frontend/src/routes/_layout.tsx rename to frontend/src/routes/_layout.tsx diff --git a/new-frontend/src/routes/_layout/admin.tsx b/frontend/src/routes/_layout/admin.tsx similarity index 100% rename from new-frontend/src/routes/_layout/admin.tsx rename to frontend/src/routes/_layout/admin.tsx diff --git a/new-frontend/src/routes/_layout/index.tsx b/frontend/src/routes/_layout/index.tsx similarity index 100% rename from new-frontend/src/routes/_layout/index.tsx rename to frontend/src/routes/_layout/index.tsx diff --git a/new-frontend/src/routes/_layout/items.tsx b/frontend/src/routes/_layout/items.tsx similarity index 100% rename from new-frontend/src/routes/_layout/items.tsx rename to frontend/src/routes/_layout/items.tsx diff --git a/new-frontend/src/routes/_layout/settings.tsx b/frontend/src/routes/_layout/settings.tsx similarity index 100% rename from new-frontend/src/routes/_layout/settings.tsx rename to frontend/src/routes/_layout/settings.tsx diff --git a/new-frontend/src/routes/login.tsx b/frontend/src/routes/login.tsx similarity index 100% rename from new-frontend/src/routes/login.tsx rename to frontend/src/routes/login.tsx diff --git a/new-frontend/src/routes/recover-password.tsx b/frontend/src/routes/recover-password.tsx similarity index 100% rename from new-frontend/src/routes/recover-password.tsx rename to frontend/src/routes/recover-password.tsx diff --git a/new-frontend/src/routes/reset-password.tsx b/frontend/src/routes/reset-password.tsx similarity index 100% rename from new-frontend/src/routes/reset-password.tsx rename to frontend/src/routes/reset-password.tsx diff --git a/new-frontend/src/theme.tsx b/frontend/src/theme.tsx similarity index 100% rename from new-frontend/src/theme.tsx rename to frontend/src/theme.tsx diff --git a/new-frontend/src/vite-env.d.ts b/frontend/src/vite-env.d.ts similarity index 100% rename from new-frontend/src/vite-env.d.ts rename to frontend/src/vite-env.d.ts diff --git a/new-frontend/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from new-frontend/tsconfig.json rename to frontend/tsconfig.json diff --git a/new-frontend/tsconfig.node.json b/frontend/tsconfig.node.json similarity index 100% rename from new-frontend/tsconfig.node.json rename to frontend/tsconfig.node.json diff --git a/new-frontend/vite.config.ts b/frontend/vite.config.ts similarity index 100% rename from new-frontend/vite.config.ts rename to frontend/vite.config.ts