Merge pull request #22 from krystxf/refactor/backend

refactor: backend - data validation, modules
krystxf · Sep 15, 2024 · 7fb98d7 · 7fb98d7
2 parents 908ad6b + 56b29e4
commit 7fb98d7
Show file tree

Hide file tree

Showing 48 changed files with 1,112 additions and 14,301 deletions.
diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml
@@ -27,12 +27,12 @@ jobs:
 
             - name: Install dependencies
               run: |
-                  cd backend-nest
                   pnpm install
 
             - name: Build
               run: |
                   cd backend-nest
+                  pnpm prisma:generate
                   pnpm build
 
             - name: Test
@@ -44,26 +44,3 @@ jobs:
               run: |
                   cd backend-nest
                   pnpm lint
-
-    docker:
-        runs-on: ubuntu-latest
-        needs: ci
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v3
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3
-            - name: Login to Docker Hub
-              uses: docker/login-action@v3
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: Build and push
-              uses: docker/build-push-action@v6
-              with:
-                  context: ./backend-nest/
-                  push: ${{ github.ref == 'refs/heads/master' }}
-                  tags: krystxf/metro-now-backend:latest
diff --git a/app/metro-now/Core/Map/MapView.swift b/app/metro-now/Core/Map/MapView.swift
@@ -45,14 +45,13 @@ struct MapView: View {
                                    latitude: stop.latitude,
                                    longitude: stop.longitude
                                )) {
-
-                            StopAnnotation(
-                                routes: stop.routes.map(\.name)
-                            )
-                            .onTapGesture {
-                                openedAnnotation = stop.id
-                            }
-
+                        StopAnnotation(
+                            routes: stop.routes.map(\.name)
+                        )
+                        .onTapGesture {
+                            openedAnnotation = stop.id
+                        }
+
                         .sheet(
                             isPresented: Binding(
                                 get: { openedAnnotation == stop.id },
@@ -67,11 +66,10 @@ struct MapView: View {
                             }
                         ) {
                             Text(stop.name)
-                                .presentationDetents([ .medium, .large
-                                                     ])
-                                               .presentationDragIndicator(.visible)
-                                               .presentationBackgroundInteraction(.enabled)
-                                               .presentationCornerRadius(32)
+                                .presentationDetents([.medium, .large])
+                                .presentationDragIndicator(.visible)
+                                .presentationBackgroundInteraction(.enabled)
+                                .presentationCornerRadius(32)
                         }
                     }
                 }

diff --git a/backend-nest/README.md b/backend-nest/README.md
@@ -8,6 +8,7 @@ cp .env.docker.example .env.docker
 
 
 ## production
+cp ../pnpm-lock.yaml ./
 docker compose up
 
 

diff --git a/backend-nest/package.json b/backend-nest/package.json
@@ -8,7 +8,8 @@
         "dev": "pnpm dlx dotenv-cli -e .env.local -- nest start --watch",
         "start:debug": "nest start --debug --watch",
         "start:prod": "node dist/main",
-        "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+        "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
+        "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
         "test": "jest",
         "test:watch": "jest --watch",
         "test:cov": "jest --coverage",
@@ -28,12 +29,9 @@
         "@nestjs/schedule": "^4.0.2",
         "@prisma/client": "5.16.1",
         "cache-manager": "^5.6.1",
-        "nest-winston": "^1.10.0",
         "radash": "^12.1.0",
         "reflect-metadata": "^0.2.0",
         "rxjs": "^7.8.1",
-        "winston": "^3.13.0",
-        "winston-daily-rotate-file": "^5.0.0",
         "zod": "^3.23.8"
     },
     "devDependencies": {
@@ -51,7 +49,7 @@
         "eslint-plugin-prettier": "^5.0.0",
         "jest": "^29.5.0",
         "prettier": "^3.0.0",
-        "prisma": "^5.16.1",
+        "prisma": "^5.19.1",
         "source-map-support": "^0.5.21",
         "supertest": "^6.3.3",
         "ts-jest": "^29.1.0",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@ cp .env.docker.example .env.docker


		## production
		cp ../pnpm-lock.yaml ./
		docker compose up


Expand Down