diff --git a/src/component/ApplyPage/Position/index.tsx b/src/component/ApplyPage/Position/index.tsx index ac12a930..0ee5fe1a 100644 --- a/src/component/ApplyPage/Position/index.tsx +++ b/src/component/ApplyPage/Position/index.tsx @@ -4,12 +4,13 @@ import Container from 'react-bootstrap/Container'; import Row from 'react-bootstrap/Row'; import { useParams } from 'react-router-dom'; -import applicationsByTeams from '../../../data/ApplyData/allApps'; -import type { Position as PositionData } from '../../../data/ApplyData/types'; +import NavBar from '@/component/NavBar'; +import ShadowedButton from '@/component/ShadowedButton'; + import './style.css'; -import useWebsite from '../../../shared/useWebsite'; -import NavBar from '../../NavBar'; -import ShadowedButton from '../../ShadowedButton'; +import applicationsByTeams from '@/data/ApplyData/allApps'; +import type { Position as PositionData } from '@/data/ApplyData/types'; +import useWebsite from '@/shared/useWebsite'; type ApplicationGroup = keyof typeof applicationsByTeams; diff --git a/src/component/CulturePage/BelongHere/index.tsx b/src/component/CulturePage/BelongHere/index.tsx index 1e03f9a0..cab78336 100644 --- a/src/component/CulturePage/BelongHere/index.tsx +++ b/src/component/CulturePage/BelongHere/index.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import ColorBlock from '../../../assets/images/culturepage/Color block.png'; +import ColorBlock from '@/assets/images/culturepage/Color block.png'; + import './style.css'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; const desktopContent = () => ( //
diff --git a/src/component/CulturePage/Collage/index.tsx b/src/component/CulturePage/Collage/index.tsx index 990f4408..9353cf79 100644 --- a/src/component/CulturePage/Collage/index.tsx +++ b/src/component/CulturePage/Collage/index.tsx @@ -1,17 +1,18 @@ import React from 'react'; -import firstimg from '../Collage/website-8.jpg'; +import firstimg from '@/component/CulturePage/Collage/website-8.jpg'; + import './style.css'; -import secondimg from '../Collage/website-9.jpg'; -import thirdimg from '../Collage/website-12.jpg'; -import fourimg from '../Collage/website-14.jpg'; -import fiveimg from '../Collage/website-15.jpg'; -import siximg from '../Collage/website-16.jpg'; -import sevenimg from '../Collage/website-21.jpg'; -import eightimg from '../Collage/website-23.jpg'; -import nineimg from '../Collage/website-24.jpg'; -import tenimg from '../Collage/website-25.jpg'; -import type { SectionProps } from '../types'; +import secondimg from '@/component/CulturePage/Collage/website-9.jpg'; +import thirdimg from '@/component/CulturePage/Collage/website-12.jpg'; +import fourimg from '@/component/CulturePage/Collage/website-14.jpg'; +import fiveimg from '@/component/CulturePage/Collage/website-15.jpg'; +import siximg from '@/component/CulturePage/Collage/website-16.jpg'; +import sevenimg from '@/component/CulturePage/Collage/website-21.jpg'; +import eightimg from '@/component/CulturePage/Collage/website-23.jpg'; +import nineimg from '@/component/CulturePage/Collage/website-24.jpg'; +import tenimg from '@/component/CulturePage/Collage/website-25.jpg'; +import type { SectionProps } from '@/component/CulturePage/types'; const desktopContent = (
diff --git a/src/component/CulturePage/Diversity/index.tsx b/src/component/CulturePage/Diversity/index.tsx index 01320d98..685dfa39 100644 --- a/src/component/CulturePage/Diversity/index.tsx +++ b/src/component/CulturePage/Diversity/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; + import './style.css'; const desktopContent = () => ( diff --git a/src/component/CulturePage/Equity/index.tsx b/src/component/CulturePage/Equity/index.tsx index d5cd6142..c34da398 100644 --- a/src/component/CulturePage/Equity/index.tsx +++ b/src/component/CulturePage/Equity/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; + import './style.css'; const desktopContent = ( diff --git a/src/component/CulturePage/Events/index.tsx b/src/component/CulturePage/Events/index.tsx index 1d63f3d6..42fc5bbb 100644 --- a/src/component/CulturePage/Events/index.tsx +++ b/src/component/CulturePage/Events/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; + import './style.css'; import RectImg1 from './website-5.jpg'; import RectImg2 from './website-6.jpg'; diff --git a/src/component/CulturePage/Events2/index.tsx b/src/component/CulturePage/Events2/index.tsx index 6a513b60..26a0d6b3 100644 --- a/src/component/CulturePage/Events2/index.tsx +++ b/src/component/CulturePage/Events2/index.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import CelebrateRepresent from '../Events2/CelebrateRepresent.png'; +import CelebrateRepresent from '@/component/CulturePage/Events2/CelebrateRepresent.png'; + import './style.css'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; const desktopContent = ( <> diff --git a/src/component/CulturePage/Inclusion/index.tsx b/src/component/CulturePage/Inclusion/index.tsx index 099b9e7f..c9def454 100644 --- a/src/component/CulturePage/Inclusion/index.tsx +++ b/src/component/CulturePage/Inclusion/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import type { SectionProps } from '../types'; +import type { SectionProps } from '@/component/CulturePage/types'; + import './style.css'; const desktopContent = ( diff --git a/src/component/CulturePage/IntroImages/index.tsx b/src/component/CulturePage/IntroImages/index.tsx index 2fb252e3..885f2c64 100644 --- a/src/component/CulturePage/IntroImages/index.tsx +++ b/src/component/CulturePage/IntroImages/index.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import IntroImg1 from '../../../component/CulturePage/IntroImages/website-2.jpg'; +import IntroImg1 from '@/component/CulturePage/IntroImages/website-2.jpg'; + import './style.css'; -import IntroImg2 from '../../../component/CulturePage/IntroImages/website-3.jpg'; -import IntroImg3 from '../../../component/CulturePage/IntroImages/website-4.jpg'; -import type { SectionProps } from '../types'; +import IntroImg2 from '@/component/CulturePage/IntroImages/website-3.jpg'; +import IntroImg3 from '@/component/CulturePage/IntroImages/website-4.jpg'; +import type { SectionProps } from '@/component/CulturePage/types'; const desktopContent = () => { return ( diff --git a/src/component/CulturePage/IntroSection/index.tsx b/src/component/CulturePage/IntroSection/index.tsx index aaa337a3..27e5ae2e 100644 --- a/src/component/CulturePage/IntroSection/index.tsx +++ b/src/component/CulturePage/IntroSection/index.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import NavBar from '../../NavBar'; -import logo from '../IntroSection/GeneratePeaceLogo.png'; -import type { SectionProps } from '../types'; +import logo from '@/component/CulturePage/IntroSection/GeneratePeaceLogo.png'; +import type { SectionProps } from '@/component/CulturePage/types'; +import NavBar from '@/component/NavBar'; + import './style.css'; const desktopContent = () => ( diff --git a/src/component/CulturePage/index.tsx b/src/component/CulturePage/index.tsx index c383c7e1..5268a57a 100644 --- a/src/component/CulturePage/index.tsx +++ b/src/component/CulturePage/index.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import useWebsite from '../../shared/useWebsite'; -import HorizontalDesktopContainer from '../DesktopMobileHandler/HorizontalDesktopContainer'; -import NewMobileContainer from '../DesktopMobileHandler/NewMobileContainer'; -import Footer from '../Footer'; -import NextPage from '../NextPage'; +import HorizontalDesktopContainer from '@/component/DesktopMobileHandler/HorizontalDesktopContainer'; +import NewMobileContainer from '@/component/DesktopMobileHandler/NewMobileContainer'; +import Footer from '@/component/Footer'; +import NextPage from '@/component/NextPage'; +import useWebsite from '@/shared/useWebsite'; + import BelongHere from './BelongHere'; import CollageSection from './Collage'; import Diversity from './Diversity'; diff --git a/src/component/Footer/HorizontalFooter/index.tsx b/src/component/Footer/HorizontalFooter/index.tsx index 0d969a04..6752371e 100644 --- a/src/component/Footer/HorizontalFooter/index.tsx +++ b/src/component/Footer/HorizontalFooter/index.tsx @@ -1,14 +1,14 @@ import React from 'react'; -import '../style.css'; +import '@/component/Footer/style.css'; import { useNavigate } from 'react-router-dom'; -import GenerateLogo from '../../../assets/images/landingpage-v2/footerlogo.svg'; //"../../assets/images/landingpage-v2/footerlogo.svg"; -import ShadowedButton from '../../ShadowedButton'; -import { SocialIcon } from '../../SocialIcon'; -import { socialIcons } from '../../socialIcons'; -import FooterLink from '../FooterLink'; -import { pages } from '../pages'; +import GenerateLogo from '@/assets/images/landingpage-v2/footerlogo.svg'; //"../../assets/images/landingpage-v2/footerlogo.svg"; +import FooterLink from '@/component/Footer/FooterLink'; +import { pages } from '@/component/Footer/pages'; +import ShadowedButton from '@/component/ShadowedButton'; +import { SocialIcon } from '@/component/SocialIcon'; +import { socialIcons } from '@/component/socialIcons'; function HorizontalFooter() { const navigate = useNavigate(); diff --git a/src/component/Footer/VerticalFooter/index.tsx b/src/component/Footer/VerticalFooter/index.tsx index 25248f14..448dfe59 100644 --- a/src/component/Footer/VerticalFooter/index.tsx +++ b/src/component/Footer/VerticalFooter/index.tsx @@ -1,14 +1,14 @@ import React from 'react'; -import '../style.css'; +import '@/component/Footer/style.css'; import { useNavigate } from 'react-router-dom'; -import GenerateLogo from '../../../assets/images/landingpage-v2/footerlogo.svg'; -import ShadowedButton from '../../ShadowedButton'; -import { SocialIcon } from '../../SocialIcon'; -import { socialIcons } from '../../socialIcons'; -import FooterLink from '../FooterLink'; -import { pages } from '../pages'; +import GenerateLogo from '@/assets/images/landingpage-v2/footerlogo.svg'; +import FooterLink from '@/component/Footer/FooterLink'; +import { pages } from '@/component/Footer/pages'; +import ShadowedButton from '@/component/ShadowedButton'; +import { SocialIcon } from '@/component/SocialIcon'; +import { socialIcons } from '@/component/socialIcons'; function VerticalFooter() { const currentPageUrl = window.location.href; diff --git a/src/component/Footer/index.tsx b/src/component/Footer/index.tsx index 677b140a..c6019536 100644 --- a/src/component/Footer/index.tsx +++ b/src/component/Footer/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import useWebsite from '../../shared/useWebsite'; +import useWebsite from '@/shared/useWebsite'; + import HorizontalFooter from './HorizontalFooter'; import VerticalFooter from './VerticalFooter'; diff --git a/src/component/LandingPage/MemberInfoSession/index.tsx b/src/component/LandingPage/MemberInfoSession/index.tsx index a619ab57..5ccebc64 100644 --- a/src/component/LandingPage/MemberInfoSession/index.tsx +++ b/src/component/LandingPage/MemberInfoSession/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import PopupAd from '../PopupAd'; +import PopupAd from '@/component/LandingPage/PopupAd'; + import puzzle from './assets/gen-puzzle.svg'; import './style.css'; diff --git a/src/component/NavBar/index.tsx b/src/component/NavBar/index.tsx index 2c029f97..c70d97aa 100644 --- a/src/component/NavBar/index.tsx +++ b/src/component/NavBar/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import './style.css'; -import GenerateLogo from '../../assets/images/landingpage/affiliateorgintros/Generate Logo_Nav.png'; +import GenerateLogo from '@/assets/images/landingpage/affiliateorgintros/Generate Logo_Nav.png'; const NavBar = () => { const currentUrl = window.location.href.split('/').at(-1); diff --git a/src/component/NextPage/index.tsx b/src/component/NextPage/index.tsx index 4c1303a5..31c51b98 100644 --- a/src/component/NextPage/index.tsx +++ b/src/component/NextPage/index.tsx @@ -1,5 +1,5 @@ import './style.css'; -import Arrow from '../../assets/images/nextpage/arrow.svg'; +import Arrow from '@/assets/images/nextpage/arrow.svg'; type NextPageProps = { url: string; diff --git a/src/component/ProjectsPage/AllProjects/AllProjects.tsx b/src/component/ProjectsPage/AllProjects/AllProjects.tsx index d9f88035..29f9ef6b 100644 --- a/src/component/ProjectsPage/AllProjects/AllProjects.tsx +++ b/src/component/ProjectsPage/AllProjects/AllProjects.tsx @@ -1,13 +1,14 @@ import './style.css'; import { useState } from 'react'; -import Alia from '../../../assets/images/projectspage/alia.svg'; -import Arctic from '../../../assets/images/projectspage/arctic.svg'; -import AutoPasser from '../../../assets/images/projectspage/autopasser.svg'; -import HotDate from '../../../assets/images/projectspage/hotdate.svg'; -import Jurni from '../../../assets/images/projectspage/jurni.svg'; -import ShowNxt from '../../../assets/images/projectspage/shownxt.svg'; -import toPairs from '../../../shared/toPairs'; +import Alia from '@/assets/images/projectspage/alia.svg'; +import Arctic from '@/assets/images/projectspage/arctic.svg'; +import AutoPasser from '@/assets/images/projectspage/autopasser.svg'; +import HotDate from '@/assets/images/projectspage/hotdate.svg'; +import Jurni from '@/assets/images/projectspage/jurni.svg'; +import ShowNxt from '@/assets/images/projectspage/shownxt.svg'; +import toPairs from '@/shared/toPairs'; + import Project from './Project/Project'; import type { ProjectTeam } from './Project/Project'; diff --git a/src/component/ProjectsPage/AllProjects/Project/Project.tsx b/src/component/ProjectsPage/AllProjects/Project/Project.tsx index ee3c66a1..0707f4ed 100644 --- a/src/component/ProjectsPage/AllProjects/Project/Project.tsx +++ b/src/component/ProjectsPage/AllProjects/Project/Project.tsx @@ -1,6 +1,6 @@ import './style.css'; -import Hardware from '../../../../assets/images/projectspage/hardware.svg'; -import Software from '../../../../assets/images/projectspage/software.svg'; +import Hardware from '@/assets/images/projectspage/hardware.svg'; +import Software from '@/assets/images/projectspage/software.svg'; export type ProjectTeam = 'hardware' | 'software'; diff --git a/src/component/ProjectsPage/FeaturedProjects/FeaturedProjects.tsx b/src/component/ProjectsPage/FeaturedProjects/FeaturedProjects.tsx index ae2c031b..5e4ff758 100644 --- a/src/component/ProjectsPage/FeaturedProjects/FeaturedProjects.tsx +++ b/src/component/ProjectsPage/FeaturedProjects/FeaturedProjects.tsx @@ -1,12 +1,13 @@ import React, { useState } from 'react'; -import Arrow from '../../../assets/images/projectspage/arrowbutton.svg'; +import Arrow from '@/assets/images/projectspage/arrowbutton.svg'; + import './style.css'; -import Projects from '../../../data/featuredProjectData'; -import type { FeaturedProject } from '../../../data/featuredProjectData'; -import useWebsite from '../../../shared/useWebsite'; -import NavBar from '../../NavBar'; -import ShadowedButton from '../../ShadowedButton'; +import NavBar from '@/component/NavBar'; +import ShadowedButton from '@/component/ShadowedButton'; +import Projects from '@/data/featuredProjectData'; +import type { FeaturedProject } from '@/data/featuredProjectData'; +import useWebsite from '@/shared/useWebsite'; type FeaturedProjectsViewProps = { handleProject: (dir: number) => void; diff --git a/src/component/ProjectsPage/index.tsx b/src/component/ProjectsPage/index.tsx index 4cc8ae50..497f9ec0 100644 --- a/src/component/ProjectsPage/index.tsx +++ b/src/component/ProjectsPage/index.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import NewMobileContainer from '../../component/DesktopMobileHandler/NewMobileContainer'; -import useWebsite from '../../shared/useWebsite'; -import HorizontalDesktopContainer from '../DesktopMobileHandler/HorizontalDesktopContainer'; -import Footer from '../Footer'; -import NextPage from '../NextPage'; +import HorizontalDesktopContainer from '@/component/DesktopMobileHandler/HorizontalDesktopContainer'; +import NewMobileContainer from '@/component/DesktopMobileHandler/NewMobileContainer'; +import Footer from '@/component/Footer'; +import NextPage from '@/component/NextPage'; +import useWebsite from '@/shared/useWebsite'; + import AllProjects from './AllProjects/AllProjects'; import FeaturedProjects from './FeaturedProjects/FeaturedProjects'; diff --git a/src/component/ShadowedButton/index.tsx b/src/component/ShadowedButton/index.tsx index b58757a2..9756960d 100644 --- a/src/component/ShadowedButton/index.tsx +++ b/src/component/ShadowedButton/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import type { ReactNode } from 'react'; import './style.css'; -import { constants } from '../../assets/constants'; +import { constants } from '@/assets/constants'; type ShadowedButtonProps = { text: ReactNode; diff --git a/src/component/socialIcons.ts b/src/component/socialIcons.ts index 9c6d673e..9b36ecf5 100644 --- a/src/component/socialIcons.ts +++ b/src/component/socialIcons.ts @@ -1,10 +1,10 @@ -import FbIcon from '../assets/images/socialMediaIcons/Facebook.svg?react'; -import InstaIcon from '../assets/images/socialMediaIcons/Insta.svg?react'; -import LinkedInIcon from '../assets/images/socialMediaIcons/Linkedin.svg?react'; -import MosaicIcon from '../assets/images/socialMediaIcons/Mosaic.svg?react'; -import NortheasternIcon from '../assets/images/socialMediaIcons/Northeaster.svg?react'; -import Sherm from '../assets/images/socialMediaIcons/Sherm.svg?react'; -import YoutubeIcon from '../assets/images/socialMediaIcons/Youtube.svg?react'; +import FbIcon from '@/assets/images/socialMediaIcons/Facebook.svg?react'; +import InstaIcon from '@/assets/images/socialMediaIcons/Insta.svg?react'; +import LinkedInIcon from '@/assets/images/socialMediaIcons/Linkedin.svg?react'; +import MosaicIcon from '@/assets/images/socialMediaIcons/Mosaic.svg?react'; +import NortheasternIcon from '@/assets/images/socialMediaIcons/Northeaster.svg?react'; +import Sherm from '@/assets/images/socialMediaIcons/Sherm.svg?react'; +import YoutubeIcon from '@/assets/images/socialMediaIcons/Youtube.svg?react'; export const socialIcons = [ [ diff --git a/src/data/ApplyData/types.ts b/src/data/ApplyData/types.ts index 7a14f36b..702de228 100644 --- a/src/data/ApplyData/types.ts +++ b/src/data/ApplyData/types.ts @@ -1,4 +1,4 @@ -import type { Team } from '../teams'; +import type { Team } from '@/data/teams'; export type ApplicationGroup = Team | 'clients'; diff --git a/src/data/featuredProjectData.ts b/src/data/featuredProjectData.ts index ed1d97cc..5292ee9b 100644 --- a/src/data/featuredProjectData.ts +++ b/src/data/featuredProjectData.ts @@ -1,5 +1,5 @@ -import EarnzMockUp from '../assets/images/landingpage-v2/Earnz_Mock_Up.png'; -import SmartyPillMockup from '../assets/images/landingpage-v2/SmartyPill Mock Up.png'; +import EarnzMockUp from '@/assets/images/landingpage-v2/Earnz_Mock_Up.png'; +import SmartyPillMockup from '@/assets/images/landingpage-v2/SmartyPill Mock Up.png'; export type FeaturedProject = { name: string; diff --git a/src/data/teamPageDetails.ts b/src/data/teamPageDetails.ts index 1005dcde..c7fa1bc4 100644 --- a/src/data/teamPageDetails.ts +++ b/src/data/teamPageDetails.ts @@ -1,18 +1,19 @@ -import CommunityActiveIcon from '../assets/icons/teams/colored/Community.png'; -import HardwareActiveIcon from '../assets/icons/teams/colored/Hardware.png'; -import ManagementActiveIcon from '../assets/icons/teams/colored/Management.png'; -import OperationsActiveIcon from '../assets/icons/teams/colored/Operations.png'; -import SoftwareActiveIcon from '../assets/icons/teams/colored/Software.png'; -import CommunityInactiveIcon from '../assets/icons/teams/gray/Community.png'; -import HardwareInactiveIcon from '../assets/icons/teams/gray/Hardware.png'; -import ManagementInactiveIcon from '../assets/icons/teams/gray/Management.png'; -import OperationsInactiveIcon from '../assets/icons/teams/gray/Operations.png'; -import SoftwareInactiveIcon from '../assets/icons/teams/gray/Software.png'; -import ManagementLargePicture from '../assets/images/TeamsPageImages/TeamsPagePH1.png'; -import OperationsLargePicture from '../assets/images/TeamsPageImages/TeamsPagePH2.png'; -import SoftwareLargePicture from '../assets/images/TeamsPageImages/TeamsPagePH3.png'; -import HardwareLargePicture from '../assets/images/TeamsPageImages/TeamsPagePH4.png'; -import EngagementLargePicture from '../assets/images/TeamsPageImages/TeamsPagePH5.png'; +import CommunityActiveIcon from '@/assets/icons/teams/colored/Community.png'; +import HardwareActiveIcon from '@/assets/icons/teams/colored/Hardware.png'; +import ManagementActiveIcon from '@/assets/icons/teams/colored/Management.png'; +import OperationsActiveIcon from '@/assets/icons/teams/colored/Operations.png'; +import SoftwareActiveIcon from '@/assets/icons/teams/colored/Software.png'; +import CommunityInactiveIcon from '@/assets/icons/teams/gray/Community.png'; +import HardwareInactiveIcon from '@/assets/icons/teams/gray/Hardware.png'; +import ManagementInactiveIcon from '@/assets/icons/teams/gray/Management.png'; +import OperationsInactiveIcon from '@/assets/icons/teams/gray/Operations.png'; +import SoftwareInactiveIcon from '@/assets/icons/teams/gray/Software.png'; +import ManagementLargePicture from '@/assets/images/TeamsPageImages/TeamsPagePH1.png'; +import OperationsLargePicture from '@/assets/images/TeamsPageImages/TeamsPagePH2.png'; +import SoftwareLargePicture from '@/assets/images/TeamsPageImages/TeamsPagePH3.png'; +import HardwareLargePicture from '@/assets/images/TeamsPageImages/TeamsPagePH4.png'; +import EngagementLargePicture from '@/assets/images/TeamsPageImages/TeamsPagePH5.png'; + import type { Team } from './teams'; // yellow - "#FFBF3C" diff --git a/src/pages/ApplyPageV2/RoleCategory/index.tsx b/src/pages/ApplyPageV2/RoleCategory/index.tsx index c654d745..dc4dd352 100644 --- a/src/pages/ApplyPageV2/RoleCategory/index.tsx +++ b/src/pages/ApplyPageV2/RoleCategory/index.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react'; import './style.css'; -import type { ApplicationRole } from '../types'; +import type { ApplicationRole } from '@/pages/ApplyPageV2/types'; type RoleCategoryProps = { roleCategory?: { diff --git a/src/pages/ApplyPageV2/TeamApplicationCard/index.tsx b/src/pages/ApplyPageV2/TeamApplicationCard/index.tsx index f98b353e..fff12fd6 100644 --- a/src/pages/ApplyPageV2/TeamApplicationCard/index.tsx +++ b/src/pages/ApplyPageV2/TeamApplicationCard/index.tsx @@ -1,12 +1,13 @@ import React, { useState } from 'react'; -import RightArrow from '../../../assets/images/applypage-v2/RightArrow'; -import WhiteDownArrow from '../../../assets/images/applypage-v2/WhiteDownArrow.svg?react'; -import WhiteUpArrow from '../../../assets/images/applypage-v2/WhiteUpArrow.svg?react'; -import RoleCategory from '../RoleCategory'; -import Tag from '../Tag'; +import RightArrow from '@/assets/images/applypage-v2/RightArrow'; +import WhiteDownArrow from '@/assets/images/applypage-v2/WhiteDownArrow.svg?react'; +import WhiteUpArrow from '@/assets/images/applypage-v2/WhiteUpArrow.svg?react'; +import RoleCategory from '@/pages/ApplyPageV2/RoleCategory'; +import Tag from '@/pages/ApplyPageV2/Tag'; + import './style.css'; -import type { ApplicationRole, ApplyTeam } from '../types'; +import type { ApplicationRole, ApplyTeam } from '@/pages/ApplyPageV2/types'; type TeamApplicationCardProps = { team: ApplyTeam; diff --git a/src/pages/ApplyPageV2/index.tsx b/src/pages/ApplyPageV2/index.tsx index afeaa2a4..96b93934 100644 --- a/src/pages/ApplyPageV2/index.tsx +++ b/src/pages/ApplyPageV2/index.tsx @@ -1,9 +1,10 @@ import React, { useMemo } from 'react'; -import NavBar from '../../component/NavBar'; -import { useSanity } from '../../services/useSanity'; -import useWebsite from '../../shared/useWebsite'; -import Footer from '../LandingPageV3/Footer'; +import NavBar from '@/component/NavBar'; +import Footer from '@/pages/LandingPageV3/Footer'; +import { useSanity } from '@/services/useSanity'; +import useWebsite from '@/shared/useWebsite'; + import TeamApplicationCard from './TeamApplicationCard'; import './style.css'; import type { ApplyTeam, SanityApplyTeam } from './types'; diff --git a/src/pages/LandingPageV3/CelebrateOurWins/index.tsx b/src/pages/LandingPageV3/CelebrateOurWins/index.tsx index 85c43a6b..5b3f37ec 100644 --- a/src/pages/LandingPageV3/CelebrateOurWins/index.tsx +++ b/src/pages/LandingPageV3/CelebrateOurWins/index.tsx @@ -1,15 +1,15 @@ import React, { useMemo, useState } from 'react'; -import NextArrow from '../../../assets/icons/arrows/nextArrowRight.svg?react'; -import PrevArrow from '../../../assets/icons/arrows/prevArrowLeft.svg?react'; -import celebrate from '../../../assets/images/aboutpage/spirited.jpg'; -import LargeStars from '../../../assets/images/landingpage-v3/LargeShowcaseStars.svg?react'; -import LeftArrow from '../../../assets/images/landingpage-v3/LeftTriangleArrow.svg?react'; -import RightArrow from '../../../assets/images/landingpage-v3/RightTriangleArrow.svg?react'; -import SmallStars from '../../../assets/images/landingpage-v3/SmallShowcaseStars.svg?react'; -import { urlFor } from '../../../client'; -import { useSanity } from '../../../services/useSanity'; -import type { Copy, SanityShowcase, Showcase } from '../types'; +import NextArrow from '@/assets/icons/arrows/nextArrowRight.svg?react'; +import PrevArrow from '@/assets/icons/arrows/prevArrowLeft.svg?react'; +import celebrate from '@/assets/images/aboutpage/spirited.jpg'; +import LargeStars from '@/assets/images/landingpage-v3/LargeShowcaseStars.svg?react'; +import LeftArrow from '@/assets/images/landingpage-v3/LeftTriangleArrow.svg?react'; +import RightArrow from '@/assets/images/landingpage-v3/RightTriangleArrow.svg?react'; +import SmallStars from '@/assets/images/landingpage-v3/SmallShowcaseStars.svg?react'; +import { urlFor } from '@/client'; +import type { Copy, SanityShowcase, Showcase } from '@/pages/LandingPageV3/types'; +import { useSanity } from '@/services/useSanity'; type ShowcaseLabelProps = { showcase: Showcase; diff --git a/src/pages/LandingPageV3/ChooseYourCharacter/index.tsx b/src/pages/LandingPageV3/ChooseYourCharacter/index.tsx index e4ad7960..2a03bfa7 100644 --- a/src/pages/LandingPageV3/ChooseYourCharacter/index.tsx +++ b/src/pages/LandingPageV3/ChooseYourCharacter/index.tsx @@ -1,10 +1,11 @@ import React, { useMemo, useState } from 'react'; -import ArcadeMachine from '../../../assets/images/landingpage-v3/DynamicArcadeMachine'; -import ArcadeText from '../../../assets/images/landingpage-v3/DynamicArcadeText'; -import { urlFor } from '../../../client'; -import { useSanity } from '../../../services/useSanity'; -import type { Branch, Director, SanityBranch, SanityDirector } from '../types'; +import ArcadeMachine from '@/assets/images/landingpage-v3/DynamicArcadeMachine'; +import ArcadeText from '@/assets/images/landingpage-v3/DynamicArcadeText'; +import { urlFor } from '@/client'; +import type { Branch, Director, SanityBranch, SanityDirector } from '@/pages/LandingPageV3/types'; +import { useSanity } from '@/services/useSanity'; + import Mascot from './Mascot'; type MascotRadioButtonProps = { diff --git a/src/pages/LandingPageV3/Footer/MobileFooter.tsx b/src/pages/LandingPageV3/Footer/MobileFooter.tsx index 46e49d9d..ca254bef 100644 --- a/src/pages/LandingPageV3/Footer/MobileFooter.tsx +++ b/src/pages/LandingPageV3/Footer/MobileFooter.tsx @@ -1,11 +1,12 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; -import UpArrowMobile from '../../../assets/icons/arrows/upArrowMobile.svg'; -import Email from '../../../assets/icons/socials/Email.svg?react'; -import Instagram from '../../../assets/icons/socials/Instagram.svg?react'; -import LinkedIn from '../../../assets/icons/socials/LinkedIn.svg?react'; -import ShadowedButton from '../../../component/ShadowedButton'; +import UpArrowMobile from '@/assets/icons/arrows/upArrowMobile.svg'; +import Email from '@/assets/icons/socials/Email.svg?react'; +import Instagram from '@/assets/icons/socials/Instagram.svg?react'; +import LinkedIn from '@/assets/icons/socials/LinkedIn.svg?react'; +import ShadowedButton from '@/component/ShadowedButton'; + import FooterLink from './FooterLink'; import { pages } from './pages'; diff --git a/src/pages/LandingPageV3/Footer/WebFooter.tsx b/src/pages/LandingPageV3/Footer/WebFooter.tsx index d00e9295..e2ed9664 100644 --- a/src/pages/LandingPageV3/Footer/WebFooter.tsx +++ b/src/pages/LandingPageV3/Footer/WebFooter.tsx @@ -1,11 +1,12 @@ import React from 'react'; -import UpArrow from '../../../assets/icons/arrows/upArrow.svg'; -import Email from '../../../assets/icons/socials/Email.svg?react'; -import Instagram from '../../../assets/icons/socials/Instagram.svg?react'; -import LinkedIn from '../../../assets/icons/socials/LinkedIn.svg?react'; -import GenerateLogo from '../../../assets/images/landingpage-v2/footerlogo.svg'; //"../../assets/images/landingpage-v2/footerlogo.svg"; -import ShadowedButton from '../../../component/ShadowedButton'; +import UpArrow from '@/assets/icons/arrows/upArrow.svg'; +import Email from '@/assets/icons/socials/Email.svg?react'; +import Instagram from '@/assets/icons/socials/Instagram.svg?react'; +import LinkedIn from '@/assets/icons/socials/LinkedIn.svg?react'; +import GenerateLogo from '@/assets/images/landingpage-v2/footerlogo.svg'; //"../../assets/images/landingpage-v2/footerlogo.svg"; +import ShadowedButton from '@/component/ShadowedButton'; + import FooterLink from './FooterLink'; import { pages } from './pages'; diff --git a/src/pages/LandingPageV3/Footer/index.tsx b/src/pages/LandingPageV3/Footer/index.tsx index c674dd80..d17b1783 100644 --- a/src/pages/LandingPageV3/Footer/index.tsx +++ b/src/pages/LandingPageV3/Footer/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; -import useWebsite from '../../../shared/useWebsite'; +import useWebsite from '@/shared/useWebsite'; + import MobileFooter from './MobileFooter'; import WebFooter from './WebFooter'; diff --git a/src/pages/LandingPageV3/HowWereStructured/index.tsx b/src/pages/LandingPageV3/HowWereStructured/index.tsx index 716a320a..72dda295 100644 --- a/src/pages/LandingPageV3/HowWereStructured/index.tsx +++ b/src/pages/LandingPageV3/HowWereStructured/index.tsx @@ -1,9 +1,10 @@ import React, { useMemo, useState } from 'react'; -import { urlFor } from '../../../client'; -import { useSanity } from '../../../services/useSanity'; +import { urlFor } from '@/client'; +import type { Copy, SanityStructuredTeam, StructuredTeam } from '@/pages/LandingPageV3/types'; + import './style.css'; -import type { Copy, SanityStructuredTeam, StructuredTeam } from '../types'; +import { useSanity } from '@/services/useSanity'; const ARC_STEPS = 16; diff --git a/src/pages/LandingPageV3/Navigation/index.tsx b/src/pages/LandingPageV3/Navigation/index.tsx index 3bc7d568..331b11c8 100644 --- a/src/pages/LandingPageV3/Navigation/index.tsx +++ b/src/pages/LandingPageV3/Navigation/index.tsx @@ -1,8 +1,8 @@ -import Email from '../../../assets/icons/socials/Email.svg?react'; -import Instagram from '../../../assets/icons/socials/Instagram.svg?react'; -import LinkedIn from '../../../assets/icons/socials/LinkedIn.svg?react'; -import DownArrow from '../../../assets/images/landingpage-v3/DownArrow.svg?react'; -import GenerateLogo from '../../../assets/images/landingpage-v3/GenerateLogo.svg?react'; +import Email from '@/assets/icons/socials/Email.svg?react'; +import Instagram from '@/assets/icons/socials/Instagram.svg?react'; +import LinkedIn from '@/assets/icons/socials/LinkedIn.svg?react'; +import DownArrow from '@/assets/images/landingpage-v3/DownArrow.svg?react'; +import GenerateLogo from '@/assets/images/landingpage-v3/GenerateLogo.svg?react'; type NavigationProps = { scrollToWhatIsGenerate: () => void; diff --git a/src/pages/LandingPageV3/ParentOrgs/index.tsx b/src/pages/LandingPageV3/ParentOrgs/index.tsx index daa02372..07e0990d 100644 --- a/src/pages/LandingPageV3/ParentOrgs/index.tsx +++ b/src/pages/LandingPageV3/ParentOrgs/index.tsx @@ -1,5 +1,5 @@ -import MosaicLogo from '../../../assets/images/landingpage-v3/MosaicLogo.svg?react'; -import ShermLogo from '../../../assets/images/landingpage-v3/ShermanLogo.svg?react'; +import MosaicLogo from '@/assets/images/landingpage-v3/MosaicLogo.svg?react'; +import ShermLogo from '@/assets/images/landingpage-v3/ShermanLogo.svg?react'; export default function ParentOrgs() { return ( diff --git a/src/pages/LandingPageV3/WeAre/index.tsx b/src/pages/LandingPageV3/WeAre/index.tsx index 49049053..e798a197 100644 --- a/src/pages/LandingPageV3/WeAre/index.tsx +++ b/src/pages/LandingPageV3/WeAre/index.tsx @@ -1,6 +1,6 @@ -import weare from '../../../assets/images/landingpage/weare/weare.jpg'; -import { useSanity } from '../../../services/useSanity'; -import type { Value } from '../types'; +import weare from '@/assets/images/landingpage/weare/weare.jpg'; +import type { Value } from '@/pages/LandingPageV3/types'; +import { useSanity } from '@/services/useSanity'; export default function WeAre() { const query = `*[_type == "value"] {value, index} | order(index asc)`; diff --git a/src/pages/LandingPageV3/WhatIsGenerate/index.tsx b/src/pages/LandingPageV3/WhatIsGenerate/index.tsx index 70aa35f0..d35095b0 100644 --- a/src/pages/LandingPageV3/WhatIsGenerate/index.tsx +++ b/src/pages/LandingPageV3/WhatIsGenerate/index.tsx @@ -1,10 +1,10 @@ import React from 'react'; import type { Ref } from 'react'; -import showcase from '../../../assets/images/landingpage/weare/showcase.jpg'; -import workshop from '../../../assets/images/landingpage/weare/workshop.jpg'; -import { useSanity } from '../../../services/useSanity'; -import type { Copy } from '../types'; +import showcase from '@/assets/images/landingpage/weare/showcase.jpg'; +import workshop from '@/assets/images/landingpage/weare/workshop.jpg'; +import type { Copy } from '@/pages/LandingPageV3/types'; +import { useSanity } from '@/services/useSanity'; type WhatIsGenerateProps = { ref?: Ref; diff --git a/src/pages/LandingPageV3/WhyGenerate/index.tsx b/src/pages/LandingPageV3/WhyGenerate/index.tsx index 76fab716..f161e622 100644 --- a/src/pages/LandingPageV3/WhyGenerate/index.tsx +++ b/src/pages/LandingPageV3/WhyGenerate/index.tsx @@ -1,8 +1,8 @@ -import clients from '../../../assets/images/landingpage/weare/cstar.jpg'; -import members from '../../../assets/images/landingpage/weare/members.JPG'; -import partners from '../../../assets/images/landingpage/weare/overhead.jpg'; -import { useSanity } from '../../../services/useSanity'; -import type { Copy } from '../types'; +import clients from '@/assets/images/landingpage/weare/cstar.jpg'; +import members from '@/assets/images/landingpage/weare/members.JPG'; +import partners from '@/assets/images/landingpage/weare/overhead.jpg'; +import type { Copy } from '@/pages/LandingPageV3/types'; +import { useSanity } from '@/services/useSanity'; export default function WhyGenerate() { const query1 = `*[_type == "copy" && key == "why-generate-1"]{header, content}`; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured.tsx index 61619f0f..b1413338 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured.tsx @@ -1,5 +1,6 @@ -import type { Team } from '../../../../data/teams'; -import useWebsite from '../../../../shared/useWebsite'; +import type { Team } from '@/data/teams'; +import useWebsite from '@/shared/useWebsite'; + import FeatureTextRow from './featureTextRow'; import { ExpandedTeamsJSON } from './JSONFiles/ExpandedTeamsJSON'; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/ExpandedTeamsJSON.ts b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/ExpandedTeamsJSON.ts index 85384937..8a07a48c 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/ExpandedTeamsJSON.ts +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/ExpandedTeamsJSON.ts @@ -1,15 +1,16 @@ -import Engagement1 from '../../../../../assets/images/TeamsPageImages/engagement1.jpg'; -import Engagement2 from '../../../../../assets/images/TeamsPageImages/engagement2.jpg'; -import Hardware2 from '../../../../../assets/images/TeamsPageImages/fallshowcase-43.jpg'; -import Hardware1 from '../../../../../assets/images/TeamsPageImages/hardware1.jpg'; -import Leads from '../../../../../assets/images/TeamsPageImages/leads.jpg'; -import Legacy from '../../../../../assets/images/TeamsPageImages/legacy.jpg'; -import Management1 from '../../../../../assets/images/TeamsPageImages/management1.jpg'; -import Management2 from '../../../../../assets/images/TeamsPageImages/management2.jpg'; -import Operations1 from '../../../../../assets/images/TeamsPageImages/operations1.jpg'; -import Operations2 from '../../../../../assets/images/TeamsPageImages/operations2.jpg'; -import TeamsStock from '../../../../../assets/images/TeamsPageImages/TeamsStockPhoto.svg'; -import type { Team } from '../../../../../data/teams'; +import Engagement1 from '@/assets/images/TeamsPageImages/engagement1.jpg'; +import Engagement2 from '@/assets/images/TeamsPageImages/engagement2.jpg'; +import Hardware2 from '@/assets/images/TeamsPageImages/fallshowcase-43.jpg'; +import Hardware1 from '@/assets/images/TeamsPageImages/hardware1.jpg'; +import Leads from '@/assets/images/TeamsPageImages/leads.jpg'; +import Legacy from '@/assets/images/TeamsPageImages/legacy.jpg'; +import Management1 from '@/assets/images/TeamsPageImages/management1.jpg'; +import Management2 from '@/assets/images/TeamsPageImages/management2.jpg'; +import Operations1 from '@/assets/images/TeamsPageImages/operations1.jpg'; +import Operations2 from '@/assets/images/TeamsPageImages/operations2.jpg'; +import TeamsStock from '@/assets/images/TeamsPageImages/TeamsStockPhoto.svg'; +import type { Team } from '@/data/teams'; + import type { ExpandedTeam } from './types'; // What Youll learn could probably be added here? diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/RolesJSON.ts b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/RolesJSON.ts index 9e120ac3..c771fb6c 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/RolesJSON.ts +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/RolesJSON.ts @@ -1,4 +1,5 @@ -import type { Team } from '../../../../../data/teams'; +import type { Team } from '@/data/teams'; + import type { TeamRoles } from './types'; export const RolesJSON: Record = { diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/WhatYouLearnJSON.ts b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/WhatYouLearnJSON.ts index c3c67696..07be4e1d 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/WhatYouLearnJSON.ts +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/JSONFiles/WhatYouLearnJSON.ts @@ -1,5 +1,6 @@ -import TeamsStock from '../../../../../assets/images/TeamsPageImages/TeamsStockPhoto.svg'; -import type { Team } from '../../../../../data/teams'; +import TeamsStock from '@/assets/images/TeamsPageImages/TeamsStockPhoto.svg'; +import type { Team } from '@/data/teams'; + import type { WhatYouLearnTeam } from './types'; export const WhatYouLearnJSON: Partial> = { diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Members.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Members.tsx index f5f12f6b..266cf423 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Members.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Members.tsx @@ -1,8 +1,9 @@ import { Fragment } from 'react'; -import type { Team } from '../../../../data/teams'; -import toPairs from '../../../../shared/toPairs'; -import useWebsite from '../../../../shared/useWebsite'; +import type { Team } from '@/data/teams'; +import toPairs from '@/shared/toPairs'; +import useWebsite from '@/shared/useWebsite'; + import { RolesJSON } from './JSONFiles/RolesJSON'; import type { RoleGroup } from './JSONFiles/types'; import './style.css'; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles.tsx index c32051d4..1bf77a49 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles.tsx @@ -1,7 +1,8 @@ import type { ReactNode } from 'react'; -import type { Team } from '../../../../data/teams'; -import useWebsite from '../../../../shared/useWebsite'; +import type { Team } from '@/data/teams'; +import useWebsite from '@/shared/useWebsite'; + import { ExpandedTeamsJSON } from './JSONFiles/ExpandedTeamsJSON'; import { RolesJSON } from './JSONFiles/RolesJSON'; import RoleContainer from './RoleContainer'; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/SocialIcons.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/SocialIcons.tsx index 79097e75..157821b0 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/SocialIcons.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/SocialIcons.tsx @@ -2,8 +2,8 @@ import React, { Fragment } from 'react'; import { Col, Row } from 'react-bootstrap'; import './footerStyle.css'; -import { SocialIcon } from '../../../../component/SocialIcon'; -import { socialIcons } from '../../../../component/socialIcons'; +import { SocialIcon } from '@/component/SocialIcon'; +import { socialIcons } from '@/component/socialIcons'; type SocialIconsProps = { mobile: boolean; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/TeamPageFooter.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/TeamPageFooter.tsx index 328ddf35..25f6ac3b 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/TeamPageFooter.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/TeamPageFooter.tsx @@ -2,11 +2,13 @@ import React from 'react'; import { Container } from 'react-bootstrap'; import { useNavigate } from 'react-router-dom'; -import GenerateLogo from '../../../../assets/images/landingpage-v2/footerlogo.svg'; +import GenerateLogo from '@/assets/images/landingpage-v2/footerlogo.svg'; + import './footerStyle.css'; -import Arrow from '../../../../assets/images/projectspage/arrowbutton.svg'; -import ShadowedButton from '../../../../component/ShadowedButton'; -import useWebsite from '../../../../shared/useWebsite'; +import Arrow from '@/assets/images/projectspage/arrowbutton.svg'; +import ShadowedButton from '@/component/ShadowedButton'; +import useWebsite from '@/shared/useWebsite'; + import SocialIcons from './SocialIcons'; type FooterPage = { diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearn.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearn.tsx index b7608956..1517ce11 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearn.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearn.tsx @@ -1,7 +1,7 @@ import React from 'react'; import './style.css'; -import useWebsite from '../../../../shared/useWebsite'; +import useWebsite from '@/shared/useWebsite'; type TextRowProps = { title: string; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer.tsx index 0e11b1a9..ade406ab 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer.tsx @@ -1,7 +1,8 @@ import React from 'react'; import './style.css'; -import type { Team } from '../../../../data/teams'; +import type { Team } from '@/data/teams'; + import { WhatYouLearnJSON } from './JSONFiles/WhatYouLearnJSON'; import WhatYouLearn from './WhatYouLearn'; diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/featureTextRow.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/featureTextRow.tsx index f044a32a..00e04a5e 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/featureTextRow.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/featureTextRow.tsx @@ -1,7 +1,8 @@ import { useNavigate } from 'react-router-dom'; -import ShadowedButton from '../../../../component/ShadowedButton'; -import useWebsite from '../../../../shared/useWebsite'; +import ShadowedButton from '@/component/ShadowedButton'; +import useWebsite from '@/shared/useWebsite'; + import './style.css'; type FeatureTextRowProps = { diff --git a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/textRow.tsx b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/textRow.tsx index 8f7a5529..3a696ee0 100644 --- a/src/pages/TeamsPage/ExpandedTeams/CommonTeam/textRow.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/CommonTeam/textRow.tsx @@ -1,7 +1,7 @@ import React from 'react'; import './style.css'; -import useWebsite from '../../../../shared/useWebsite'; +import useWebsite from '@/shared/useWebsite'; type TextRowProps = { title: string; diff --git a/src/pages/TeamsPage/ExpandedTeams/Engagement/index.tsx b/src/pages/TeamsPage/ExpandedTeams/Engagement/index.tsx index 5b43f71e..eb8f2356 100644 --- a/src/pages/TeamsPage/ExpandedTeams/Engagement/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/Engagement/index.tsx @@ -1,7 +1,8 @@ -import Featured from '../CommonTeam/Featured'; -import Members from '../CommonTeam/Members'; -import OurRoles from '../CommonTeam/OurRoles'; -import Roles from '../CommonTeam/Roles'; +import Featured from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured'; +import Members from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Members'; +import OurRoles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/OurRoles'; +import Roles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles'; + import './style.css'; export default function EngagementContainer() { diff --git a/src/pages/TeamsPage/ExpandedTeams/Hardware/index.tsx b/src/pages/TeamsPage/ExpandedTeams/Hardware/index.tsx index 0964e13b..8039c870 100644 --- a/src/pages/TeamsPage/ExpandedTeams/Hardware/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/Hardware/index.tsx @@ -1,11 +1,12 @@ import React from 'react'; -import Featured from '../CommonTeam/Featured'; -import Members from '../CommonTeam/Members'; -import OurRoles from '../CommonTeam/OurRoles'; -import Roles from '../CommonTeam/Roles'; +import Featured from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured'; +import Members from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Members'; +import OurRoles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/OurRoles'; +import Roles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles'; + import './style.css'; -import { WhatYouLearnContainer } from '../CommonTeam/WhatYouLearnContainer'; +import { WhatYouLearnContainer } from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer'; export default function HardwareContainer() { return ( diff --git a/src/pages/TeamsPage/ExpandedTeams/Management/index.tsx b/src/pages/TeamsPage/ExpandedTeams/Management/index.tsx index 8e93e6b1..cbb7ed3b 100644 --- a/src/pages/TeamsPage/ExpandedTeams/Management/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/Management/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import './style.css'; -import { TEAMS } from '../../../../data/teams'; -import OurRoles from '../CommonTeam/OurRoles'; -import Roles from '../CommonTeam/Roles'; +import { TEAMS } from '@/data/teams'; +import OurRoles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/OurRoles'; +import Roles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles'; export default function ManagementContainer() { return ( diff --git a/src/pages/TeamsPage/ExpandedTeams/Operations/index.tsx b/src/pages/TeamsPage/ExpandedTeams/Operations/index.tsx index 09171eb6..72d80467 100644 --- a/src/pages/TeamsPage/ExpandedTeams/Operations/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/Operations/index.tsx @@ -1,6 +1,7 @@ -import Members from '../CommonTeam/Members'; -import OurRoles from '../CommonTeam/OurRoles'; -import Roles from '../CommonTeam/Roles'; +import Members from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Members'; +import OurRoles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/OurRoles'; +import Roles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles'; + import './style.css'; export default function OperationsContainer() { diff --git a/src/pages/TeamsPage/ExpandedTeams/Software/index.tsx b/src/pages/TeamsPage/ExpandedTeams/Software/index.tsx index b03031c5..c0e8976c 100644 --- a/src/pages/TeamsPage/ExpandedTeams/Software/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/Software/index.tsx @@ -1,11 +1,12 @@ import React from 'react'; -import Featured from '../CommonTeam/Featured'; -import Members from '../CommonTeam/Members'; -import OurRoles from '../CommonTeam/OurRoles'; -import Roles from '../CommonTeam/Roles'; +import Featured from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Featured'; +import Members from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Members'; +import OurRoles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/OurRoles'; +import Roles from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/Roles'; + import './style.css'; -import { WhatYouLearnContainer } from '../CommonTeam/WhatYouLearnContainer'; +import { WhatYouLearnContainer } from '@/pages/TeamsPage/ExpandedTeams/CommonTeam/WhatYouLearnContainer'; export default function SoftwareContainer() { return ( diff --git a/src/pages/TeamsPage/ExpandedTeams/index.tsx b/src/pages/TeamsPage/ExpandedTeams/index.tsx index 8b53852c..50d0127e 100644 --- a/src/pages/TeamsPage/ExpandedTeams/index.tsx +++ b/src/pages/TeamsPage/ExpandedTeams/index.tsx @@ -4,10 +4,11 @@ import type { ComponentType } from 'react'; import './style.css'; import { Routes, Route } from 'react-router-dom'; -import NavBar from '../../../component/NavBar'; -import { TEAMS, isTeam } from '../../../data/teams'; -import type { Team } from '../../../data/teams'; -import useWebsite from '../../../shared/useWebsite'; +import NavBar from '@/component/NavBar'; +import { TEAMS, isTeam } from '@/data/teams'; +import type { Team } from '@/data/teams'; +import useWebsite from '@/shared/useWebsite'; + import { ExpandedTeamsJSON } from './CommonTeam/JSONFiles/ExpandedTeamsJSON'; import TeamPageFooter from './CommonTeam/TeamPageFooter'; import TextRow from './CommonTeam/textRow'; diff --git a/src/pages/TeamsPage/TeamCard.tsx b/src/pages/TeamsPage/TeamCard.tsx index 88667033..27aa63ce 100644 --- a/src/pages/TeamsPage/TeamCard.tsx +++ b/src/pages/TeamsPage/TeamCard.tsx @@ -1,7 +1,7 @@ import React from 'react'; import './style.css'; -import useWebsite from '../../shared/useWebsite'; +import useWebsite from '@/shared/useWebsite'; type TeamCardProps = { color?: string; diff --git a/src/pages/TeamsPage/TeamPageAssets/MobileTeamContainer.tsx b/src/pages/TeamsPage/TeamPageAssets/MobileTeamContainer.tsx index d6b21549..633ec6de 100644 --- a/src/pages/TeamsPage/TeamPageAssets/MobileTeamContainer.tsx +++ b/src/pages/TeamsPage/TeamPageAssets/MobileTeamContainer.tsx @@ -1,13 +1,13 @@ import React from 'react'; import type { ReactNode } from 'react'; -import '../style.css'; +import '@/pages/TeamsPage/style.css'; import Row from 'react-bootstrap/esm/Row'; -import Footer from '../../../component/Footer/HorizontalFooter'; -import NavBar from '../../../component/NavBar'; -import NextPage from '../../../component/NextPage'; +import Footer from '@/component/Footer/HorizontalFooter'; +import NavBar from '@/component/NavBar'; +import NextPage from '@/component/NextPage'; type MobileTeamContainerProps = { children: ReactNode; diff --git a/src/pages/TeamsPage/TeamPageAssets/WebTeamContainer.tsx b/src/pages/TeamsPage/TeamPageAssets/WebTeamContainer.tsx index f6b48c5f..18066a53 100644 --- a/src/pages/TeamsPage/TeamPageAssets/WebTeamContainer.tsx +++ b/src/pages/TeamsPage/TeamPageAssets/WebTeamContainer.tsx @@ -1,13 +1,13 @@ import React from 'react'; import type { ReactNode } from 'react'; -import '../style.css'; +import '@/pages/TeamsPage/style.css'; import Row from 'react-bootstrap/esm/Row'; -import Footer from '../../../component/Footer'; -import NavBar from '../../../component/NavBar'; -import NextPage from '../../../component/NextPage'; +import Footer from '@/component/Footer'; +import NavBar from '@/component/NavBar'; +import NextPage from '@/component/NextPage'; type WebTeamContainerProps = { children: ReactNode; diff --git a/src/pages/TeamsPage/index.tsx b/src/pages/TeamsPage/index.tsx index 63442f04..c0c3a304 100644 --- a/src/pages/TeamsPage/index.tsx +++ b/src/pages/TeamsPage/index.tsx @@ -1,11 +1,12 @@ import React from 'react'; import './style.css'; -//import DesktopMobileScrollAndBackgroundHandler from "../../component/DesktopMobileHandler"; -import HorizontalDesktopContainer from '../../component/DesktopMobileHandler/HorizontalDesktopContainer'; -import NewMobileContainer from '../../component/DesktopMobileHandler/NewMobileContainer'; -import teamPageDetails from '../../data/teamPageDetails'; -import useWebsite from '../../shared/useWebsite'; +//import DesktopMobileScrollAndBackgroundHandler from "@/component/DesktopMobileHandler"; +import HorizontalDesktopContainer from '@/component/DesktopMobileHandler/HorizontalDesktopContainer'; +import NewMobileContainer from '@/component/DesktopMobileHandler/NewMobileContainer'; +import teamPageDetails from '@/data/teamPageDetails'; +import useWebsite from '@/shared/useWebsite'; + import TeamCard from './TeamCard'; import MobileTeamContainer from './TeamPageAssets/MobileTeamContainer'; import WebTeamContainer from './TeamPageAssets/WebTeamContainer'; diff --git a/src/services/useSanity.ts b/src/services/useSanity.ts index 987686ea..5becbef6 100644 --- a/src/services/useSanity.ts +++ b/src/services/useSanity.ts @@ -1,7 +1,7 @@ import type { QueryParams } from '@sanity/client'; import { useState, useEffect, useEffectEvent } from 'react'; -import { client } from '../client'; +import { client } from '@/client'; export function useSanity(query: string, params: QueryParams = {}): T[] { const [data, setData] = useState([]); diff --git a/tsconfig.json b/tsconfig.json index fade7459..067e80e9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,10 @@ "skipLibCheck": true, "resolveJsonModule": true, "isolatedModules": true, - "types": ["vite/client", "vite-plugin-svgr/client"] + "types": ["vite/client", "vite-plugin-svgr/client"], + "paths": { + "@/*": ["./src/*"] + } }, "include": ["src", "e2e", "vite.config.ts", "oxlint.config.ts", "playwright.config.ts"] } diff --git a/vite.config.ts b/vite.config.ts index 950638c5..db90b2cb 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,3 +1,5 @@ +import { fileURLToPath } from 'node:url'; + import react from '@vitejs/plugin-react'; import { defineConfig } from 'vite'; import svgr from 'vite-plugin-svgr'; @@ -8,5 +10,10 @@ export default defineConfig(() => { outDir: 'build', }, plugins: [react(), svgr()], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)), + }, + }, }; });