From 9c440e579a32b66f10d53135e324e6a559dba47d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elliot=20N=C3=A9grel-Jerzy?= Date: Sun, 18 Aug 2024 17:16:23 +0200 Subject: [PATCH] refactor: update import paths for Responsive component --- package.json | 2 -- src/components/Copyright.tsx | 2 +- src/components/Details.tsx | 2 +- src/components/projects/Projects.tsx | 2 +- src/components/sections/Credits.tsx | 4 +-- src/components/sections/Divider.tsx | 2 +- src/components/sections/Featured.tsx | 2 +- src/components/sections/Header.tsx | 2 +- src/components/sections/Illustrations.tsx | 2 +- src/components/sections/OpenSource.tsx | 2 +- src/components/sections/Terminal.tsx | 6 ++-- src/components/sections/contact/Contact.tsx | 2 +- src/components/sections/goals/Goals.tsx | 2 +- src/components/sections/goals/Reach.tsx | 2 +- src/index.tsx | 1 + yarn.lock | 31 +-------------------- 16 files changed, 18 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index c7eea13..8ff08f6 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@react-hook/size": "^2.1.2", "@react-spring/web": "^9.7.3", "@types/color": "^3.0.3", - "@types/marked": "^6.0.0", "@vercel/speed-insights": "^1.0.12", "axios": "^1.6.5", "marked": "^13.0.2", @@ -35,7 +34,6 @@ }, "devDependencies": { "@eslint/js": "^9.7.0", - "@types/moment": "^2.13.0", "@types/node": "^20.14.10", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", diff --git a/src/components/Copyright.tsx b/src/components/Copyright.tsx index bed40d4..14536ed 100644 --- a/src/components/Copyright.tsx +++ b/src/components/Copyright.tsx @@ -1,6 +1,6 @@ import { Card, Link, Typography } from "@mui/joy"; import { animated } from "@react-spring/web"; -import { useMobileMode } from "./Responsive"; +import { useMobileMode } from "@/components/Responsive"; /** * Component displaying credits for this website. diff --git a/src/components/Details.tsx b/src/components/Details.tsx index f3a87e4..72ce4e6 100644 --- a/src/components/Details.tsx +++ b/src/components/Details.tsx @@ -12,7 +12,7 @@ import { GoOrganization } from 'react-icons/go'; import { IoSchoolOutline } from 'react-icons/io5'; import { SlWrench } from 'react-icons/sl'; import { TbCircleDashed } from 'react-icons/tb'; -import { Category } from './sections/Terminal'; +import { Category } from '@/components/sections/Terminal'; export const skillIcons: { [key: string]: React.ReactNode; diff --git a/src/components/projects/Projects.tsx b/src/components/projects/Projects.tsx index f82cb8e..8388064 100644 --- a/src/components/projects/Projects.tsx +++ b/src/components/projects/Projects.tsx @@ -17,7 +17,7 @@ import { GoMoon, GoSun } from 'react-icons/go'; import { IoIosReturnLeft } from 'react-icons/io'; import { Link } from 'react-router-dom'; import details from '@/assets/Details'; -import Directory from './Directory'; +import Directory from '@/components/projects/Directory'; function ThemeSwitcherButton() { const { colorScheme, setMode } = useColorScheme(); diff --git a/src/components/sections/Credits.tsx b/src/components/sections/Credits.tsx index 1139124..7049d20 100644 --- a/src/components/sections/Credits.tsx +++ b/src/components/sections/Credits.tsx @@ -8,8 +8,8 @@ import mountainsLightMin from "@/assets/mountains_light.min.webp"; import { animated, useSpringRef, useTransition } from "@react-spring/web"; import ProgressiveImage from "@/components/ProgressiveImage"; import details from "@/assets/Details"; -import { transitionConfig } from "./Illustrations"; -import { useMobileMode } from "../Responsive"; +import { transitionConfig } from "@/components/sections/Illustrations"; +import { useMobileMode } from "@/components/Responsive"; export default function Credits() { const mountainsTransRef = useSpringRef(); diff --git a/src/components/sections/Divider.tsx b/src/components/sections/Divider.tsx index fd780c2..c0c9040 100644 --- a/src/components/sections/Divider.tsx +++ b/src/components/sections/Divider.tsx @@ -1,5 +1,5 @@ import { Box } from "@mui/joy"; -import { useMobileMode } from "../Responsive"; +import { useMobileMode } from "@/components//Responsive"; export default function Divider() { const mobile = useMobileMode(); diff --git a/src/components/sections/Featured.tsx b/src/components/sections/Featured.tsx index e2209c4..ef76948 100644 --- a/src/components/sections/Featured.tsx +++ b/src/components/sections/Featured.tsx @@ -21,7 +21,7 @@ import { RiBracesLine } from "react-icons/ri"; import { Project, rank } from "@/assets/Projects"; import { Link } from "react-router-dom"; import { MdErrorOutline } from "react-icons/md"; -import { Default, Mobile, useMobileMode } from "../Responsive"; +import { Default, Mobile, useMobileMode } from "@/components//Responsive"; /** * Beautifies a string diff --git a/src/components/sections/Header.tsx b/src/components/sections/Header.tsx index 49c322e..3f5be46 100644 --- a/src/components/sections/Header.tsx +++ b/src/components/sections/Header.tsx @@ -7,7 +7,7 @@ import { Link } from "react-router-dom"; import greetingFactory from "@/utils/Greeting"; import { ATypography } from "@/pages/Landing"; import details from "@/assets/Details"; -import { useMobileMode } from "../Responsive"; +import { useMobileMode } from "@/components/Responsive"; export const visitors = [ "stranger", diff --git a/src/components/sections/Illustrations.tsx b/src/components/sections/Illustrations.tsx index 07aa144..d6e6e7d 100644 --- a/src/components/sections/Illustrations.tsx +++ b/src/components/sections/Illustrations.tsx @@ -18,7 +18,7 @@ import spaceStation from "@/assets/space-station.webp"; import ProgressiveImage from "@/components/ProgressiveImage"; import { useEffect } from "react"; import { Parallax } from "react-scroll-parallax"; -import { useMobileMode } from "../Responsive"; +import { useMobileMode } from "@/components/Responsive"; export const transitionConfig = { duration: 1000, diff --git a/src/components/sections/OpenSource.tsx b/src/components/sections/OpenSource.tsx index 2621a61..91bb26b 100644 --- a/src/components/sections/OpenSource.tsx +++ b/src/components/sections/OpenSource.tsx @@ -5,7 +5,7 @@ import vaderMin from "@/assets/vader.min.webp"; import { RiOpenSourceLine } from "react-icons/ri"; import { Parallax } from "react-scroll-parallax"; import ProgressiveImage from "@/components/ProgressiveImage"; -import { Default, Mobile, useMobileMode } from "../Responsive"; +import { Default, Mobile, useMobileMode } from "@/components/Responsive"; export default function OpenSource() { const { colorScheme } = useColorScheme(); diff --git a/src/components/sections/Terminal.tsx b/src/components/sections/Terminal.tsx index 392ff04..97113ea 100644 --- a/src/components/sections/Terminal.tsx +++ b/src/components/sections/Terminal.tsx @@ -29,9 +29,9 @@ import { RiUserLine } from "react-icons/ri"; import mockMessages from "@/utils/Messages"; import { Parallax } from "react-scroll-parallax"; import details from "@/assets/Details"; -import { Default, Mobile, useMobileMode } from "../Responsive"; -import Details from "../Details"; -import TypeWriter from "../TypeWriter"; +import { Default, Mobile, useMobileMode } from "@/components/Responsive"; +import Details from "@/components/Details"; +import TypeWriter from "@/components/TypeWriter"; export const categories = ["experience", "education"] as const; diff --git a/src/components/sections/contact/Contact.tsx b/src/components/sections/contact/Contact.tsx index f92581e..1703303 100644 --- a/src/components/sections/contact/Contact.tsx +++ b/src/components/sections/contact/Contact.tsx @@ -4,7 +4,7 @@ import { FiMail, FiPhone } from "react-icons/fi"; import { SiResearchgate } from "react-icons/si"; import details from "@/assets/Details"; import LinkCarousel from "./LinkCarousel"; -import { Default, Mobile, useMobileMode } from "../../Responsive"; +import { Default, Mobile, useMobileMode } from "@/components/Responsive"; export default function Contact() { const mobile = useMobileMode(); diff --git a/src/components/sections/goals/Goals.tsx b/src/components/sections/goals/Goals.tsx index 038a188..0ab000c 100644 --- a/src/components/sections/goals/Goals.tsx +++ b/src/components/sections/goals/Goals.tsx @@ -16,7 +16,7 @@ import { HiOutlineSparkles } from "react-icons/hi2"; import { Parallax } from "react-scroll-parallax"; import { animated, useSpringValue } from "@react-spring/web"; import details from "@/assets/Details"; -import { Default, Mobile, useMobileMode } from "../../Responsive"; +import { Default, Mobile, useMobileMode } from "@/components/Responsive"; import Reach from "./Reach"; function Grid({ sx }: { sx?: SxProps }) { diff --git a/src/components/sections/goals/Reach.tsx b/src/components/sections/goals/Reach.tsx index eefbfe3..bc004d9 100644 --- a/src/components/sections/goals/Reach.tsx +++ b/src/components/sections/goals/Reach.tsx @@ -18,7 +18,7 @@ import { MdErrorOutline, MdSend } from 'react-icons/md'; import { FaFire } from 'react-icons/fa'; import { BsSendCheck } from 'react-icons/bs'; import ProgressiveImage from '@/components/ProgressiveImage'; -import { Default, useMobileMode } from '../../Responsive'; +import { Default, useMobileMode } from '@/components/Responsive'; export default function Reach({ step } : {step: number}) { const mobile = useMobileMode(); diff --git a/src/index.tsx b/src/index.tsx index e99e794..a199915 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -3,6 +3,7 @@ import ReactGA from "react-ga4"; import Providers from "@/Providers"; import { RouterProvider } from "react-router-dom"; import router from "@/router"; + import "@/app.global.scss"; if (import.meta.env.REACT_APP_GA_MEASUREMENT_ID) { diff --git a/yarn.lock b/yarn.lock index 64cf1bb..dd25379 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1721,24 +1721,6 @@ __metadata: languageName: node linkType: hard -"@types/marked@npm:^6.0.0": - version: 6.0.0 - resolution: "@types/marked@npm:6.0.0" - dependencies: - marked: "npm:*" - checksum: 10c0/1a831af52413b1a208c91539d3bdda9be83d5451dc094c3cbc07e3e07186970673b9ec3ad5edd6c136b1249875c41e22c39eacb3c00ea7c59d0873c35c273035 - languageName: node - linkType: hard - -"@types/moment@npm:^2.13.0": - version: 2.13.0 - resolution: "@types/moment@npm:2.13.0" - dependencies: - moment: "npm:*" - checksum: 10c0/b9b668ca4b2584daaa03523a28dd26d542fa4da3de3e976242bbd1568dfc01736142118143a69ed26f62de1b49936ab346579a2ce3979410a1bab229d644cccb - languageName: node - linkType: hard - "@types/node@npm:^20.14.10": version: 20.16.0 resolution: "@types/node@npm:20.16.0" @@ -2333,8 +2315,6 @@ __metadata: "@react-hook/size": "npm:^2.1.2" "@react-spring/web": "npm:^9.7.3" "@types/color": "npm:^3.0.3" - "@types/marked": "npm:^6.0.0" - "@types/moment": "npm:^2.13.0" "@types/node": "npm:^20.14.10" "@types/react": "npm:^18.3.3" "@types/react-dom": "npm:^18.3.0" @@ -4340,15 +4320,6 @@ __metadata: languageName: node linkType: hard -"marked@npm:*": - version: 14.0.0 - resolution: "marked@npm:14.0.0" - bin: - marked: bin/marked.js - checksum: 10c0/57a47cb110f7b1a10f398b0a7236f9183aad2dcd5345ee73f2732b6387e585d04cef472bc655d2f84c542296be9728e179aebe3ed7f2f8666b8a0a9dae592876 - languageName: node - linkType: hard - "marked@npm:^13.0.2": version: 13.0.3 resolution: "marked@npm:13.0.3" @@ -4511,7 +4482,7 @@ __metadata: languageName: node linkType: hard -"moment@npm:*, moment@npm:^2.29.4": +"moment@npm:^2.29.4": version: 2.30.1 resolution: "moment@npm:2.30.1" checksum: 10c0/865e4279418c6de666fca7786607705fd0189d8a7b7624e2e56be99290ac846f90878a6f602e34b4e0455c549b85385b1baf9966845962b313699e7cb847543a