Kinou/ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Elisee ADJIGUIDI 2023-06-24 16:04:28 +02:00
parent 20314382e6
commit 6204cd2cfd
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
containers/api/src/app.controller.ts
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* app.controller.ts :+: :+: :+: */ /* app.controller.ts :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/17 01:00:00 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:00 by apommier #+# #+# */
/* Updated: 2023/06/23 19:15:56 by apommier ### ########.fr */ /* Updated: 2023/06/24 16:01:35 by sadjigui ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -177,13 +177,17 @@ export class AppController {
@UseGuards(JwtAuthGuard) @UseGuards(JwtAuthGuard)
@Post('/nickname') @Post('/nickname')
async setNickname(@Request() req, @Body() data: any) { async setNickname(@Request() req, @Body() data: any) {
// let user = req.user // let user = req.user
// user.nickname = data.nickname // user.nickname = data.nickname
console.log(`user= ${req.user.username}`) // console.log(user= ${req.user.username})
let user = await this.userService.findOne(req.user.username) const taken = await this.userService.findNickname(data.nickname)
user.nickname = data.nickname; console.log("taken =", taken)
// return await this.userService.getFriends(req.user.username); if (taken)
return await this.userService.save(user); return (0);
let user = await this.userService.findOne(req.user.username)
user.nickname = data.nickname;
// return await this.userService.getFriends(req.user.username);
return await this.userService.save(user);
} }
@UseGuards(JwtAuthGuard) @UseGuards(JwtAuthGuard)
@ -357,7 +361,6 @@ export class AppController {
// import { prisma } from "../server"; // import { prisma } from "../server";
@Redirect('http://' + process.env.BASE_URL + '/token', 302) @Redirect('http://' + process.env.BASE_URL + '/token', 302)
@Get('auth/login') @Get('auth/login')
async login2(@Req() request: Request) { async login2(@Req() request: Request) {

12
containers/api/src/users/users.service.ts
View File

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* users.service.ts :+: :+: :+: */ /* users.service.ts :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: sadjigui <sadjigui@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/06/17 01:00:07 by apommier #+# #+# */ /* Created: 2023/06/17 01:00:07 by apommier #+# #+# */
/* Updated: 2023/06/21 01:31:44 by apommier ### ########.fr */ /* Updated: 2023/06/24 00:28:33 by sadjigui ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,6 +18,7 @@ import { User } from '../model/user.entity';
import { MatchLog } from '../model/user.entity'; import { MatchLog } from '../model/user.entity';
@Injectable() @Injectable()
export class UsersService { export class UsersService {
constructor( constructor(
@ -36,6 +37,13 @@ export class UsersService {
async findAll(): Promise<User[]> { async findAll(): Promise<User[]> {
return await this.userRepository.find(); return await this.userRepository.find();
} }
async findNickname(username: string): Promise<User> {
console.log("nick in find =", username)
const ret= await this.userRepository.findOneBy({nickname: username});
console.log("ret noick=", ret )
return ret;
}
async findOne(username: string): Promise<User> { async findOne(username: string): Promise<User> {
return await this.userRepository.findOneBy({username: username}); return await this.userRepository.findOneBy({username: username});

6
containers/react/src/components/Messages/Chats.tsx
View File

@ -17,7 +17,11 @@ import { ImBlocked } from 'react-icons/im';
import { MdOutlineGroupAdd } from 'react-icons/md'; import { MdOutlineGroupAdd } from 'react-icons/md';
import { GrAdd } from 'react-icons/gr'; import { GrAdd } from 'react-icons/gr';
import { RiListSettingsLine } from 'react-icons/ri' import { RiListSettingsLine } from 'react-icons/ri'
<<<<<<< Updated upstream
import { HiChatBubbleLeft } from 'react-icons/hi2' import { HiChatBubbleLeft } from 'react-icons/hi2'
=======
import { LuCat } from 'react-icons/lu'
>>>>>>> Stashed changes
// import { Rank } from "../../DataBase/DataRank"; // import { Rank } from "../../DataBase/DataRank";
import GreenAlert from "../Alert/GreenAlert.tsx"; import GreenAlert from "../Alert/GreenAlert.tsx";
@ -28,7 +32,7 @@ import PartyInvite from "./PartyInvite.tsx";
// import {User, Conv, Message} from "../../../interfaces.tsx" // import {User, Conv, Message} from "../../../interfaces.tsx"
import {User, Conv} from "../../../interfaces.tsx" import {User, Conv} from "../../../interfaces.tsx"
import { IoLogoOctocat } from "react-icons/io5"; import { IoChatbox, IoLogoOctocat } from "react-icons/io5";
const TouchDiv = styled.div` const TouchDiv = styled.div`
margin-left: 10px; margin-left: 10px;