diff --git a/packages/backend/src/infrastructure/express/router/user.routes.ts b/packages/backend/src/infrastructure/express/router/user.routes.ts index 25327398..d5fc2f46 100644 --- a/packages/backend/src/infrastructure/express/router/user.routes.ts +++ b/packages/backend/src/infrastructure/express/router/user.routes.ts @@ -15,7 +15,7 @@ export class UserRoutes extends CommonRoutesConfig { this.app .route(`${apiVersionPrefix}/users`) .get((req, res) => userController.getAll(req, res)) - .post((req, res) => userController.create(req, res)) + .post((req, res) => userController.createUser(req, res)) this.app .route(`${apiVersionPrefix}/users/:userId`) diff --git a/packages/backend/src/modules/user/user.controller.ts b/packages/backend/src/modules/user/user.controller.ts index f5a3220a..1da1d89b 100644 --- a/packages/backend/src/modules/user/user.controller.ts +++ b/packages/backend/src/modules/user/user.controller.ts @@ -23,7 +23,7 @@ export class UserController { this._service = service } - async create(req: express.Request, res: express.Response) { + async createUser(req: express.Request, res: express.Response) { try { const createUserCommand: CreateUserCommand = req.body const createdUser: User = await this._service.create(createUserCommand) diff --git a/packages/backend/src/modules/user/user.repository.ts b/packages/backend/src/modules/user/user.repository.ts index 34a83566..f4fd6640 100644 --- a/packages/backend/src/modules/user/user.repository.ts +++ b/packages/backend/src/modules/user/user.repository.ts @@ -21,7 +21,7 @@ export class UserRepository { this._mapper = mapper } - async create(command: CreateUserCommand): Promise { + async createUser(command: CreateUserCommand): Promise { try { const newUser: UserDocument = await this._model.create(command) return this._mapper.mapToDomain(newUser) diff --git a/packages/backend/src/modules/user/user.service.ts b/packages/backend/src/modules/user/user.service.ts index 3845b17f..e89e5d06 100644 --- a/packages/backend/src/modules/user/user.service.ts +++ b/packages/backend/src/modules/user/user.service.ts @@ -11,7 +11,7 @@ export class UserService { } async create(dto: CreateUserCommand): Promise { - return this._repository.create(dto) + return this._repository.createUser(dto) } async updateOneById(id: string, dto: UpdateUserCommand): Promise { diff --git a/packages/frontend/src/components/Comment/Comment.tsx b/packages/frontend/src/components/Comment/Comment.tsx index e75e55fe..e95e4564 100644 --- a/packages/frontend/src/components/Comment/Comment.tsx +++ b/packages/frontend/src/components/Comment/Comment.tsx @@ -27,7 +27,7 @@ const Comment = ({ return (
- +
{userData.username}
diff --git a/packages/frontend/src/components/DashboardDrawer/DashboardDrawer.tsx b/packages/frontend/src/components/DashboardDrawer/DashboardDrawer.tsx index db62071d..d4c651e2 100644 --- a/packages/frontend/src/components/DashboardDrawer/DashboardDrawer.tsx +++ b/packages/frontend/src/components/DashboardDrawer/DashboardDrawer.tsx @@ -1,5 +1,6 @@ import { Drawer, Divider, Text, ScrollArea } from '@mantine/core' import { FaUser } from 'react-icons/fa' +import { UserDTO } from 'shared' // Components import Description from '../Description/Description' @@ -9,7 +10,7 @@ import MembersList from '../MembersList/MembersList' import convertDate from '../../utils/convertDate' // Misc -import UserType from '../../types/user' + import useStyles from './style' import UserIcon from '../UserIcon/UserIcon' @@ -17,7 +18,7 @@ type DashboardDrawerProps = { title: string description: string creationDate: Date - membersList: UserType[] + membersList: UserDTO[] isAdmin: boolean isOpen: boolean setIsOpen: () => void @@ -37,7 +38,10 @@ const DashboardDrawer = ({ onUserRemoveHandler }: DashboardDrawerProps) => { const { classes } = useStyles() - const dashboardAuthor = membersList.filter((member) => member.role === 'Admin')[0] + // We have no roles for user + + // const dashboardAuthor = membersList.filter((member) => member.role === 'Admin')[0] + const parsedDate = convertDate(creationDate) return ( @@ -58,6 +62,9 @@ const DashboardDrawer = ({
+ {/* + // We have no roles for user + {dashboardAuthor.username}

{`on ${parsedDate}`}

-
+
*/} void } @@ -53,7 +53,7 @@ const MemberCardContainer = ({ membersList, addUserHandler }: MemberCardContaine } />
- {usersSearchResult.slice(0, 4).map(({ username, profilePictureURL, id }) => ( + {usersSearchResult.slice(0, 4).map(({ username, avatarUrl, id }) => ( handleMemberClick(id)} > - + {username} diff --git a/packages/frontend/src/components/MembersList/MembersList.tsx b/packages/frontend/src/components/MembersList/MembersList.tsx index cf9b8529..8499575c 100644 --- a/packages/frontend/src/components/MembersList/MembersList.tsx +++ b/packages/frontend/src/components/MembersList/MembersList.tsx @@ -1,13 +1,13 @@ import { Text } from '@mantine/core' import { HiUsers } from 'react-icons/hi' +import { UserDTO } from 'shared' import UserIcon from '../UserIcon/UserIcon' import RedButton from '../RedButton/RedButton' -import UserType from '../../types/user' import useStyles from './style' type MembersListProps = { title?: string - membersList: UserType[] + membersList: UserDTO[] onDeleteHandler: (id: string) => void isDeletable?: boolean } @@ -15,15 +15,16 @@ type MembersListProps = { const MembersList = ({ membersList, onDeleteHandler, isDeletable, title }: MembersListProps) => { const { classes } = useStyles() - const getRemoveButton = (role: string | undefined, id: string) => { - if (isDeletable) { - if (role === 'Admin') { - return Admin - } - return onDeleteHandler(id)}>Remove - } - return undefined - } + // No roles in users + // const getRemoveButton = (id: string) => { + // if (isDeletable) { + // if (role === 'Admin') { + // return Admin + // } + // return onDeleteHandler(id)}>Remove + // } + // return undefined + // } return (
@@ -32,11 +33,13 @@ const MembersList = ({ membersList, onDeleteHandler, isDeletable, title }: Membe {title || 'Members'}
- {membersList.map(({ username, id, profilePictureURL, role }) => ( + {membersList.map(({ username, id, avatarUrl, email }) => (
- + {username} - {getRemoveButton(role, id)} + {/* + No roles in users + {getRemoveButton(id)} */}
))}
diff --git a/packages/frontend/src/components/Navbar/Navbar.tsx b/packages/frontend/src/components/Navbar/Navbar.tsx index fe202a89..61260936 100644 --- a/packages/frontend/src/components/Navbar/Navbar.tsx +++ b/packages/frontend/src/components/Navbar/Navbar.tsx @@ -1,24 +1,27 @@ /* eslint-disable @typescript-eslint/no-empty-function */ /* eslint-disable arrow-body-style */ import { Select } from '@mantine/core' +import { UserDTO } from 'shared' import { AiFillCaretDown } from 'react-icons/ai' import { IoApps } from 'react-icons/io5' import { useNavigate } from 'react-router-dom' -import UserType from '../../types/user' import { routes } from '../../routes/RoutesDashboards' import GrayButtonFilled from '../GrayButtonFilled/GrayButtonFilled' import useStyles from './styles' import thulloLogo from '../../images/thullo_logo.png' import LoginGoogleButton from '../LoginGoogleButton/LoginGoogleButton' -export type NavbarProps = { - loggedUser: UserType - boardTitle?: string -} +export type NavbarProps = { username: any; boardTitle?: string } -const Navbar = ({ boardTitle, loggedUser }: NavbarProps) => { +const Navbar = ({ boardTitle, username }: NavbarProps) => { const { classes } = useStyles() const navigate = useNavigate() + const token = localStorage.getItem('token') + + const logout = () => { + localStorage.removeItem('token') + navigate('/') + } return (