diff --git a/client/src/App.tsx b/client/src/App.tsx index 48323ba..e3b39fd 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -25,8 +25,9 @@ import Home from './pages/home/Home'; import NotFound from './pages/not-found/NotFound'; import Profile from './pages/profile/Profile'; import './scss/styles.scss'; -import { PageEnum, RoleEnum } from './types'; import { AdminPageEnum } from './types/enums/AdminPageEnum'; +import { PageEnum } from './types/enums/PageEnum'; +import { RoleEnum } from './types/enums/RoleEnum'; function App() { return ( diff --git a/client/src/components/alert/Alert.tsx b/client/src/components/alert/Alert.tsx index 30d9777..ced4dc4 100644 --- a/client/src/components/alert/Alert.tsx +++ b/client/src/components/alert/Alert.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import { useErrorContext } from '../../contexts/ErrorContext'; -import { AlertTypeEnum } from '../../types'; +import { AlertTypeEnum } from '../../types/enums/AlertTypeEnum'; import './Alert.scss'; interface IParentAlertProps { diff --git a/client/src/components/auth/protected-route/ProtectedRoute.tsx b/client/src/components/auth/protected-route/ProtectedRoute.tsx index 40fc979..b5d5102 100644 --- a/client/src/components/auth/protected-route/ProtectedRoute.tsx +++ b/client/src/components/auth/protected-route/ProtectedRoute.tsx @@ -1,7 +1,8 @@ import { useCallback } from 'react'; import { Navigate, Outlet, To, useLocation } from 'react-router-dom'; import { useAuthContext } from '../../../contexts/AuthContext'; -import { PageEnum, RoleEnum } from '../../../types'; +import { PageEnum } from '../../../types/enums/PageEnum'; +import { RoleEnum } from '../../../types/enums/RoleEnum'; type ProtectedRouteProps = { role: RoleEnum | null; diff --git a/client/src/components/breadcrumb/Breadcrumb.tsx b/client/src/components/breadcrumb/Breadcrumb.tsx index 9e4fe63..f9bb8f5 100644 --- a/client/src/components/breadcrumb/Breadcrumb.tsx +++ b/client/src/components/breadcrumb/Breadcrumb.tsx @@ -1,5 +1,5 @@ import { Link } from 'react-router-dom'; -import { PageEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; interface BreadcrumbProps { pageName: string; diff --git a/client/src/components/http-provider/HttpProvider.tsx b/client/src/components/http-provider/HttpProvider.tsx index 3ad7bed..8384559 100644 --- a/client/src/components/http-provider/HttpProvider.tsx +++ b/client/src/components/http-provider/HttpProvider.tsx @@ -3,8 +3,9 @@ import { CachePolicies, CustomOptions, Provider, useFetch } from 'use-http'; import { authPaths } from '../../config/api'; import { useAuthContext } from '../../contexts/AuthContext'; import { useErrorContext } from '../../contexts/ErrorContext'; -import { IUser } from '../../types'; -import { initialAuth, isJwtExpired } from '../../utils'; +import { IUser } from '../../types/interfaces/auth/IUser'; +import { initialAuth } from '../../utils/auth'; +import { isJwtExpired } from '../../utils/jwt'; // The component that is responsible for the useFetch hook options export default function HttpProvider({ children }: PropsWithChildren) { diff --git a/client/src/components/navbar/Navbar.tsx b/client/src/components/navbar/Navbar.tsx index 3938777..a7485f9 100644 --- a/client/src/components/navbar/Navbar.tsx +++ b/client/src/components/navbar/Navbar.tsx @@ -1,7 +1,8 @@ import { Link, useLocation } from 'react-router-dom'; import { useAuthContext } from '../../contexts/AuthContext'; -import { PageEnum, RoleEnum } from '../../types'; import { AdminPageEnum } from '../../types/enums/AdminPageEnum'; +import { PageEnum } from '../../types/enums/PageEnum'; +import { RoleEnum } from '../../types/enums/RoleEnum'; import profileUserIcon from './img/profile-user-icon.png'; import NavItem from './nav-item/NavItem'; diff --git a/client/src/config/api/events.ts b/client/src/config/api/events.ts index 33f5230..addadd5 100644 --- a/client/src/config/api/events.ts +++ b/client/src/config/api/events.ts @@ -1,4 +1,4 @@ -import { EventsFilterEnum } from '../../types'; +import { EventsFilterEnum } from '../../types/enums/EventsFilterEnum'; import { baseApiUrl } from './base'; const base = `${baseApiUrl}/events`; diff --git a/client/src/contexts/AuthContext.tsx b/client/src/contexts/AuthContext.tsx index b6184b6..607433c 100644 --- a/client/src/contexts/AuthContext.tsx +++ b/client/src/contexts/AuthContext.tsx @@ -1,7 +1,11 @@ import { PropsWithChildren, createContext, useContext } from 'react'; import { useLocalStorage } from '../hooks/useLocalStorage'; -import { IAuthResponse, IAuthStorage, IUser, RoleEnum } from '../types'; -import { deleteJwtCookie, deleteRefreshCookie, isJwtExpired } from '../utils'; +import { RoleEnum } from '../types/enums/RoleEnum'; +import { IAuthResponse } from '../types/interfaces/auth/IAuthResponse'; +import { IAuthStorage } from '../types/interfaces/auth/IAuthStorage'; +import { IUser } from '../types/interfaces/auth/IUser'; +import { deleteJwtCookie, deleteRefreshCookie } from '../utils/cookies'; +import { isJwtExpired } from '../utils/jwt'; type AuthContextType = { user: Partial; diff --git a/client/src/contexts/ErrorContext.tsx b/client/src/contexts/ErrorContext.tsx index ad724e6..7f27330 100644 --- a/client/src/contexts/ErrorContext.tsx +++ b/client/src/contexts/ErrorContext.tsx @@ -6,7 +6,8 @@ import { useState, } from 'react'; import { v4 as uuidV4 } from 'uuid'; -import { AlertTypeEnum, IError } from '../types'; +import { AlertTypeEnum } from '../types/enums/AlertTypeEnum'; +import { IError } from '../types/interfaces/common/IError'; const ErrorContext = createContext(null); const maxErrors = 3; diff --git a/client/src/hooks/useAuthenticate.ts b/client/src/hooks/useAuthenticate.ts index 50e51a8..5c303f7 100644 --- a/client/src/hooks/useAuthenticate.ts +++ b/client/src/hooks/useAuthenticate.ts @@ -2,8 +2,8 @@ import { useEffect } from 'react'; import { useFetch } from 'use-http'; import { authPaths } from '../config/api'; import { useAuthContext } from '../contexts/AuthContext'; -import { IAuthResponse } from '../types'; -import { initialAuth } from '../utils'; +import { IAuthResponse } from '../types/interfaces/auth/IAuthResponse'; +import { initialAuth } from '../utils/auth'; // The hook that authenticates our user export default function useAuthenticate(shouldLogoutUser: boolean = true) { diff --git a/client/src/hooks/usePagination.ts b/client/src/hooks/usePagination.ts index bf4a2d9..c72f4ac 100644 --- a/client/src/hooks/usePagination.ts +++ b/client/src/hooks/usePagination.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; -import * as paginationUtils from '../utils'; +import * as paginationUtils from '../utils/page'; type TogglePageFunction = (page: number) => void; type SwitchPageFunction = () => void; diff --git a/client/src/pages/admin/Admin.tsx b/client/src/pages/admin/Admin.tsx index 48b4a2c..db3d61c 100644 --- a/client/src/pages/admin/Admin.tsx +++ b/client/src/pages/admin/Admin.tsx @@ -2,7 +2,8 @@ import { useMemo } from 'react'; import { Navigate, Outlet } from 'react-router-dom'; import Spinner from '../../components/spinner/Spinner'; import useAuthenticate from '../../hooks/useAuthenticate'; -import { PageEnum, RoleEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; +import { RoleEnum } from '../../types/enums/RoleEnum'; // The component that decides if the user can access the admin panel export default function Admin() { diff --git a/client/src/pages/admin/admin-edit-form/admin-edit-form-row/AdminEditFormRow.tsx b/client/src/pages/admin/admin-edit-form/admin-edit-form-row/AdminEditFormRow.tsx index ed336db..10b104c 100644 --- a/client/src/pages/admin/admin-edit-form/admin-edit-form-row/AdminEditFormRow.tsx +++ b/client/src/pages/admin/admin-edit-form/admin-edit-form-row/AdminEditFormRow.tsx @@ -1,4 +1,4 @@ -import { camelCaseToWords, capitalizeWord } from '../../../../utils'; +import { camelCaseToWords, capitalizeWord } from '../../../../utils/string'; interface AdminEditFormRowProps { columnName: string; diff --git a/client/src/pages/admin/admin-table/AdminTable.tsx b/client/src/pages/admin/admin-table/AdminTable.tsx index ddd8e0f..58f97b9 100644 --- a/client/src/pages/admin/admin-table/AdminTable.tsx +++ b/client/src/pages/admin/admin-table/AdminTable.tsx @@ -3,7 +3,7 @@ import { SubmitHandler } from 'react-hook-form'; import { v4 as uuidV4 } from 'uuid'; import { usePagination } from '../../../hooks/usePagination'; import { IObjectWithId } from '../../../types/interfaces/common/IObjectWithId'; -import { camelCaseToWords } from '../../../utils'; +import { camelCaseToWords } from '../../../utils/string'; import AdminEditForm, { OnCreateFunction, OnUpdateFunction, diff --git a/client/src/pages/auth/finish-register/FinishRegister.tsx b/client/src/pages/auth/finish-register/FinishRegister.tsx index 5674364..fd33d1e 100644 --- a/client/src/pages/auth/finish-register/FinishRegister.tsx +++ b/client/src/pages/auth/finish-register/FinishRegister.tsx @@ -12,7 +12,10 @@ import { OAuthPaths, skillsPaths } from '../../../config/api'; import { useAuthContext } from '../../../contexts/AuthContext'; import { useErrorContext } from '../../../contexts/ErrorContext'; import useValidators from '../../../hooks/useValidator'; -import { IAuthResponse, ISkill, PageEnum, RoleEnum } from '../../../types'; +import { PageEnum } from '../../../types/enums/PageEnum'; +import { RoleEnum } from '../../../types/enums/RoleEnum'; +import { IAuthResponse } from '../../../types/interfaces/auth/IAuthResponse'; +import { ISkill } from '../../../types/interfaces/skills/ISkill'; import '../styles/Register.scss'; type Inputs = { @@ -40,8 +43,6 @@ function FinishRegister() { register, reset, watch, - setError, - clearErrors, setValue, formState: { errors }, } = useForm({ @@ -60,8 +61,6 @@ function FinishRegister() { mode: 'onChange', }); - const formValues = watch(); - const { data: skills } = useFetch( skillsPaths.getAll, { diff --git a/client/src/pages/auth/login/Login.tsx b/client/src/pages/auth/login/Login.tsx index 9868107..3cc5265 100644 --- a/client/src/pages/auth/login/Login.tsx +++ b/client/src/pages/auth/login/Login.tsx @@ -6,7 +6,8 @@ import { authPaths, OAuthPaths } from '../../../config/api'; import { useAuthContext } from '../../../contexts/AuthContext'; import useUrlSearchParam from '../../../hooks/useURLSearchParam'; import useValidators from '../../../hooks/useValidator'; -import { IAuthResponse, PageEnum } from '../../../types'; +import { PageEnum } from '../../../types/enums/PageEnum'; +import { IAuthResponse } from '../../../types/interfaces/auth/IAuthResponse'; type Inputs = { Email: string; diff --git a/client/src/pages/auth/logout/Logout.tsx b/client/src/pages/auth/logout/Logout.tsx index 69e523e..90eaeda 100644 --- a/client/src/pages/auth/logout/Logout.tsx +++ b/client/src/pages/auth/logout/Logout.tsx @@ -4,7 +4,7 @@ import { useFetch } from 'use-http'; import Spinner from '../../../components/spinner/Spinner'; import { authPaths } from '../../../config/api'; import { useAuthContext } from '../../../contexts/AuthContext'; -import { PageEnum } from '../../../types'; +import { PageEnum } from '../../../types/enums/PageEnum'; // The component used to handle logout export default function Logout() { diff --git a/client/src/pages/auth/register/Register.tsx b/client/src/pages/auth/register/Register.tsx index ec97b7b..284b369 100644 --- a/client/src/pages/auth/register/Register.tsx +++ b/client/src/pages/auth/register/Register.tsx @@ -10,7 +10,10 @@ import SkillsSelect, { import { authPaths, OAuthPaths, skillsPaths } from '../../../config/api'; import { useErrorContext } from '../../../contexts/ErrorContext'; import useValidators from '../../../hooks/useValidator'; -import { AlertTypeEnum, IAuthResponse, ISkill, RoleEnum } from '../../../types'; +import { AlertTypeEnum } from '../../../types/enums/AlertTypeEnum'; +import { RoleEnum } from '../../../types/enums/RoleEnum'; +import { IAuthResponse } from '../../../types/interfaces/auth/IAuthResponse'; +import { ISkill } from '../../../types/interfaces/skills/ISkill'; import '../styles/Register.scss'; type Inputs = { diff --git a/client/src/pages/chat/Chat.tsx b/client/src/pages/chat/Chat.tsx index fdcdef9..ed9cd2f 100644 --- a/client/src/pages/chat/Chat.tsx +++ b/client/src/pages/chat/Chat.tsx @@ -4,7 +4,9 @@ import { useFetch } from 'use-http'; import Spinner from '../../components/spinner/Spinner'; import { messagesPaths, usersPaths } from '../../config/api'; import { useAuthContext } from '../../contexts/AuthContext'; -import { IFullUser, IMessage, PageEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; +import { IFullUser } from '../../types/interfaces/auth/IFullUser'; +import { IMessage } from '../../types/interfaces/chat/IMessage'; import './Chat.css'; import ChatLeftMessage from './chat-left-message/ChatLeftMessage'; import ChatRightMessage from './chat-right-message/ChatRightMessage'; diff --git a/client/src/pages/events-create/EventsCreate.tsx b/client/src/pages/events-create/EventsCreate.tsx index e871fdd..5ed8d61 100644 --- a/client/src/pages/events-create/EventsCreate.tsx +++ b/client/src/pages/events-create/EventsCreate.tsx @@ -10,8 +10,10 @@ import SkillsSelect, { } from '../../components/skills-select/SkillsSelect'; import { eventsPaths, filesPaths, skillsPaths } from '../../config/api'; import useValidators from '../../hooks/useValidator'; -import { IFile, ISkill, PageEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; +import { IFile } from '../../types/interfaces/common/IFile'; import { IEvent } from '../../types/interfaces/events/IEvent'; +import { ISkill } from '../../types/interfaces/skills/ISkill'; type Inputs = { Name: string; diff --git a/client/src/pages/events-details/EventsDetails.tsx b/client/src/pages/events-details/EventsDetails.tsx index 7a738e8..a9bb3c2 100644 --- a/client/src/pages/events-details/EventsDetails.tsx +++ b/client/src/pages/events-details/EventsDetails.tsx @@ -7,7 +7,7 @@ import { userEventStatusesPaths, } from '../../config/api'; import { useAuthContext } from '../../contexts/AuthContext'; -import { IUser } from '../../types'; +import { IUser } from '../../types/interfaces/auth/IUser'; import { IEvent } from '../../types/interfaces/events/IEvent'; const CHARACTER_DESCRIPTION_THRESHOLD = 60; diff --git a/client/src/pages/events/Events.tsx b/client/src/pages/events/Events.tsx index 590f423..7391912 100644 --- a/client/src/pages/events/Events.tsx +++ b/client/src/pages/events/Events.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { CachePolicies, useFetch } from 'use-http'; import Spinner from '../../components/spinner/Spinner'; import { eventsPaths } from '../../config/api'; -import { EventsFilterEnum } from '../../types'; +import { EventsFilterEnum } from '../../types/enums/EventsFilterEnum'; import { IEvent } from '../../types/interfaces/events/IEvent'; import EventsBreadcrumb from './events-breadcrumb/EventsBreadcrumb'; import EventsItem from './events-item/EventsItem'; diff --git a/client/src/pages/events/events-item/EventsItem.tsx b/client/src/pages/events/events-item/EventsItem.tsx index 8bc96c5..5bebf2c 100644 --- a/client/src/pages/events/events-item/EventsItem.tsx +++ b/client/src/pages/events/events-item/EventsItem.tsx @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom'; import { useFetch } from 'use-http'; import { eventsPaths, filesPaths } from '../../../config/api'; import { useAuthContext } from '../../../contexts/AuthContext'; -import { PageEnum } from '../../../types'; +import { PageEnum } from '../../../types/enums/PageEnum'; import { IEvent } from '../../../types/interfaces/events/IEvent'; export interface EventsItemProps extends IEvent {} diff --git a/client/src/pages/home/Home.tsx b/client/src/pages/home/Home.tsx index 332318b..aeba329 100644 --- a/client/src/pages/home/Home.tsx +++ b/client/src/pages/home/Home.tsx @@ -1,14 +1,10 @@ -import HomeExploreBySkill from './home-explore-by-skill/HomeExploreBySkill'; import HomeHero from './home-hero/HomeHero'; import HomeHowToStart from './home-how-to-start/HomeHowToStart'; -import HomeSearch from './home-search/HomeSearch'; function Home() { return ( <> - - ); diff --git a/client/src/pages/home/home-hero/HomeHero.tsx b/client/src/pages/home/home-hero/HomeHero.tsx index d842cbc..1ea3a19 100644 --- a/client/src/pages/home/home-hero/HomeHero.tsx +++ b/client/src/pages/home/home-hero/HomeHero.tsx @@ -1,3 +1,5 @@ +import { Link } from 'react-router-dom'; +import { PageEnum } from '../../../types/enums/PageEnum'; import carousel1 from './img/carousel-1.jpg'; function HomeHero() { @@ -13,23 +15,18 @@ function HomeHero() {

- Find The Perfect Job That You Deserved + Find The Perfect Event That You Deserved

Vero elitr justo clita lorem. Ipsum dolor at sed stet sit diam no. Kasd rebum ipsum et diam justo clita et kasd rebum sea elitr.

- - Search A Job - - - Find A Talent - + Search An Event +
diff --git a/client/src/pages/home/home-how-to-start/HomeHowToStart.tsx b/client/src/pages/home/home-how-to-start/HomeHowToStart.tsx index 4629102..4cbf9a8 100644 --- a/client/src/pages/home/home-how-to-start/HomeHowToStart.tsx +++ b/client/src/pages/home/home-how-to-start/HomeHowToStart.tsx @@ -1,3 +1,5 @@ +import { Link } from 'react-router-dom'; +import { PageEnum } from '../../../types/enums/PageEnum'; import about1 from './img/about-1.jpg'; import about2 from './img/about-2.jpg'; import about3 from './img/about-3.jpg'; @@ -34,7 +36,7 @@ function HomeHowToStart() {

- We Help To Get The Best Job And Find A Talent + We Help To Get The Best Event And Find A Talent

Tempor erat elitr rebum at clita. Diam dolor diam ipsum sit. Aliqu @@ -53,9 +55,11 @@ function HomeHowToStart() { Clita duo justo magna dolore erat amet

- + Read More - +
diff --git a/client/src/pages/not-found/NotFound.tsx b/client/src/pages/not-found/NotFound.tsx index bd13a28..ffde11a 100644 --- a/client/src/pages/not-found/NotFound.tsx +++ b/client/src/pages/not-found/NotFound.tsx @@ -1,5 +1,5 @@ import { Link } from 'react-router-dom'; -import { PageEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; function NotFound() { return ( diff --git a/client/src/pages/profile/Profile.tsx b/client/src/pages/profile/Profile.tsx index e9e751b..cc2fe0e 100644 --- a/client/src/pages/profile/Profile.tsx +++ b/client/src/pages/profile/Profile.tsx @@ -1,11 +1,12 @@ -import { useState } from 'react'; import { Link, useParams } from 'react-router-dom'; import { useFetch } from 'use-http'; import Spinner from '../../components/spinner/Spinner'; import { usersPaths } from '../../config/api'; import { friendsPaths } from '../../config/api/friends'; import { useAuthContext } from '../../contexts/AuthContext'; -import { IFullUser, IUserFriend, PageEnum } from '../../types'; +import { PageEnum } from '../../types/enums/PageEnum'; +import { IFullUser } from '../../types/interfaces/auth/IFullUser'; +import { IUserFriend } from '../../types/interfaces/profile/IUserFriend'; import './Profile.scss'; import ProfileFriendRequests from './profile-friend-requests/ProfileFriendRequests'; import ProfileFriends from './profile-friends/ProfileFriends'; @@ -13,7 +14,6 @@ import ProfileFriends from './profile-friends/ProfileFriends'; function Profile() { const { userId: idParam } = useParams(); const { user: userMe } = useAuthContext(); - const [editing, setEditing] = useState(false); const userId = Number(idParam || -1); @@ -42,10 +42,6 @@ function Profile() { await getFriends(); }; - const handleToggleEdit = () => { - setEditing((prev) => !prev); - }; - const handleAddFriend = async () => { if (userMe.id === user?.id) { return; @@ -74,6 +70,7 @@ function Profile() { return x.user; }); + const areFriends = !isOwner && mappedFriends.some((x) => x.id === userMe.id); return ( @@ -81,7 +78,9 @@ function Profile() {
-
+
Admin {user.firstname} {user.lastname} -

{user.currentWorkPlace}

-

{user.address}

+

+ Workplace: {user.currentWorkPlace} +

+

+ Address: {user.address} +

{!isOwner && (
{areFriends ? null : hasSentFriendRequest ? ( @@ -119,108 +122,6 @@ function Profile() { )}
-
-
    -
  • -
    - - - - - - Website -
    - https://bootdey.com -
    • -
  • -
    - - - - Github -
    - bootdey -
    • -
  • -
    - - - - Twitter -
    - @bootdey -
    • -
  • -
    - - - - - - Instagram -
    - bootdey -
    • -
  • -
    - - - - Facebook -
    - bootdey -
    • -
@@ -246,15 +147,7 @@ function Profile() {
First Name
- {editing ? ( - - ) : ( -

{user.firstname}

- )} +

{user.firstname}

@@ -262,15 +155,7 @@ function Profile() {
Last Name
- {editing ? ( - - ) : ( -

{user.lastname}

- )} +

{user.lastname}

@@ -278,15 +163,7 @@ function Profile() {
Address
- {editing ? ( - - ) : ( -

{user.address}

- )} +

{user.address}

@@ -294,15 +171,7 @@ function Profile() {
Education
- {editing ? ( - - ) : ( -

{user.education}

- )} +

{user.education}

@@ -310,15 +179,7 @@ function Profile() {
Workplace
- {editing ? ( - - ) : ( -

{user.currentWorkPlace}

- )} +

{user.currentWorkPlace}

@@ -326,15 +187,7 @@ function Profile() {
Work Experience
- {editing ? ( - - ) : ( -

{user.workExperience}

- )} +

{user.workExperience}

@@ -342,15 +195,7 @@ function Profile() {
What I can help with
- {editing ? ( - - ) : ( -

{user.whatCanHelpWith}

- )} +

{user.whatCanHelpWith}

@@ -364,33 +209,7 @@ function Profile() {
-
- {!isOwner ? null : editing ? ( - - ) : ( - - )} - - - - {editing && ( - - )} -
+
diff --git a/client/src/pages/profile/profile-friend-requests/ProfileFriendRequests.tsx b/client/src/pages/profile/profile-friend-requests/ProfileFriendRequests.tsx index e67adc3..4d34a9a 100644 --- a/client/src/pages/profile/profile-friend-requests/ProfileFriendRequests.tsx +++ b/client/src/pages/profile/profile-friend-requests/ProfileFriendRequests.tsx @@ -1,6 +1,7 @@ import { useFetch } from 'use-http'; import { friendsPaths } from '../../../config/api/friends'; -import { IFullUser, IUserFriend } from '../../../types'; +import { IFullUser } from '../../../types/interfaces/auth/IFullUser'; +import { IUserFriend } from '../../../types/interfaces/profile/IUserFriend'; import ProfileFriendRequest from './profile-friend-request/ProfileFriendRequest'; interface ProfileFriendRequestsProps { diff --git a/client/src/pages/profile/profile-friend-requests/profile-friend-request/ProfileFriendRequest.tsx b/client/src/pages/profile/profile-friend-requests/profile-friend-request/ProfileFriendRequest.tsx index b453e70..290a842 100644 --- a/client/src/pages/profile/profile-friend-requests/profile-friend-request/ProfileFriendRequest.tsx +++ b/client/src/pages/profile/profile-friend-requests/profile-friend-request/ProfileFriendRequest.tsx @@ -1,7 +1,8 @@ import { Link } from 'react-router-dom'; import { useFetch } from 'use-http'; import { friendsPaths } from '../../../../config/api/friends'; -import { IFullUser, PageEnum } from '../../../../types'; +import { PageEnum } from '../../../../types/enums/PageEnum'; +import { IFullUser } from '../../../../types/interfaces/auth/IFullUser'; interface ProfileFriendRequestProps { requester: IFullUser; diff --git a/client/src/pages/profile/profile-friends/ProfileFriends.tsx b/client/src/pages/profile/profile-friends/ProfileFriends.tsx index 1e32a7c..99d5d14 100644 --- a/client/src/pages/profile/profile-friends/ProfileFriends.tsx +++ b/client/src/pages/profile/profile-friends/ProfileFriends.tsx @@ -1,4 +1,4 @@ -import { IFullUser } from '../../../types'; +import { IFullUser } from '../../../types/interfaces/auth/IFullUser'; import ProfileFriend from './profile-friend/ProfileFriend'; interface ProfileFriendsProps { diff --git a/client/src/pages/profile/profile-friends/profile-friend/ProfileFriend.tsx b/client/src/pages/profile/profile-friends/profile-friend/ProfileFriend.tsx index 8673a13..779a8a6 100644 --- a/client/src/pages/profile/profile-friends/profile-friend/ProfileFriend.tsx +++ b/client/src/pages/profile/profile-friends/profile-friend/ProfileFriend.tsx @@ -1,7 +1,8 @@ import { Link } from 'react-router-dom'; import { useFetch } from 'use-http'; import { friendsPaths } from '../../../../config/api/friends'; -import { IFullUser, PageEnum } from '../../../../types'; +import { PageEnum } from '../../../../types/enums/PageEnum'; +import { IFullUser } from '../../../../types/interfaces/auth/IFullUser'; interface ProfileFriendProps { friend: IFullUser; diff --git a/client/src/types/index.ts b/client/src/types/index.ts deleted file mode 100644 index 4d9f144..0000000 --- a/client/src/types/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -// Enums -export * from './enums/AdminPageEnum'; -export * from './enums/AlertTypeEnum'; -export * from './enums/EventsFilterEnum'; -export * from './enums/PageEnum'; -export * from './enums/RoleEnum'; - -// Interfaces -// - common -export * from './interfaces/common/IDefaultObject'; -export * from './interfaces/common/IError'; -export * from './interfaces/common/IFile'; -export * from './interfaces/common/IObjectWithId'; -// - auth -export * from './interfaces/auth/IAuthRefreshResponse'; -export * from './interfaces/auth/IAuthResponse'; -export * from './interfaces/auth/IAuthStorage'; -export * from './interfaces/auth/IFullUser'; -export * from './interfaces/auth/IUser'; -// - profile -export * from './interfaces/profile/IUserFriend'; -// - skills -export * from './interfaces/skills/ISkill'; -// - chat -export * from './interfaces/chat/IMessage'; diff --git a/client/src/utils/index.ts b/client/src/utils/index.ts deleted file mode 100644 index cd896e6..0000000 --- a/client/src/utils/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './auth'; -export * from './cookies'; -export * from './jwt'; -export * from './page'; -export * from './string';