diff --git a/Dockerfile.caddy b/Dockerfile.caddy index 57ed1d45..98fb93e9 100644 --- a/Dockerfile.caddy +++ b/Dockerfile.caddy @@ -1,7 +1,7 @@ # frontend build FROM node:20-alpine AS frontend-build WORKDIR /frontend -COPY frontend/bus-tracker . +COPY frontend . RUN npm ci && npm run build # caddy runtime diff --git a/compose.dev.yaml b/compose.dev.yaml index 92b9da4d..61464d26 100644 --- a/compose.dev.yaml +++ b/compose.dev.yaml @@ -16,7 +16,7 @@ services: ports: - "5173:5173" volumes: - - ./frontend/bus-tracker:/app + - ./frontend:/app depends_on: - api diff --git a/frontend/bus-tracker/.env.development b/frontend/.env.development similarity index 100% rename from frontend/bus-tracker/.env.development rename to frontend/.env.development diff --git a/frontend/bus-tracker/.env.production.example b/frontend/.env.production.example similarity index 100% rename from frontend/bus-tracker/.env.production.example rename to frontend/.env.production.example diff --git a/frontend/bus-tracker/.gitignore b/frontend/.gitignore similarity index 100% rename from frontend/bus-tracker/.gitignore rename to frontend/.gitignore diff --git a/frontend/bus-tracker/README.md b/frontend/README.md similarity index 100% rename from frontend/bus-tracker/README.md rename to frontend/README.md diff --git a/frontend/bus-tracker/eslint.config.js b/frontend/eslint.config.js similarity index 100% rename from frontend/bus-tracker/eslint.config.js rename to frontend/eslint.config.js diff --git a/frontend/bus-tracker/index.html b/frontend/index.html similarity index 100% rename from frontend/bus-tracker/index.html rename to frontend/index.html diff --git a/frontend/bus-tracker/package-lock.json b/frontend/package-lock.json similarity index 99% rename from frontend/bus-tracker/package-lock.json rename to frontend/package-lock.json index 973c0452..0391a258 100644 --- a/frontend/bus-tracker/package-lock.json +++ b/frontend/package-lock.json @@ -22,6 +22,7 @@ "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^5.1.1", + "baseline-browser-mapping": "^2.9.19", "eslint": "^9.39.1", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.4.24", @@ -1926,9 +1927,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.8.30", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.30.tgz", - "integrity": "sha512-aTUKW4ptQhS64+v2d6IkPzymEzzhw+G0bA1g3uBRV3+ntkH+svttKseW5IOR4Ed6NUVKqnY7qT3dKvzQ7io4AA==", + "version": "2.9.19", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz", + "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/frontend/bus-tracker/package.json b/frontend/package.json similarity index 93% rename from frontend/bus-tracker/package.json rename to frontend/package.json index f1eb581c..43172232 100644 --- a/frontend/bus-tracker/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "bus-tracker", + "name": "busuuf", "private": true, "version": "0.0.0", "type": "module", @@ -24,6 +24,7 @@ "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^5.1.1", + "baseline-browser-mapping": "^2.9.19", "eslint": "^9.39.1", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.4.24", diff --git a/frontend/bus-tracker/public/bus-3d.png b/frontend/public/bus-3d.png similarity index 100% rename from frontend/bus-tracker/public/bus-3d.png rename to frontend/public/bus-3d.png diff --git a/frontend/bus-tracker/public/icone_onibus.png b/frontend/public/icone_onibus.png similarity index 100% rename from frontend/bus-tracker/public/icone_onibus.png rename to frontend/public/icone_onibus.png diff --git a/frontend/bus-tracker/public/logo-uff.png b/frontend/public/logo-uff.png similarity index 100% rename from frontend/bus-tracker/public/logo-uff.png rename to frontend/public/logo-uff.png diff --git a/frontend/bus-tracker/public/vite.svg b/frontend/public/vite.svg similarity index 100% rename from frontend/bus-tracker/public/vite.svg rename to frontend/public/vite.svg diff --git a/frontend/bus-tracker/src/App.css b/frontend/src/App.css similarity index 100% rename from frontend/bus-tracker/src/App.css rename to frontend/src/App.css diff --git a/frontend/bus-tracker/src/App.tsx b/frontend/src/App.tsx similarity index 100% rename from frontend/bus-tracker/src/App.tsx rename to frontend/src/App.tsx diff --git a/frontend/bus-tracker/src/assets/react.svg b/frontend/src/assets/react.svg similarity index 100% rename from frontend/bus-tracker/src/assets/react.svg rename to frontend/src/assets/react.svg diff --git a/frontend/bus-tracker/src/components/BeginScreen.tsx b/frontend/src/components/BeginScreen.tsx similarity index 100% rename from frontend/bus-tracker/src/components/BeginScreen.tsx rename to frontend/src/components/BeginScreen.tsx diff --git a/frontend/bus-tracker/src/components/BusMap.tsx b/frontend/src/components/BusMap.tsx similarity index 100% rename from frontend/bus-tracker/src/components/BusMap.tsx rename to frontend/src/components/BusMap.tsx diff --git a/frontend/bus-tracker/src/components/DashboardScreen.tsx b/frontend/src/components/DashboardScreen.tsx similarity index 100% rename from frontend/bus-tracker/src/components/DashboardScreen.tsx rename to frontend/src/components/DashboardScreen.tsx diff --git a/frontend/bus-tracker/src/components/InfoPanel.tsx b/frontend/src/components/InfoPanel.tsx similarity index 100% rename from frontend/bus-tracker/src/components/InfoPanel.tsx rename to frontend/src/components/InfoPanel.tsx diff --git a/frontend/bus-tracker/src/components/PresenceModal.tsx b/frontend/src/components/PresenceModal.tsx similarity index 100% rename from frontend/bus-tracker/src/components/PresenceModal.tsx rename to frontend/src/components/PresenceModal.tsx diff --git a/frontend/bus-tracker/src/components/RouteCard.tsx b/frontend/src/components/RouteCard.tsx similarity index 100% rename from frontend/bus-tracker/src/components/RouteCard.tsx rename to frontend/src/components/RouteCard.tsx diff --git a/frontend/bus-tracker/src/components/RouteSelectionModal.tsx b/frontend/src/components/RouteSelectionModal.tsx similarity index 100% rename from frontend/bus-tracker/src/components/RouteSelectionModal.tsx rename to frontend/src/components/RouteSelectionModal.tsx diff --git a/frontend/bus-tracker/src/hooks/useMQTT.ts b/frontend/src/hooks/useMQTT.ts similarity index 100% rename from frontend/bus-tracker/src/hooks/useMQTT.ts rename to frontend/src/hooks/useMQTT.ts diff --git a/frontend/bus-tracker/src/hooks/useUserLocation.ts b/frontend/src/hooks/useUserLocation.ts similarity index 100% rename from frontend/bus-tracker/src/hooks/useUserLocation.ts rename to frontend/src/hooks/useUserLocation.ts diff --git a/frontend/bus-tracker/src/index.css b/frontend/src/index.css similarity index 100% rename from frontend/bus-tracker/src/index.css rename to frontend/src/index.css diff --git a/frontend/bus-tracker/src/main.tsx b/frontend/src/main.tsx similarity index 100% rename from frontend/bus-tracker/src/main.tsx rename to frontend/src/main.tsx diff --git a/frontend/bus-tracker/src/services/api.ts b/frontend/src/services/api.ts similarity index 100% rename from frontend/bus-tracker/src/services/api.ts rename to frontend/src/services/api.ts diff --git a/frontend/bus-tracker/src/style/DashboardScreen.css b/frontend/src/style/DashboardScreen.css similarity index 100% rename from frontend/bus-tracker/src/style/DashboardScreen.css rename to frontend/src/style/DashboardScreen.css diff --git a/frontend/bus-tracker/src/style/PresenceModal.css b/frontend/src/style/PresenceModal.css similarity index 100% rename from frontend/bus-tracker/src/style/PresenceModal.css rename to frontend/src/style/PresenceModal.css diff --git a/frontend/bus-tracker/src/style/RouteCard.css b/frontend/src/style/RouteCard.css similarity index 100% rename from frontend/bus-tracker/src/style/RouteCard.css rename to frontend/src/style/RouteCard.css diff --git a/frontend/bus-tracker/src/style/RouteSelectionModal.css b/frontend/src/style/RouteSelectionModal.css similarity index 100% rename from frontend/bus-tracker/src/style/RouteSelectionModal.css rename to frontend/src/style/RouteSelectionModal.css diff --git a/frontend/bus-tracker/src/types.ts b/frontend/src/types.ts similarity index 100% rename from frontend/bus-tracker/src/types.ts rename to frontend/src/types.ts diff --git a/frontend/bus-tracker/src/utils/validator.ts b/frontend/src/utils/validator.ts similarity index 100% rename from frontend/bus-tracker/src/utils/validator.ts rename to frontend/src/utils/validator.ts diff --git a/frontend/bus-tracker/tsconfig.app.json b/frontend/tsconfig.app.json similarity index 100% rename from frontend/bus-tracker/tsconfig.app.json rename to frontend/tsconfig.app.json diff --git a/frontend/bus-tracker/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from frontend/bus-tracker/tsconfig.json rename to frontend/tsconfig.json diff --git a/frontend/bus-tracker/tsconfig.node.json b/frontend/tsconfig.node.json similarity index 100% rename from frontend/bus-tracker/tsconfig.node.json rename to frontend/tsconfig.node.json diff --git a/frontend/bus-tracker/vite.config.ts b/frontend/vite.config.ts similarity index 100% rename from frontend/bus-tracker/vite.config.ts rename to frontend/vite.config.ts