moved files againn

zalexa19 · zalexa19 · commit 369ec12b97cd · 2026-02-01T15:45:14.000+01:00
diff --git a/client/src/components/SidebarJobPath.tsx b/client/src/components/SidebarJobPath.tsx
@@ -1,7 +1,7 @@
 import { Chip, Stack } from '@mui/material';
-import { JobPath, LearningStatus } from '../Trainee';
+import { JobPath, LearningStatus } from '../data/types/Trainee';
 
-import { SidebarLearningStatus } from '../../../components';
+import { SidebarLearningStatus } from '.';
 
 interface JobPathProps {
   jobPath: JobPath | string;
diff --git a/client/src/components/SidebarLearningStatus.tsx b/client/src/components/SidebarLearningStatus.tsx
@@ -1,5 +1,5 @@
 import { Chip } from '@mui/material';
-import { LearningStatus } from '../Trainee';
+import { LearningStatus } from '../data/types/Trainee';
 
 interface LearningStatusProps {
   learningStatus: LearningStatus | undefined;
diff --git a/client/src/components/index.ts b/client/src/components/index.ts
@@ -11,6 +11,6 @@ export * from '../features/trainee-profile/profile/components/TraineeProfile';
 export * from '../layout/ResponsiveNavBar';
 export * from '../features/search/components/SearchBar';
 export * from '../features/trainee-profile/profile/ProfileSidebar';
-export * from '../features/trainee-profile/components/SidebarJobPath';
-export * from '../features/trainee-profile/components/SidebarJobPath';
-export * from '../features/trainee-profile/components/SidebarLearningStatus';
+export * from './SidebarJobPath';
+export * from './SidebarJobPath';
+export * from './SidebarLearningStatus';
diff --git a/client/src/data/types/Trainee.ts b/client/src/data/types/Trainee.ts
@@ -1,4 +1,4 @@
-import { Interaction } from './interactions/Interactions';
+import { Interaction } from '../../features/trainee-profile/interactions/Interactions';
 
 // enums
 export enum Gender {
diff --git a/client/src/features/cohorts/Cohorts.ts b/client/src/features/cohorts/Cohorts.ts
@@ -1,4 +1,4 @@
-import { LearningStatus } from '../Trainee';
+import { LearningStatus } from '../../data/types/Trainee';
 
 export interface Cohort {
   cohort: number | null;
diff --git a/client/src/features/cohorts/CohortsPage.tsx b/client/src/features/cohorts/CohortsPage.tsx
@@ -1,4 +1,4 @@
-import { ErrorBox, Loader } from '../../../components';
+import { ErrorBox, Loader } from '../../components';
 
 import Box from '@mui/material/Box';
 import { Cohort } from '../cohorts/Cohorts';
diff --git a/client/src/features/cohorts/components/CohortAccordion.tsx b/client/src/features/cohorts/components/CohortAccordion.tsx
@@ -6,18 +6,18 @@ import EmailIcon from '@mui/icons-material/EmailOutlined';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import IconButton from '@mui/material/IconButton';
-import { LearningStatus } from '../../Trainee';
+import { LearningStatus } from '../../../data/types/Trainee';
 import { Link } from 'react-router-dom';
 import LinkedInIcon from '@mui/icons-material/LinkedIn';
-import { SidebarJobPath } from '../../components/SidebarJobPath';
-import { SidebarLearningStatus } from '../../components/SidebarLearningStatus';
+import { SidebarJobPath } from '../../../components';
+import { SidebarLearningStatus } from '../../../components/SidebarLearningStatus';
 import Table from '@mui/material/Table';
 import TableBody from '@mui/material/TableBody';
 import TableCell from '@mui/material/TableCell';
 import TableHead from '@mui/material/TableHead';
 import TableRow from '@mui/material/TableRow';
 import { TraineeAvatar } from './TraineeAvatar';
-import slackLogo from '../../../../assets/slack.png';
+import slackLogo from '../../../assets/slack.png';
 
 export interface CohortAccordionProps {
   cohortInfo: Cohort;
diff --git a/client/src/features/cohorts/components/TraineeAvatar.tsx b/client/src/features/cohorts/components/TraineeAvatar.tsx
diff --git a/client/src/features/cohorts/data/useCohortsData.tsx b/client/src/features/cohorts/data/useCohortsData.tsx
diff --git a/client/src/features/trainee-profile/context/useTraineeProfileContext.tsx b/client/src/features/trainee-profile/context/useTraineeProfileContext.tsx
@@ -1,7 +1,7 @@
 import React, { createContext, useContext } from 'react';
 
 import { SaveTraineeRequestData } from '../personal-info/data/useTraineeInfoData';
-import { Trainee } from '../Trainee';
+import { Trainee } from '../../../data/types/Trainee';
 
 export type TraineeProfileContextType = {
   traineeId: string;
diff --git a/client/src/features/trainee-profile/context/useTraineeProfileProvider.tsx b/client/src/features/trainee-profile/context/useTraineeProfileProvider.tsx
@@ -5,7 +5,7 @@ import {
   TraineeEducationInfo,
   TraineeEmploymentInfo,
   TraineePersonalInfo,
-} from '../Trainee';
+} from '../../../data/types/Trainee';
 
 import { SaveTraineeRequestData } from '../personal-info/data/useTraineeInfoData';
 import { TraineeProfileContext } from './useTraineeProfileContext';
diff --git a/client/src/features/trainee-profile/education/EducationInfo.tsx b/client/src/features/trainee-profile/education/EducationInfo.tsx
@@ -1,5 +1,5 @@
 import { Box, FormControl, InputLabel, MenuItem, Select, TextField, Typography } from '@mui/material';
-import { LearningStatus, QuitReason, Trainee } from '../Trainee';
+import { LearningStatus, QuitReason, Trainee } from '../../../data/types/Trainee';
 import { createSelectChangeHandler, createTextChangeHandler } from '../utils/formHelper';
 
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
diff --git a/client/src/features/trainee-profile/education/strikes/StrikeDetailsModal.tsx b/client/src/features/trainee-profile/education/strikes/StrikeDetailsModal.tsx
@@ -14,7 +14,7 @@ import {
   TextField,
   Typography,
 } from '@mui/material';
-import { Strike, StrikeReason } from '../../Trainee';
+import { Strike, StrikeReason } from '../../../../data/types/Trainee';
 import { useEffect, useState } from 'react';
 
 import { LoadingButton } from '@mui/lab';
diff --git a/client/src/features/trainee-profile/education/strikes/StrikesComponent.tsx b/client/src/features/trainee-profile/education/strikes/StrikesComponent.tsx
@@ -3,7 +3,7 @@ import { useAddStrike, useDeleteStrike, useEditStrike, useGetStrikes } from './d
 
 import AddIcon from '@mui/icons-material/Add';
 import { ConfirmationDialog } from '../../../../components/ConfirmationDialog';
-import { Strike } from '../../Trainee';
+import { Strike } from '../../../../data/types/Trainee';
 import { StrikeDetailsModal } from './StrikeDetailsModal';
 import { StrikesList } from './StrikesList';
 import { useQueryClient } from '@tanstack/react-query';
diff --git a/client/src/features/trainee-profile/education/strikes/StrikesList.tsx b/client/src/features/trainee-profile/education/strikes/StrikesList.tsx
@@ -4,7 +4,7 @@ import { AvatarWithTooltip } from '../components/AvatarWithTooltip';
 import DeleteIcon from '@mui/icons-material/Delete';
 import EditIcon from '@mui/icons-material/Edit';
 import MarkdownText from '../../components/MarkdownText';
-import { Strike } from '../../Trainee';
+import { Strike } from '../../../../data/types/Trainee';
 import { formatDateForDisplay } from '../../utils/dateHelper';
 
 interface StrikesListProps {
diff --git a/client/src/features/trainee-profile/education/strikes/data/strike-queries.ts b/client/src/features/trainee-profile/education/strikes/data/strike-queries.ts
@@ -1,6 +1,6 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 
-import { Strike } from '../../../Trainee';
+import { Strike } from '../../../../../data/types/Trainee';
 import axios from 'axios';
 
 /**
diff --git a/client/src/features/trainee-profile/education/tests/TestDetailsModal.tsx b/client/src/features/trainee-profile/education/tests/TestDetailsModal.tsx
@@ -14,7 +14,7 @@ import {
   TextField,
   Typography,
 } from '@mui/material';
-import { Test, TestResult, TestType } from '../../Trainee';
+import { Test, TestResult, TestType } from '../../../../data/types/Trainee';
 import { useEffect, useState } from 'react';
 
 import { LoadingButton } from '@mui/lab';
diff --git a/client/src/features/trainee-profile/education/tests/TestsComponent.tsx b/client/src/features/trainee-profile/education/tests/TestsComponent.tsx
@@ -3,7 +3,7 @@ import { useAddTest, useDeleteTest, useEditTest, useGetTests } from './data/test
 
 import AddIcon from '@mui/icons-material/Add';
 import { ConfirmationDialog } from '../../../../components/ConfirmationDialog';
-import { Test } from '../../Trainee';
+import { Test } from '../../../../data/types/Trainee';
 import { TestDetailsModal } from './TestDetailsModal';
 import { TestsList } from './TestsList';
 import { useQueryClient } from '@tanstack/react-query';
diff --git a/client/src/features/trainee-profile/education/tests/TestsList.tsx b/client/src/features/trainee-profile/education/tests/TestsList.tsx
@@ -1,6 +1,6 @@
 import { Box, Icon, IconButton, List, ListItem, ListItemText, Tooltip, Typography } from '@mui/material';
 import { CancelSharp, CheckCircle, Error, OfflinePin } from '@mui/icons-material';
-import { Test, TestResult } from '../../Trainee';
+import { Test, TestResult } from '../../../../data/types/Trainee';
 
 import DeleteIcon from '@mui/icons-material/Delete';
 import EditIcon from '@mui/icons-material/Edit';
diff --git a/client/src/features/trainee-profile/education/tests/data/test-queries.ts b/client/src/features/trainee-profile/education/tests/data/test-queries.ts
@@ -1,6 +1,6 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 
-import { Test } from '../../../Trainee';
+import { Test } from '../../../../../data/types/Trainee';
 import axios from 'axios';
 
 /**
diff --git a/client/src/features/trainee-profile/employment/EmploymentInfo.tsx b/client/src/features/trainee-profile/employment/EmploymentInfo.tsx
@@ -16,7 +16,7 @@ import {
 import { createSelectChangeHandler, createTextChangeHandler } from '../utils/formHelper';
 
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import { JobPath } from '../Trainee';
+import { JobPath } from '../../../data/types/Trainee';
 import LinkIcon from '@mui/icons-material/Link';
 import React from 'react';
 import { formatDate } from '../utils/dateHelper';
diff --git a/client/src/features/trainee-profile/interactions/Interactions.tsx b/client/src/features/trainee-profile/interactions/Interactions.tsx
@@ -1,4 +1,4 @@
-import { Reporter } from '../Trainee';
+import { Reporter } from '../../../data/types/Trainee';
 
 export interface Interaction {
   id: string;
diff --git a/client/src/features/trainee-profile/interactions/InteractionsInfo.tsx b/client/src/features/trainee-profile/interactions/InteractionsInfo.tsx
@@ -3,8 +3,8 @@ import { useAddInteraction, useEditInteraction, useGetInteractions } from './dat
 
 import AddIcon from '@mui/icons-material/Add';
 import { Interaction } from './Interactions';
-import { InteractionDetailsModal } from './InteractionDetailsModal';
-import InteractionsList from './InteractionsList';
+import { InteractionDetailsModal } from './components/InteractionDetailsModal';
+import InteractionsList from './components/InteractionsList';
 import { useState } from 'react';
 import { useTraineeProfileContext } from '../context/useTraineeProfileContext';
 
diff --git a/client/src/features/trainee-profile/interactions/components/AddNewInteractionComponent.tsx b/client/src/features/trainee-profile/interactions/components/AddNewInteractionComponent.tsx
@@ -4,10 +4,10 @@ import React, { useState } from 'react';
 import FormDateTextField from './FormDateTextField';
 import FormSelect from './FormSelect';
 import FormTextField from './FormTextField';
-import { Interaction } from './Interactions';
-import { InteractionType } from './Interactions';
+import { Interaction } from '../Interactions';
+import { InteractionType } from '../Interactions';
 import { LoadingButton } from '@mui/lab';
-import { useAddInteraction } from './data/interaction-queries';
+import { useAddInteraction } from '../data/interaction-queries';
 
 const types = Object.values(InteractionType);
 
diff --git a/client/src/features/trainee-profile/interactions/components/FormDateTextField.tsx b/client/src/features/trainee-profile/interactions/components/FormDateTextField.tsx
@@ -2,7 +2,7 @@ import FormControl from '@mui/material/FormControl';
 import React from 'react';
 import { SxProps } from '@mui/material';
 import TextField from '@mui/material/TextField';
-import { formatDate } from '../utils/dateHelper';
+import { formatDate } from '../../utils/dateHelper';
 
 interface FormDateTextFieldProps {
   label: string;
diff --git a/client/src/features/trainee-profile/interactions/components/FormSelect.tsx b/client/src/features/trainee-profile/interactions/components/FormSelect.tsx
@@ -1,7 +1,7 @@
 import { FormControl, InputLabel, MenuItem, Select, SelectChangeEvent, SxProps } from '@mui/material';
 
 import React from 'react';
-import { formatTextToFriendly } from '../utils/formHelper';
+import { formatTextToFriendly } from '../../utils/formHelper';
 
 interface FormSelectProps {
   id: string;
diff --git a/client/src/features/trainee-profile/interactions/components/FormTextField.tsx b/client/src/features/trainee-profile/interactions/components/FormTextField.tsx
diff --git a/client/src/features/trainee-profile/interactions/components/InteractionDetailsModal.tsx b/client/src/features/trainee-profile/interactions/components/InteractionDetailsModal.tsx
@@ -11,13 +11,13 @@ import {
   TextField,
   Typography,
 } from '@mui/material';
-import { Interaction, InteractionType } from './Interactions';
+import { Interaction, InteractionType } from '../Interactions';
 import { useEffect, useState } from 'react';
 
 import FormSelect from './FormSelect';
 import FormTextField from './FormTextField';
 import { LoadingButton } from '@mui/lab';
-import { formatDate } from '../utils/dateHelper';
+import { formatDate } from '../../utils/dateHelper';
 
 const types = Object.values(InteractionType);
 
diff --git a/client/src/features/trainee-profile/interactions/components/InteractionsList.tsx b/client/src/features/trainee-profile/interactions/components/InteractionsList.tsx
@@ -1,15 +1,15 @@
 import { Alert, Box, Chip, IconButton, List, ListItem, ListItemAvatar, ListItemText, Typography } from '@mui/material';
 import React, { useState } from 'react';
 
-import { AvatarWithTooltip } from '../education/components/AvatarWithTooltip';
-import { ConfirmationDialog } from '../../../components/ConfirmationDialog';
+import { AvatarWithTooltip } from '../../education/components/AvatarWithTooltip';
+import { ConfirmationDialog } from '../../../../components/ConfirmationDialog';
 import DeleteIcon from '@mui/icons-material/Delete';
 import EditIcon from '@mui/icons-material/Edit';
-import { Interaction } from './Interactions';
-import MarkdownText from '../components/MarkdownText';
-import { formatDateForDisplay } from '../utils/dateHelper';
-import { formatTextToFriendly } from '../utils/formHelper';
-import { useDeleteInteraction } from './data/interaction-queries';
+import { Interaction } from '../Interactions';
+import MarkdownText from '../../components/MarkdownText';
+import { formatDateForDisplay } from '../../utils/dateHelper';
+import { formatTextToFriendly } from '../../utils/formHelper';
+import { useDeleteInteraction } from '../data/interaction-queries';
 
 interface InteractionsListProps {
   interactions: Interaction[];
diff --git a/client/src/features/trainee-profile/personal-info/PersonalInfo.tsx b/client/src/features/trainee-profile/personal-info/PersonalInfo.tsx
@@ -1,4 +1,11 @@
-import { Background, EducationLevel, EnglishLevel, Gender, Pronouns, ResidencyStatus } from '../Trainee';
+import {
+  Background,
+  EducationLevel,
+  EnglishLevel,
+  Gender,
+  Pronouns,
+  ResidencyStatus,
+} from '../../../data/types/Trainee';
 import { Box, FormControl, InputLabel, MenuItem, Select, TextField } from '@mui/material';
 import { createSelectChangeHandler, createTextChangeHandler } from '../utils/formHelper';
 
diff --git a/client/src/features/trainee-profile/personal-info/data/useTraineeInfoData.tsx b/client/src/features/trainee-profile/personal-info/data/useTraineeInfoData.tsx
@@ -4,7 +4,7 @@ import {
   TraineeEducationInfo,
   TraineeEmploymentInfo,
   TraineePersonalInfo,
-} from '../../Trainee';
+} from '../../../../data/types/Trainee';
 import { useMutation, useQuery } from '@tanstack/react-query';
 
 import axios from 'axios';
diff --git a/client/src/features/trainee-profile/profile/ProfileSidebar.tsx b/client/src/features/trainee-profile/profile/ProfileSidebar.tsx
@@ -1,9 +1,9 @@
 import { Avatar, Box, IconButton, Link, Stack, Typography } from '@mui/material';
 
-import { LearningStatus } from '../Trainee';
+import { LearningStatus } from '../../../data/types/Trainee';
 import LinkedInLogo from '../../../assets/LinkedIn_logo.png';
-import { SidebarJobPath } from '../components/SidebarJobPath';
-import { SidebarLearningStatus } from '../components/SidebarLearningStatus';
+import { SidebarJobPath } from '../../../components/SidebarJobPath';
+import { SidebarLearningStatus } from '../../../components/SidebarLearningStatus';
 import githubLogo from '../../../assets/github.png';
 import slackLogo from '../../../assets/slack.png';
 import { useTraineeInfoData } from '../personal-info/data/useTraineeInfoData';
diff --git a/client/src/features/trainee-profile/profile/components/EditSaveButton.tsx b/client/src/features/trainee-profile/profile/components/EditSaveButton.tsx
diff --git a/client/src/features/trainee-profile/profile/components/TraineeProfile.tsx b/client/src/features/trainee-profile/profile/components/TraineeProfile.tsx
@@ -7,15 +7,15 @@ import {
 import { useEffect, useState } from 'react';
 
 import ContactInfo from '../../contact/ContactInfo';
-import { EditSaveButton } from '../../components/EditSaveButton';
+import { EditSaveButton } from './EditSaveButton';
 import EducationInfo from '../../education/EducationInfo';
 import EmploymentInfo from '../../employment/EmploymentInfo';
 import InteractionsInfo from '../../interactions/InteractionsInfo';
 import MuiAlert from '@mui/material/Alert';
 import PersonalInfo from '../../personal-info/PersonalInfo';
 import ProfileNav from './ProfileNav';
 import ProfileSidebar from '../ProfileSidebar';
-import { Trainee } from '../../Trainee';
+import { Trainee } from '../../../../data/types/Trainee';
 import { useQueryClient } from '@tanstack/react-query';
 import { useTraineeProfileContext } from '../../context/useTraineeProfileContext';
 
diff --git a/client/src/features/trainee-profile/utils/formHelper.ts b/client/src/features/trainee-profile/utils/formHelper.ts
@@ -1,5 +1,5 @@
 import { ChangeEvent, ReactNode } from 'react';
-import { Trainee, TraineeInfoType } from '../Trainee';
+import { Trainee, TraineeInfoType } from '../../../data/types/Trainee';
 
 import { SelectChangeEvent } from '@mui/material';
 
diff --git a/client/src/routes/routes.tsx b/client/src/routes/routes.tsx
@@ -1,7 +1,7 @@
 import { Navigate, createBrowserRouter } from 'react-router-dom';
 
 import { ApiProvider } from '../auth/hooks/useAuthProvider';
-import CohortsPage from '../features/trainee-profile/cohorts/CohortsPage';
+import CohortsPage from '../features/cohorts/CohortsPage';
 import DashboardPage from '../features/dashboard/DashboardPage';
 import LoginPage from '../features/login/LoginPage';
 import { ProtectedRoute } from './ProtectedRoute';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Interaction } from './interactions/Interactions';`
	`1`	`+import { Interaction } from '../../features/trainee-profile/interactions/Interactions';`
`2`	`2`
`3`	`3`	`// enums`
`4`	`4`	`export enum Gender {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { LearningStatus } from '../Trainee';`
	`1`	`+import { LearningStatus } from '../../data/types/Trainee';`
`2`	`2`
`3`	`3`	`export interface Cohort {`
`4`	`4`	`cohort: number \| null;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ErrorBox, Loader } from '../../../components';`
	`1`	`+import { ErrorBox, Loader } from '../../components';`
`2`	`2`
`3`	`3`	`import Box from '@mui/material/Box';`
`4`	`4`	`import { Cohort } from '../cohorts/Cohorts';`