diff --git a/src/frontend/apps/desk/src/features/addMembers/api/index.ts b/src/frontend/apps/desk/src/features/teams/member-add/api/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/addMembers/api/index.ts rename to src/frontend/apps/desk/src/features/teams/member-add/api/index.ts diff --git a/src/frontend/apps/desk/src/features/addMembers/api/useCreateInvitation.tsx b/src/frontend/apps/desk/src/features/teams/member-add/api/useCreateInvitation.tsx similarity index 87% rename from src/frontend/apps/desk/src/features/addMembers/api/useCreateInvitation.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/api/useCreateInvitation.tsx index 6e3b8bc..ae13bd8 100644 --- a/src/frontend/apps/desk/src/features/addMembers/api/useCreateInvitation.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/api/useCreateInvitation.tsx @@ -2,10 +2,9 @@ import { useMutation } from '@tanstack/react-query'; import { APIError, errorCauses, fetchAPI } from '@/api'; import { User } from '@/core/auth'; -import { Invitation } from '@/features/members'; -import { Role, Team } from '@/features/teams'; +import { Role, Team } from '@/features/teams/team-management'; -import { OptionType } from '../types'; +import { Invitation, OptionType } from '../types'; interface CreateInvitationParams { email: User['email']; diff --git a/src/frontend/apps/desk/src/features/addMembers/api/useCreateTeamAccess.tsx b/src/frontend/apps/desk/src/features/teams/member-add/api/useCreateTeamAccess.tsx similarity index 87% rename from src/frontend/apps/desk/src/features/addMembers/api/useCreateTeamAccess.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/api/useCreateTeamAccess.tsx index 08f8e91..a50ef05 100644 --- a/src/frontend/apps/desk/src/features/addMembers/api/useCreateTeamAccess.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/api/useCreateTeamAccess.tsx @@ -2,8 +2,16 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'; import { APIError, errorCauses, fetchAPI } from '@/api'; import { User } from '@/core/auth'; -import { Access, KEY_LIST_TEAM_ACCESSES } from '@/features/members'; -import { KEY_LIST_TEAM, KEY_TEAM, Role, Team } from '@/features/teams'; +import { + Access, + KEY_LIST_TEAM_ACCESSES, +} from '@/features/teams/member-management'; +import { + KEY_LIST_TEAM, + KEY_TEAM, + Role, + Team, +} from '@/features/teams/team-management'; import { OptionType } from '../types'; diff --git a/src/frontend/apps/desk/src/features/addMembers/api/useUsers.tsx b/src/frontend/apps/desk/src/features/teams/member-add/api/useUsers.tsx similarity index 95% rename from src/frontend/apps/desk/src/features/addMembers/api/useUsers.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/api/useUsers.tsx index d5af57d..dc64125 100644 --- a/src/frontend/apps/desk/src/features/addMembers/api/useUsers.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/api/useUsers.tsx @@ -2,7 +2,7 @@ import { UseQueryOptions, useQuery } from '@tanstack/react-query'; import { APIError, APIList, errorCauses, fetchAPI } from '@/api'; import { User } from '@/core/auth'; -import { Team } from '@/features/teams'; +import { Team } from '@/features/teams/team-management'; export type UsersParams = { query: string; diff --git a/src/frontend/apps/desk/src/features/addMembers/assets/add-member.svg b/src/frontend/apps/desk/src/features/teams/member-add/assets/add-member.svg similarity index 100% rename from src/frontend/apps/desk/src/features/addMembers/assets/add-member.svg rename to src/frontend/apps/desk/src/features/teams/member-add/assets/add-member.svg diff --git a/src/frontend/apps/desk/src/features/addMembers/components/ModalAddMembers.tsx b/src/frontend/apps/desk/src/features/teams/member-add/components/ModalAddMembers.tsx similarity index 97% rename from src/frontend/apps/desk/src/features/addMembers/components/ModalAddMembers.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/components/ModalAddMembers.tsx index e0ed942..962e59b 100644 --- a/src/frontend/apps/desk/src/features/addMembers/components/ModalAddMembers.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/components/ModalAddMembers.tsx @@ -12,8 +12,8 @@ import { createGlobalStyle } from 'styled-components'; import { APIError } from '@/api'; import { Box, Text } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import { ChooseRole } from '@/features/members'; -import { Role, Team } from '@/features/teams'; +import { ChooseRole } from '@/features/teams/member-management'; +import { Role, Team } from '@/features/teams/team-management'; import { useCreateInvitation, useCreateTeamAccess } from '../api'; import IconAddMember from '../assets/add-member.svg'; diff --git a/src/frontend/apps/desk/src/features/addMembers/components/SearchMembers.tsx b/src/frontend/apps/desk/src/features/teams/member-add/components/SearchMembers.tsx similarity index 98% rename from src/frontend/apps/desk/src/features/addMembers/components/SearchMembers.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/components/SearchMembers.tsx index c5d2082..cf8db43 100644 --- a/src/frontend/apps/desk/src/features/addMembers/components/SearchMembers.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/components/SearchMembers.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next'; import { Options } from 'react-select'; import AsyncSelect from 'react-select/async'; -import { Team } from '@/features/teams'; +import { Team } from '@/features/teams/team-management'; import { isValidEmail } from '@/utils'; import { KEY_LIST_USER, useUsers } from '../api/useUsers'; diff --git a/src/frontend/apps/desk/src/features/addMembers/index.ts b/src/frontend/apps/desk/src/features/teams/member-add/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/addMembers/index.ts rename to src/frontend/apps/desk/src/features/teams/member-add/index.ts diff --git a/src/frontend/apps/desk/src/features/addMembers/types.tsx b/src/frontend/apps/desk/src/features/teams/member-add/types.tsx similarity index 70% rename from src/frontend/apps/desk/src/features/addMembers/types.tsx rename to src/frontend/apps/desk/src/features/teams/member-add/types.tsx index d33c83c..740c241 100644 --- a/src/frontend/apps/desk/src/features/addMembers/types.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-add/types.tsx @@ -1,5 +1,7 @@ import { User } from '@/core/auth'; +import { Role, Team } from '../team-management'; + export enum OptionType { INVITATION = 'invitation', NEW_MEMBER = 'new_member', @@ -24,3 +26,13 @@ export interface OptionNewMember { } export type OptionSelect = OptionNewMember | OptionInvitation; + +export interface Invitation { + id: string; + created_at: string; + email: string; + team: Team['id']; + role: Role; + issuer: User['id']; + is_expired: boolean; +} diff --git a/src/frontend/apps/desk/src/features/members/__tests__/MemberAction.test.tsx b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberAction.test.tsx similarity index 96% rename from src/frontend/apps/desk/src/features/members/__tests__/MemberAction.test.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberAction.test.tsx index 8fad355..e5758d5 100644 --- a/src/frontend/apps/desk/src/features/members/__tests__/MemberAction.test.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberAction.test.tsx @@ -2,7 +2,7 @@ import '@testing-library/jest-dom'; import { render, screen } from '@testing-library/react'; import fetchMock from 'fetch-mock'; -import { Role, Team } from '@/features/teams'; +import { Role, Team } from '@/features/teams/team-management'; import { AppWrapper } from '@/tests/utils'; import { MemberAction } from '../components/MemberAction'; diff --git a/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx similarity index 99% rename from src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx index 8c001a3..5fa93bd 100644 --- a/src/frontend/apps/desk/src/features/members/__tests__/MemberGrid.test.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx @@ -3,7 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import fetchMock from 'fetch-mock'; -import { Role, Team } from '@/features/teams'; +import { Role, Team } from '@/features/teams/team-management'; import { AppWrapper } from '@/tests/utils'; import { MemberGrid } from '../components/MemberGrid'; diff --git a/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/ModalRole.test.tsx similarity index 99% rename from src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/__tests__/ModalRole.test.tsx index 24316a0..de89951 100644 --- a/src/frontend/apps/desk/src/features/members/__tests__/ModalRole.test.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/ModalRole.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import fetchMock from 'fetch-mock'; import { useAuthStore } from '@/core/auth'; -import { Role } from '@/features/teams'; +import { Role } from '@/features/teams/team-management'; import { AppWrapper } from '@/tests/utils'; import { ModalRole } from '../components/ModalRole'; diff --git a/src/frontend/apps/desk/src/features/members/api/index.ts b/src/frontend/apps/desk/src/features/teams/member-management/api/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/members/api/index.ts rename to src/frontend/apps/desk/src/features/teams/member-management/api/index.ts diff --git a/src/frontend/apps/desk/src/features/members/api/useDeleteTeamAccess.ts b/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts similarity index 95% rename from src/frontend/apps/desk/src/features/members/api/useDeleteTeamAccess.ts rename to src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts index 0a81cfb..16870a8 100644 --- a/src/frontend/apps/desk/src/features/members/api/useDeleteTeamAccess.ts +++ b/src/frontend/apps/desk/src/features/teams/member-management/api/useDeleteTeamAccess.ts @@ -5,7 +5,7 @@ import { } from '@tanstack/react-query'; import { APIError, errorCauses, fetchAPI } from '@/api'; -import { KEY_LIST_TEAM, KEY_TEAM } from '@/features/teams/'; +import { KEY_LIST_TEAM, KEY_TEAM } from '@/features/teams/team-management'; import { KEY_LIST_TEAM_ACCESSES } from './useTeamsAccesses'; diff --git a/src/frontend/apps/desk/src/features/members/api/useTeamsAccesses.tsx b/src/frontend/apps/desk/src/features/teams/member-management/api/useTeamsAccesses.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/members/api/useTeamsAccesses.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/api/useTeamsAccesses.tsx diff --git a/src/frontend/apps/desk/src/features/members/api/useUpdateTeamAccess.ts b/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts similarity index 96% rename from src/frontend/apps/desk/src/features/members/api/useUpdateTeamAccess.ts rename to src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts index 1c501fd..7b86e3c 100644 --- a/src/frontend/apps/desk/src/features/members/api/useUpdateTeamAccess.ts +++ b/src/frontend/apps/desk/src/features/teams/member-management/api/useUpdateTeamAccess.ts @@ -5,7 +5,7 @@ import { } from '@tanstack/react-query'; import { APIError, errorCauses, fetchAPI } from '@/api'; -import { KEY_TEAM, Role } from '@/features/teams/'; +import { KEY_TEAM, Role } from '@/features/teams/team-management'; import { Access } from '../types'; diff --git a/src/frontend/apps/desk/src/features/members/assets/icon-remove-member.svg b/src/frontend/apps/desk/src/features/teams/member-management/assets/icon-remove-member.svg similarity index 100% rename from src/frontend/apps/desk/src/features/members/assets/icon-remove-member.svg rename to src/frontend/apps/desk/src/features/teams/member-management/assets/icon-remove-member.svg diff --git a/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/ChooseRole.tsx similarity index 95% rename from src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/components/ChooseRole.tsx index c574cbc..6ae7658 100644 --- a/src/frontend/apps/desk/src/features/members/components/ChooseRole.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/ChooseRole.tsx @@ -1,7 +1,7 @@ import { Radio, RadioGroup } from '@openfun/cunningham-react'; import { useTranslation } from 'react-i18next'; -import { Role } from '@/features/teams'; +import { Role } from '@/features/teams/team-management'; interface ChooseRoleProps { currentRole: Role; diff --git a/src/frontend/apps/desk/src/features/members/components/MemberAction.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx similarity index 97% rename from src/frontend/apps/desk/src/features/members/components/MemberAction.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx index 04103f9..1fe3da6 100644 --- a/src/frontend/apps/desk/src/features/members/components/MemberAction.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberAction.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Box, DropButton, IconOptions, Text } from '@/components'; -import { Role, Team } from '@/features/teams'; +import { Role, Team } from '@/features/teams/team-management'; import { Access } from '../types'; diff --git a/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx similarity index 96% rename from src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx index fe0f364..3f44dc1 100644 --- a/src/frontend/apps/desk/src/features/members/components/MemberGrid.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx @@ -10,10 +10,10 @@ import { useTranslation } from 'react-i18next'; import IconUser from '@/assets/icons/icon-user.svg'; import { Box, Card, TextErrors } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import { ModalAddMembers } from '@/features/addMembers'; -import { Role, Team } from '@/features/teams'; +import { ModalAddMembers } from '@/features/teams/member-add'; +import { Role, Team } from '@/features/teams/team-management'; -import { useTeamAccesses } from '../api/'; +import { useTeamAccesses } from '../api'; import { PAGE_SIZE } from '../conf'; import { MemberAction } from './MemberAction'; diff --git a/src/frontend/apps/desk/src/features/members/components/ModalDelete.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx similarity index 98% rename from src/frontend/apps/desk/src/features/members/components/ModalDelete.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx index 1acf4f1..56eb0e4 100644 --- a/src/frontend/apps/desk/src/features/members/components/ModalDelete.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalDelete.tsx @@ -11,7 +11,7 @@ import { useRouter } from 'next/navigation'; import IconUser from '@/assets/icons/icon-user.svg'; import { Box, Text, TextErrors } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import { Role, Team } from '@/features/teams/'; +import { Role, Team } from '@/features/teams/team-management'; import { useDeleteTeamAccess } from '../api/useDeleteTeamAccess'; import { useWhoAmI } from '../hooks/useWhoAmI'; diff --git a/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalRole.tsx similarity index 98% rename from src/frontend/apps/desk/src/features/members/components/ModalRole.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/components/ModalRole.tsx index 203aa9d..e7729d7 100644 --- a/src/frontend/apps/desk/src/features/members/components/ModalRole.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/ModalRole.tsx @@ -9,7 +9,7 @@ import { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Box, Text, TextErrors } from '@/components'; -import { Role } from '@/features/teams'; +import { Role } from '@/features/teams/team-management'; import { useUpdateTeamAccess } from '../api/useUpdateTeamAccess'; import { useWhoAmI } from '../hooks/useWhoAmI'; diff --git a/src/frontend/apps/desk/src/features/members/conf.ts b/src/frontend/apps/desk/src/features/teams/member-management/conf.ts similarity index 100% rename from src/frontend/apps/desk/src/features/members/conf.ts rename to src/frontend/apps/desk/src/features/teams/member-management/conf.ts diff --git a/src/frontend/apps/desk/src/features/members/hooks/useWhoAmI.tsx b/src/frontend/apps/desk/src/features/teams/member-management/hooks/useWhoAmI.tsx similarity index 90% rename from src/frontend/apps/desk/src/features/members/hooks/useWhoAmI.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/hooks/useWhoAmI.tsx index 79eb506..cc13e68 100644 --- a/src/frontend/apps/desk/src/features/members/hooks/useWhoAmI.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/hooks/useWhoAmI.tsx @@ -1,5 +1,5 @@ import { useAuthStore } from '@/core/auth'; -import { Role } from '@/features/teams'; +import { Role } from '@/features/teams/team-management'; import { Access } from '../types'; diff --git a/src/frontend/apps/desk/src/features/members/index.ts b/src/frontend/apps/desk/src/features/teams/member-management/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/members/index.ts rename to src/frontend/apps/desk/src/features/teams/member-management/index.ts diff --git a/src/frontend/apps/desk/src/features/members/types.tsx b/src/frontend/apps/desk/src/features/teams/member-management/types.tsx similarity index 51% rename from src/frontend/apps/desk/src/features/members/types.tsx rename to src/frontend/apps/desk/src/features/teams/member-management/types.tsx index e8e858d..75cc2b8 100644 --- a/src/frontend/apps/desk/src/features/members/types.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/types.tsx @@ -1,5 +1,5 @@ import { User } from '@/core/auth'; -import { Role, Team } from '@/features/teams/'; +import { Role } from '@/features/teams/team-management'; export interface Access { id: string; @@ -13,13 +13,3 @@ export interface Access { set_role_to: Role[]; }; } - -export interface Invitation { - id: string; - created_at: string; - email: string; - team: Team['id']; - role: Role; - issuer: User['id']; - is_expired: boolean; -} diff --git a/src/frontend/apps/desk/src/features/teams/api/index.ts b/src/frontend/apps/desk/src/features/teams/team-management/api/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/index.ts rename to src/frontend/apps/desk/src/features/teams/team-management/api/index.ts diff --git a/src/frontend/apps/desk/src/features/teams/api/useCreateTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useCreateTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/useCreateTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/api/useCreateTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/api/useRemoveTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/useRemoveTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/api/useRemoveTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/api/useTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/useTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/api/useTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/api/useTeams.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/useTeams.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx diff --git a/src/frontend/apps/desk/src/features/teams/api/useUpdateTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useUpdateTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/api/useUpdateTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/api/useUpdateTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-edit.svg b/src/frontend/apps/desk/src/features/teams/team-management/assets/icon-edit.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-edit.svg rename to src/frontend/apps/desk/src/features/teams/team-management/assets/icon-edit.svg diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-trash.svg b/src/frontend/apps/desk/src/features/teams/team-management/assets/icon-trash.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-trash.svg rename to src/frontend/apps/desk/src/features/teams/team-management/assets/icon-trash.svg diff --git a/src/frontend/apps/desk/src/features/teams/components/CardCreateTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/CardCreateTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/CardCreateTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/InputTeamName.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/InputTeamName.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/InputTeamName.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/ModalRemoveTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/ModalRemoveTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/ModalRemoveTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/ModalUpdateTeam.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/ModalUpdateTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/ModalUpdateTeam.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/ModalUpdateTeam.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/TeamActions.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/TeamActions.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/TeamActions.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx similarity index 100% rename from src/frontend/apps/desk/src/features/teams/components/TeamInfo.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/TeamInfo.tsx diff --git a/src/frontend/apps/desk/src/features/teams/components/TeamLayout.tsx b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamLayout.tsx similarity index 91% rename from src/frontend/apps/desk/src/features/teams/components/TeamLayout.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/components/TeamLayout.tsx index ec81822..96b86a0 100644 --- a/src/frontend/apps/desk/src/features/teams/components/TeamLayout.tsx +++ b/src/frontend/apps/desk/src/features/teams/team-management/components/TeamLayout.tsx @@ -3,7 +3,7 @@ import { PropsWithChildren } from 'react'; import { Box } from '@/components'; import { MainLayout } from '@/core'; import { useCunninghamTheme } from '@/cunningham'; -import { Panel } from '@/features/teams'; +import { Panel } from '@/features/teams/teams-panel'; export function TeamLayout({ children }: PropsWithChildren) { const { colorsTokens } = useCunninghamTheme(); diff --git a/src/frontend/apps/desk/src/features/teams/components/index.ts b/src/frontend/apps/desk/src/features/teams/team-management/components/index.ts similarity index 74% rename from src/frontend/apps/desk/src/features/teams/components/index.ts rename to src/frontend/apps/desk/src/features/teams/team-management/components/index.ts index e1efbc2..047a544 100644 --- a/src/frontend/apps/desk/src/features/teams/components/index.ts +++ b/src/frontend/apps/desk/src/features/teams/team-management/components/index.ts @@ -1,4 +1,3 @@ export * from './CardCreateTeam'; -export * from './Panel/Panel'; export * from './TeamInfo'; export * from './TeamLayout'; diff --git a/src/frontend/apps/desk/src/features/teams/index.tsx b/src/frontend/apps/desk/src/features/teams/team-management/index.tsx similarity index 75% rename from src/frontend/apps/desk/src/features/teams/index.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/index.tsx index 47fce0a..314dad0 100644 --- a/src/frontend/apps/desk/src/features/teams/index.tsx +++ b/src/frontend/apps/desk/src/features/teams/team-management/index.tsx @@ -1,4 +1,3 @@ export * from './api'; export * from './components'; export * from './types'; -export * from './store'; diff --git a/src/frontend/apps/desk/src/features/teams/types.tsx b/src/frontend/apps/desk/src/features/teams/team-management/types.tsx similarity index 84% rename from src/frontend/apps/desk/src/features/teams/types.tsx rename to src/frontend/apps/desk/src/features/teams/team-management/types.tsx index ee8ad50..e2eef97 100644 --- a/src/frontend/apps/desk/src/features/teams/types.tsx +++ b/src/frontend/apps/desk/src/features/teams/team-management/types.tsx @@ -1,4 +1,4 @@ -import { Access } from '@/features/members'; +import { Access } from '@/features/teams/member-management'; export enum Role { MEMBER = 'member', diff --git a/src/frontend/apps/desk/src/features/teams/__tests__/PanelTeams.test.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/__tests__/PanelTeams.test.tsx similarity index 97% rename from src/frontend/apps/desk/src/features/teams/__tests__/PanelTeams.test.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/__tests__/PanelTeams.test.tsx index ff8edb6..d69959c 100644 --- a/src/frontend/apps/desk/src/features/teams/__tests__/PanelTeams.test.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/__tests__/PanelTeams.test.tsx @@ -3,10 +3,10 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import fetchMock from 'fetch-mock'; -import { Panel } from '@/features/teams'; import { AppWrapper } from '@/tests/utils'; -import { TeamList } from '../components/Panel/TeamList'; +import { Panel } from '../components/Panel'; +import { TeamList } from '../components/TeamList'; window.HTMLElement.prototype.scroll = function () {}; diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-add.svg b/src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-add.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-add.svg rename to src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-add.svg diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-none.svg b/src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-none.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-none.svg rename to src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-none.svg diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-open-close.svg b/src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-open-close.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-open-close.svg rename to src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-open-close.svg diff --git a/src/frontend/apps/desk/src/features/teams/assets/icon-sort.svg b/src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-sort.svg similarity index 100% rename from src/frontend/apps/desk/src/features/teams/assets/icon-sort.svg rename to src/frontend/apps/desk/src/features/teams/teams-panel/assets/icon-sort.svg diff --git a/src/frontend/apps/desk/src/features/teams/components/Panel/Panel.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/Panel.tsx similarity index 96% rename from src/frontend/apps/desk/src/features/teams/components/Panel/Panel.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/components/Panel.tsx index 92d45b8..b0ef91e 100644 --- a/src/frontend/apps/desk/src/features/teams/components/Panel/Panel.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/Panel.tsx @@ -3,7 +3,8 @@ import { useTranslation } from 'react-i18next'; import { Box, BoxButton, Text } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import IconOpenClose from '@/features/teams/assets/icon-open-close.svg'; + +import IconOpenClose from '../assets/icon-open-close.svg'; import { PanelActions } from './PanelActions'; import { TeamList } from './TeamList'; diff --git a/src/frontend/apps/desk/src/features/teams/components/Panel/PanelActions.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx similarity index 85% rename from src/frontend/apps/desk/src/features/teams/components/Panel/PanelActions.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx index cfe16d4..e69ff0f 100644 --- a/src/frontend/apps/desk/src/features/teams/components/Panel/PanelActions.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/PanelActions.tsx @@ -3,10 +3,11 @@ import { useTranslation } from 'react-i18next'; import { Box, BoxButton, StyledLink } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import { TeamsOrdering } from '@/features/teams/api/'; -import IconAdd from '@/features/teams/assets/icon-add.svg'; -import IconSort from '@/features/teams/assets/icon-sort.svg'; -import { useTeamStore } from '@/features/teams/store/useTeamsStore'; +import { TeamsOrdering } from '@/features/teams/team-management/api'; + +import IconAdd from '../assets/icon-add.svg'; +import IconSort from '../assets/icon-sort.svg'; +import { useTeamStore } from '../store/useTeamsStore'; export const PanelActions = () => { const { t } = useTranslation(); diff --git a/src/frontend/apps/desk/src/features/teams/components/Panel/TeamItem.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx similarity index 96% rename from src/frontend/apps/desk/src/features/teams/components/Panel/TeamItem.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx index 6746914..957ce2b 100644 --- a/src/frontend/apps/desk/src/features/teams/components/Panel/TeamItem.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamItem.tsx @@ -5,8 +5,9 @@ import { useTranslation } from 'react-i18next'; import IconGroup from '@/assets/icons/icon-group.svg'; import { Box, StyledLink, Text } from '@/components'; import { useCunninghamTheme } from '@/cunningham'; -import { Team } from '@/features/teams/'; -import IconNone from '@/features/teams/assets/icon-none.svg'; +import { Team } from '@/features/teams/team-management'; + +import IconNone from '../assets/icon-none.svg'; interface TeamProps { team: Team; diff --git a/src/frontend/apps/desk/src/features/teams/components/Panel/TeamList.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamList.tsx similarity index 95% rename from src/frontend/apps/desk/src/features/teams/components/Panel/TeamList.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamList.tsx index 439609a..556296c 100644 --- a/src/frontend/apps/desk/src/features/teams/components/Panel/TeamList.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/TeamList.tsx @@ -4,7 +4,9 @@ import { useTranslation } from 'react-i18next'; import { Box, Text } from '@/components'; import { InfiniteScroll } from '@/components/InfiniteScroll'; -import { Team, useTeamStore, useTeams } from '@/features/teams/'; +import { Team, useTeams } from '@/features/teams/team-management'; + +import { useTeamStore } from '../store'; import { TeamItem } from './TeamItem'; diff --git a/src/frontend/apps/desk/src/features/teams/teams-panel/components/index.ts b/src/frontend/apps/desk/src/features/teams/teams-panel/components/index.ts new file mode 100644 index 0000000..8960d84 --- /dev/null +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/components/index.ts @@ -0,0 +1 @@ +export * from './Panel'; diff --git a/src/frontend/apps/desk/src/features/teams/teams-panel/index.ts b/src/frontend/apps/desk/src/features/teams/teams-panel/index.ts new file mode 100644 index 0000000..07635cb --- /dev/null +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/index.ts @@ -0,0 +1 @@ +export * from './components'; diff --git a/src/frontend/apps/desk/src/features/teams/store/index.ts b/src/frontend/apps/desk/src/features/teams/teams-panel/store/index.ts similarity index 100% rename from src/frontend/apps/desk/src/features/teams/store/index.ts rename to src/frontend/apps/desk/src/features/teams/teams-panel/store/index.ts diff --git a/src/frontend/apps/desk/src/features/teams/store/useTeamsStore.tsx b/src/frontend/apps/desk/src/features/teams/teams-panel/store/useTeamsStore.tsx similarity index 86% rename from src/frontend/apps/desk/src/features/teams/store/useTeamsStore.tsx rename to src/frontend/apps/desk/src/features/teams/teams-panel/store/useTeamsStore.tsx index d9a79d2..33e284f 100644 --- a/src/frontend/apps/desk/src/features/teams/store/useTeamsStore.tsx +++ b/src/frontend/apps/desk/src/features/teams/teams-panel/store/useTeamsStore.tsx @@ -1,6 +1,6 @@ import { create } from 'zustand'; -import { TeamsOrdering } from '../api/useTeams'; +import { TeamsOrdering } from '@/features/teams/team-management/api'; interface TeamsStore { ordering: TeamsOrdering; diff --git a/src/frontend/apps/desk/src/pages/index.tsx b/src/frontend/apps/desk/src/pages/index.tsx index bcccdb2..e0071c8 100644 --- a/src/frontend/apps/desk/src/pages/index.tsx +++ b/src/frontend/apps/desk/src/pages/index.tsx @@ -1,6 +1,6 @@ import type { ReactElement } from 'react'; -import { TeamLayout } from '@/features/teams/'; +import { TeamLayout } from '@/features/teams/team-management'; import { NextPageWithLayout } from '@/types/next'; import Teams from './teams/'; diff --git a/src/frontend/apps/desk/src/pages/teams/[id].tsx b/src/frontend/apps/desk/src/pages/teams/[id].tsx index 902b313..3a3f812 100644 --- a/src/frontend/apps/desk/src/pages/teams/[id].tsx +++ b/src/frontend/apps/desk/src/pages/teams/[id].tsx @@ -5,8 +5,13 @@ import { ReactElement } from 'react'; import { Box } from '@/components'; import { TextErrors } from '@/components/TextErrors'; -import { MemberGrid } from '@/features/members'; -import { Role, TeamInfo, TeamLayout, useTeam } from '@/features/teams/'; +import { MemberGrid } from '@/features/teams/member-management'; +import { + Role, + TeamInfo, + TeamLayout, + useTeam, +} from '@/features/teams/team-management'; import { NextPageWithLayout } from '@/types/next'; const Page: NextPageWithLayout = () => { diff --git a/src/frontend/apps/desk/src/pages/teams/create.tsx b/src/frontend/apps/desk/src/pages/teams/create.tsx index 84d60ed..66ab731 100644 --- a/src/frontend/apps/desk/src/pages/teams/create.tsx +++ b/src/frontend/apps/desk/src/pages/teams/create.tsx @@ -1,7 +1,7 @@ import { ReactElement } from 'react'; import { Box } from '@/components'; -import { CardCreateTeam, TeamLayout } from '@/features/teams/'; +import { CardCreateTeam, TeamLayout } from '@/features/teams/team-management'; import { NextPageWithLayout } from '@/types/next'; const Page: NextPageWithLayout = () => { diff --git a/src/frontend/apps/desk/src/pages/teams/index.tsx b/src/frontend/apps/desk/src/pages/teams/index.tsx index 78583aa..05c1eb4 100644 --- a/src/frontend/apps/desk/src/pages/teams/index.tsx +++ b/src/frontend/apps/desk/src/pages/teams/index.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import styled from 'styled-components'; import { Box, StyledLink } from '@/components'; -import { TeamLayout } from '@/features/teams/'; +import { TeamLayout } from '@/features/teams/team-management'; import { NextPageWithLayout } from '@/types/next'; const StyledButton = styled(Button)`