From 445816dfad65a1db78e41c626e8976ce2296f596 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 21 Sep 2023 17:01:50 +0200 Subject: [PATCH] Fix log error for images --- back/src/main.ts | 13 +++++++------ docker-compose.dev.yml | 1 + front/API.ts | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/back/src/main.ts b/back/src/main.ts index d52f4a6..951ff49 100644 --- a/back/src/main.ts +++ b/back/src/main.ts @@ -10,7 +10,7 @@ import { } from '@nestjs/common'; import { RequestLogger, RequestLoggerOptions } from 'json-logger-service'; import { tap } from 'rxjs'; -import { PrismaModel } from './_gen/prisma-class' +import { PrismaModel } from './_gen/prisma-class'; import { PrismaService } from './prisma/prisma.service'; @Injectable() @@ -32,15 +32,14 @@ export class AspectLogger implements NestInterceptor { }; return next.handle().pipe( - tap((data) => + tap((/* data */) => console.log( JSON.stringify({ ...toPrint, statusCode, - data, + //data, //TODO: Data crashed with images }), - ), - ), + ),), ); } } @@ -59,7 +58,9 @@ async function bootstrap() { .setDescription('The chromacase API') .setVersion('1.0') .build(); - const document = SwaggerModule.createDocument(app, config, { extraModels: [...PrismaModel.extraModels]}); + const document = SwaggerModule.createDocument(app, config, { + extraModels: [...PrismaModel.extraModels], + }); SwaggerModule.setup('api', app, document); app.useGlobalPipes(new ValidationPipe()); diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 100eb77..8a9e635 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -77,6 +77,7 @@ services: depends_on: - back - front + - scorometer volumes: - "./front/assets:/assets:ro" - "./front/nginx.conf.template.dev:/etc/nginx/templates/default.conf.template:ro" diff --git a/front/API.ts b/front/API.ts index 5dcf445..802f0d0 100644 --- a/front/API.ts +++ b/front/API.ts @@ -23,6 +23,7 @@ import { AccessTokenResponseHandler } from './models/AccessTokenResponse'; import * as yup from 'yup'; import { base64ToBlob } from './utils/base64ToBlob'; import { ImagePickerAsset } from 'expo-image-picker'; +import Constant from 'expo-constants'; type AuthenticationInput = { username: string; password: string }; type RegistrationInput = AuthenticationInput & { email: string }; @@ -68,7 +69,7 @@ export default class API { public static readonly baseUrl = process.env.NODE_ENV != 'development' && Platform.OS === 'web' ? '/api' - : 'https://nightly.chroma.octohub.app/api'; + : Constant.manifest?.extra?.apiUrl; public static async fetch( params: FetchParams, handle: Pick, 'raw'>