diff --git a/components/Application/Application.tsx b/components/Application/Application.tsx index 23dd4d9..209600a 100644 --- a/components/Application/Application.tsx +++ b/components/Application/Application.tsx @@ -171,7 +171,7 @@ export const Application: React.FC = (props) => { visible={visibleSidebars.left} isMobile={isMobile} > -
+
void +} + +export const ConfirmGuildJoin: React.FC = (props) => { + const { className, handleJoinGuild } = props + + return ( +
+ Joing Guild Illustration +
+

Rejoindre la guild ?

+
+ + +
+
+
+ ) +} diff --git a/components/Application/ConfirmGuildJoin/index.ts b/components/Application/ConfirmGuildJoin/index.ts new file mode 100644 index 0000000..bd4a659 --- /dev/null +++ b/components/Application/ConfirmGuildJoin/index.ts @@ -0,0 +1 @@ +export * from './ConfirmGuildJoin' diff --git a/components/Application/Guilds/Guilds.tsx b/components/Application/Guilds/Guilds.tsx index 4c91131..bbc87bd 100644 --- a/components/Application/Guilds/Guilds.tsx +++ b/components/Application/Guilds/Guilds.tsx @@ -17,7 +17,7 @@ export const Guilds: React.FC = (props) => { return (
= (arguments_) => { - return -} -GuildPublic.args = { - guild: { - ...guildExample, - membersCount: 1 - } -} diff --git a/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.test.tsx b/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.test.tsx deleted file mode 100644 index 0bcf3b3..0000000 --- a/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.test.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { render } from '@testing-library/react' - -import { GuildPublic } from './GuildPublic' -import { guildExample } from '../../../../cypress/fixtures/guilds/guild' - -describe('', () => { - it('should render successfully', () => { - const { baseElement } = render( - - ) - expect(baseElement).toBeTruthy() - }) -}) diff --git a/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.tsx b/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.tsx index a949ff4..0d18472 100644 --- a/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.tsx +++ b/components/Application/JoinGuildsPublic/GuildPublic/GuildPublic.tsx @@ -1,5 +1,10 @@ +import { useState } from 'react' import Image from 'next/image' import useTranslation from 'next-translate/useTranslation' +import classNames from 'classnames' + +import { Emoji } from 'components/Emoji' +import { ConfirmGuildJoin } from 'components/Application/ConfirmGuildJoin' import { GuildPublic as GuildPublicType } from '../../../../models/Guild' @@ -9,27 +14,59 @@ export interface GuildPublicProps { export const GuildPublic: React.FC = (props) => { const { guild } = props + const [isConfirmed, setIsConfirmed] = useState(false) const { t } = useTranslation() return ( -
- logo -
-

- {guild.name} -

-

{guild.description}

+
+
setIsConfirmed(!isConfirmed)} + > + logo +
+

+ {guild.name} +

+

+ {guild.description != null ? ( + guild.description + ) : ( + + + Nothing's here... + + )} +

+
+

+ {guild.membersCount} {t('application:members')} +

-

- {guild.membersCount} {t('application:members')} -

+ setIsConfirmed(!isConfirmed)} + />
) } diff --git a/components/Application/JoinGuildsPublic/JoinGuildsPublic.tsx b/components/Application/JoinGuildsPublic/JoinGuildsPublic.tsx index c8d0b11..0dd0ffd 100644 --- a/components/Application/JoinGuildsPublic/JoinGuildsPublic.tsx +++ b/components/Application/JoinGuildsPublic/JoinGuildsPublic.tsx @@ -10,6 +10,7 @@ import { usePagination } from '../../../hooks/usePagination' export const JoinGuildsPublic: React.FC = () => { const [search, setSearch] = useState('') + const { authentication } = useAuthentication() const { t } = useTranslation() @@ -29,7 +30,7 @@ export const JoinGuildsPublic: React.FC = () => { } return ( - <> +
{ name='search-guild' placeholder={`🔎 ${t('application:search')}...`} /> -
+
{ })}
- +
) } diff --git a/components/Application/Members/Member/Member.tsx b/components/Application/Members/Member/Member.tsx index cb34b86..888e1a1 100644 --- a/components/Application/Members/Member/Member.tsx +++ b/components/Application/Members/Member/Member.tsx @@ -14,7 +14,7 @@ export const Member: React.FC = (props) => { return ( -
+
= (props) => { className='rounded-full' />
-
-

+

+

{member.user.name}

- {member.user.status != null && {member.user.status}} + {member.user.status != null && ( + {member.user.status} + )}
diff --git a/components/Application/Sidebar/Sidebar.tsx b/components/Application/Sidebar/Sidebar.tsx index 02cfe51..e4c972d 100644 --- a/components/Application/Sidebar/Sidebar.tsx +++ b/components/Application/Sidebar/Sidebar.tsx @@ -21,7 +21,7 @@ export const Sidebar: React.FC = (props) => { { 'top-0 right-0 scrollbar-firefox-support overflow-y-auto flex-col space-y-1': direction === 'right', - 'w-64': direction === 'right' && visible, + 'w-72': direction === 'right' && visible, 'w-0 opacity-0': !visible, 'w-80': direction === 'left' && visible, 'max-w-max': typeof path !== 'string' && direction === 'left', diff --git a/components/Application/UserProfile/UserProfile.tsx b/components/Application/UserProfile/UserProfile.tsx index f176be7..0c8f515 100644 --- a/components/Application/UserProfile/UserProfile.tsx +++ b/components/Application/UserProfile/UserProfile.tsx @@ -9,6 +9,7 @@ import { API_URL } from '../../../tools/api' import { UserPublic } from '../../../models/User' import { UserProfileGuilds } from './UserProfileGuilds' import { UserProfileGuild } from './UserProfileGuilds/UserProfileGuild' +import { ConfirmGuildJoin } from '../ConfirmGuildJoin' export interface UserProfileProps { className?: string @@ -137,36 +138,13 @@ export const UserProfile: React.FC = (props) => { />
-
- Joing Guild Illustration -
-

Rejoindre la guild ?

-
- - -
-
-
+ handleJoinGuild={handleConfirmationState} + />