Skip to content

Commit

Permalink
Merge branch 'main' into feature/search-by-movie-backend
Browse files Browse the repository at this point in the history
  • Loading branch information
rasouza authored Apr 11, 2024
2 parents d1d470f + d971297 commit ca609c0
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 3 deletions.
16 changes: 16 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@
"@typescript-eslint/consistent-type-imports": [
"warn",
{ "prefer": "no-type-imports" }
],
"import/order": [
1,
{
"groups": [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index",
"object",
"type"
],
"newlines-between": "always"
}
]
}
},
Expand Down
1 change: 1 addition & 0 deletions apps/api/src/app/app.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Controller, Get, Logger, Req } from '@nestjs/common'
import { Request } from 'express'

import { AppService } from './app.service'

@Controller()
Expand Down
5 changes: 3 additions & 2 deletions apps/api/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { ConfigModule } from '@nestjs/config'
import { APP_PIPE } from '@nestjs/core'
import { ZodValidationPipe } from 'nestjs-zod'

import { AppController } from './app.controller'
import { AppService } from './app.service'
import { DatabaseModule } from '../database/database.module'
import { MoviesModule } from '../movies/movies.module'

import { AppController } from './app.controller'
import { AppService } from './app.service'
import { validate } from './config/validate'

@Module({
Expand Down
1 change: 1 addition & 0 deletions apps/api/src/database/database.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Global, Module } from '@nestjs/common'

import { PrismaService } from './prisma.service'

@Global()
Expand Down
1 change: 0 additions & 1 deletion apps/api/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from '@nestjs/common'
import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger'
import { NestFactory } from '@nestjs/core'

import {
utilities as nestWinstonModuleUtilities,
WinstonModule
Expand Down
1 change: 1 addition & 0 deletions apps/api/src/repl.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { repl } from '@nestjs/core'

import { AppModule } from './app/app.module'

async function bootstrap () {
Expand Down
1 change: 1 addition & 0 deletions apps/api/test/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Test, TestingModule } from '@nestjs/testing'
import { INestApplication } from '@nestjs/common'
import * as request from 'supertest'

import { AppModule } from './../src/app.module'

describe('AppController (e2e)', () => {
Expand Down

0 comments on commit ca609c0

Please sign in to comment.