42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changements dans les dockerfiles + ajout de quelques trucs pour svelte en PoC

Browse Source
This commit is contained in:
batche
2022-11-14 16:02:54 +01:00
parent 8b4545f4d6
commit aa3eb111c1
15 changed files with 213 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
srcs/requirements/nestjs/.dockerignore Normal file
View File

@@ -0,0 +1,11 @@
# Ignore everything
*
# Allow files and folders with a pattern starting with !
!api_back/*.js
!api_back/*.ts
!api_back/*.json
!api_back/*.html
!api_back/*.lock
!api_back/.env

42
srcs/requirements/nestjs/Dockerfile
View File

@@ -1,42 +1,10 @@
FROM node:alpine AS development
WORKDIR /usr/src/app
WORKDIR /usr/app
COPY --chown=node:node ./api_back/package*.json ./
COPY api_back/* .
COPY api_back/.env .env
RUN npm i
RUN npm ci
COPY --chown=node:node ./api_back/ ./
USER node
# FROM node:19-alpine AS build
# WORKDIR /usr/src/app
# COPY --chown=node:node ./api_back/package*.json ./
# COPY --chown=node:node --from=development /usr/src/app/node_modules ./node_modules
# COPY --chown=node:node ./api_back/ ./
# RUN npm run build
# ENV NODE_ENV production
# RUN npm ci --only=production && npm cache clean --force
# USER node
# FROM node:19-alpine AS production
# WORKDIR /usr/src/app
# COPY --chown=node:node --from=build /usr/src/app/node_modules ./node_modules
# COPY --chown=node:node --from=build /usr/src/app/dist ./dist
# USER node
ENV HOST=0.0.0.0
CMD [ "node", "run", "start:dev" ]
CMD [ "npm", "run", "start:dev" ]

11
srcs/requirements/nestjs/api_back/src/auth/42/authentication.controller.ts
View File

@@ -36,17 +36,6 @@ export class AuthenticationController {
return response.status(200).redirect('http://transcendance:8080');
}
/**
* GET /api/v2/auth/status
* Route pour vérifier si l'utilisateur est connecté
* ou non.
*/
@Get('status')
@UseGuards(AuthenticateGuard)
status() {
return 'status';
}
/**
* GET /api/v2/auth/logout
* Route pour déconnecter l'utilisateur

2
srcs/requirements/nestjs/api_back/src/friendship/friendship.controller.ts
View File

@@ -24,7 +24,7 @@ export class FriendshipController {
return this.friendshipService.findOneFriend(relationshipId, user.id);
}
// POST http://127.0.0.1:3000/api/v2/network/
// POST http://127.0.0.1:3000/api/v2/network/myfriends
@Post('myfriends')
@HttpCode(HttpStatus.CREATED)
@UseGuards(AuthenticateGuard)

3
srcs/requirements/nestjs/api_back/src/users/entities/user.entity.ts
View File

@@ -30,6 +30,9 @@ export class User {
@Column('json', { nullable: true })
status: [string];
// @Column()
// isFirstConnection: boolean;
@Column({ default: false, nullable: true })
isEnabledTwoFactorAuth: boolean;

22
srcs/requirements/nestjs/api_back/src/users/users.controller.ts
View File

@@ -31,18 +31,18 @@ export class UsersController {
* car un utilisateur est crée à la première connexion avec l'Oauth de 42.
*/
@UseGuards(AuthenticateGuard)
@Get()
findOne(@Req() req) {
return this.usersService.findOne(req.user.id);
}
// @UseGuards(AuthenticateGuard)
// @Get()
// findOne(@Req() req) {
// return this.usersService.findOne(req.user.id);
// }
@UseGuards(AuthenticateGuard)
@Post()
@HttpCode(HttpStatus.CREATED)
create(@Body() createUsersDto : CreateUsersDto ) {
return this.usersService.create(createUsersDto);
}
// @UseGuards(AuthenticateGuard)
// @Post()
// @HttpCode(HttpStatus.CREATED)
// create(@Body() createUsersDto : CreateUsersDto ) {
// return this.usersService.create(createUsersDto);
// }
@UseGuards(AuthenticateGuard)
@Patch()