suppression node-modules, icon ...

VallienneDiane · Apr 7, 2023 · 71c15a2 · 71c15a2
1 parent db00fe1
commit 71c15a2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 81 deletions.
diff --git a/back/nest_project/src/user/relation/friend/friend.module.ts b/back/nest_project/src/user/relation/friend/friend.module.ts
@@ -4,9 +4,10 @@ import { FriendEntity } from "./friend.entity";
 import { FriendService } from "./friend.service";
 import { FriendController } from "./friend.controller";
 import { JwtStrategy } from "src/auth_strategies/jwt.strategy";
+import { UserModule } from "src/user/user.module";
 
 @Module({
-	imports: [TypeOrmModule.forFeature([FriendEntity])],
+	imports: [TypeOrmModule.forFeature([FriendEntity]), UserModule],
 	controllers: [FriendController],
 	providers: [FriendService, JwtStrategy], //  seulement ces fonctions ont accès à la table Friend
 	exports: [FriendService],

diff --git a/back/nest_project/src/user/relation/friend/friend.service.ts b/back/nest_project/src/user/relation/friend/friend.service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { Inject, Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { UserEntity } from "src/user/user.entity";
 import { UserService } from "src/user/user.service";
@@ -10,6 +10,7 @@ export class FriendService {
 	constructor (
 		@InjectRepository(FriendEntity)
 		private readonly friendRepository: Repository<FriendEntity>,
+		@Inject(UserService)
 		private readonly userService: UserService,
 	) {}
 

diff --git a/front/package-lock.json b/front/package-lock.json
diff --git a/front/package.json b/front/package.json
diff --git a/front/react_project/src/components/ChatModule/ChatSidebar.tsx b/front/react_project/src/components/ChatModule/ChatSidebar.tsx
@@ -212,7 +212,7 @@ export function Header(props: {dest: IDest}) {
             : <FontAwesomeIcon className="iconChannels" icon={faUser} /> }
                 {props.dest.name}
             </h1>
-            {props.dest.name !== "general" && <button onClick={onClickSidebar}><FontAwesomeIcon icon={faEllipsisVertical} /></button>}
+            {props.dest.name !== "general" && <button onClick={onClickSidebar}><FontAwesomeIcon className="iconChannels" icon={faEllipsisVertical} /></button>}
         </div>
     )
 }