Merge pull request #257 from boostcampwm-2021/chore/x

Chore/x
boostcampwm-2021 · Dec 26, 2021 · c525be1 · c525be1
2 parents c19e626 + a0bf017
commit c525be1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/backend/src/controllers/team-contorller.ts b/backend/src/controllers/team-contorller.ts
@@ -56,7 +56,7 @@ const TeamController = {
 		try {
 			const teamRepository = getCustomRepository(TeamRepository);
 			const team = await teamRepository.read(req.params.teamId);
-			res.status(200).send(team[0]);
+			res.status(200).send(team);
 		} catch (err) {
 			res.sendStatus(409);
 		}

diff --git a/backend/src/repositories/team-repository.ts b/backend/src/repositories/team-repository.ts
@@ -13,14 +13,12 @@ export default class TeamRepository extends AbstractRepository<Team> {
 		return insertResult.raw.insertId;
 	}
 
-	async read(team_id: number) {
-		console.log(team_id);
+	async read(teamId: number) {
 		const result = await this.repository
 			.createQueryBuilder('team')
 			.select()
-			.where(`team_id = :team_id`, { team_id })
-			.execute();
-		console.log(result);
+			.where(`team_id=:id`, { id: teamId })
+			.getOne();
 		return result;
 	}
 

diff --git a/frontend/src/components/Board/Postit/index.tsx b/frontend/src/components/Board/Postit/index.tsx
@@ -75,7 +75,7 @@ const Footer = ({ createdBy, createdAt, updatedBy, updatedAt }: { [key: string]:
 				fontSize={FONT_SIZE.small}
 				width={POSTIT.WIDTH - 0.5 * PADDING}
 				height={FONT_SIZE.small}
-				y={FONT_SIZE.small}
+				y={FONT_SIZE.small + 0.25 * FONT_SIZE.small}
 				fill={ColorCode.GRAY}
 				wrap='none'
 				align='right'

diff --git a/frontend/src/components/Users/UsersHeader/index.tsx b/frontend/src/components/Users/UsersHeader/index.tsx
@@ -12,8 +12,8 @@ const UsersHeader: React.FC<Props> = ({ teamId }) => {
 	const teamInfo = useRecoilValue(teamInfoSelector(teamId));
 	return (
 		<UserHeaderContainer>
-			<Thumbnail team_id={teamInfo?.team_id} team_name={teamInfo?.team_name} />
-			<TeamName>{teamInfo?.team_name}</TeamName>
+			<Thumbnail team_id={teamInfo.team_id} team_name={teamInfo.team_name} />
+			<TeamName>{teamInfo.team_name}</TeamName>
 		</UserHeaderContainer>
 	);
 };

diff --git a/frontend/src/pages/BoardPage/index.tsx b/frontend/src/pages/BoardPage/index.tsx
@@ -30,7 +30,7 @@ const BoardPage: React.FC<Props> = ({ match }) => {
 	const teamId = Number(match.params.teamId);
 	const teamUserList = useRecoilValue(teamUsersSelector(teamId));
 	const getUserNameById = (userId: number) =>
-		Object.values(teamUserList).find((user) => Number(user.userId) === Number(userId))?.name ?? '';
+		Object.values(teamUserList).find((user) => Number(user.userId) === Number(userId))?.name ?? '알 수 없음';
 
 	const socket = useContext(SocketContext).current;
 

diff --git a/frontend/src/templates/UsersTemplate/style.ts b/frontend/src/templates/UsersTemplate/style.ts
@@ -7,4 +7,8 @@ export const ContentContainer = styled.div`
 	background-color: ${ColorCode.BACKGROUND2};
 	overflow-y: scroll;
 	min-width: 40rem;
+
+	::-webkit-scrollbar {
+		display: none;
+	}
 `;