diff --git a/next.config.js b/next.config.js index dff8396..378a583 100755 --- a/next.config.js +++ b/next.config.js @@ -1,4 +1,4 @@ -import million from "million/compiler"; +import million from 'million/compiler'; /** @type {import('next').NextConfig} */ const nextConfig = { @@ -12,7 +12,7 @@ const nextConfig = { }; const millionConfig = { - auto: true,// if you're using RSC: auto: { rsc: true }, + auto: true, // if you're using RSC: auto: { rsc: true }, }; export default million.next(nextConfig, millionConfig); diff --git a/package.json b/package.json index aaa465b..707e74d 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "build": "next build", "start": "next start", "test": "bun test", - "lint": "bunx eslint src pages", - "lint-fix": "bunx eslint --fix src pages", - "format": "prettier --write src pages", + "lint": "bunx eslint src", + "lint-fix": "bunx eslint --fix src", + "format": "prettier --write src", "coverage": "bun test --coverage" }, "dependencies": { diff --git a/src/components/Event/index.module.scss b/src/components/Event/index.module.scss index cad3e72..c91b855 100644 --- a/src/components/Event/index.module.scss +++ b/src/components/Event/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .eventContainer { display: flex; diff --git a/src/components/EventCarousel/index.module.scss b/src/components/EventCarousel/index.module.scss index 11dc853..7b818a5 100644 --- a/src/components/EventCarousel/index.module.scss +++ b/src/components/EventCarousel/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .carouselContainer { padding: 2em 0 5em 0; diff --git a/src/components/Footer/index.module.scss b/src/components/Footer/index.module.scss index c34d5a6..14c5bb1 100644 --- a/src/components/Footer/index.module.scss +++ b/src/components/Footer/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .footer { bottom: 0; diff --git a/src/components/Gradient/index.module.scss b/src/components/Gradient/index.module.scss index 5e7608b..3764bcf 100644 --- a/src/components/Gradient/index.module.scss +++ b/src/components/Gradient/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .canvas { height: 100%; diff --git a/src/components/Hero/index.module.scss b/src/components/Hero/index.module.scss index 563e4fe..f3cfd65 100644 --- a/src/components/Hero/index.module.scss +++ b/src/components/Hero/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; $hero-gradient: linear-gradient(#0003, #000a 30%, #000e 60%, #000f 80%); diff --git a/src/components/Navbar/index.module.scss b/src/components/Navbar/index.module.scss index 4669ca6..fd936ca 100644 --- a/src/components/Navbar/index.module.scss +++ b/src/components/Navbar/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .navbarContainer { top: 0; diff --git a/src/components/Project/index.module.scss b/src/components/Project/index.module.scss index ef4c85c..6a3a000 100644 --- a/src/components/Project/index.module.scss +++ b/src/components/Project/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .projectContainer { display: flex; diff --git a/src/components/RoundButton/index.module.scss b/src/components/RoundButton/index.module.scss index 834c6bc..de3d3b7 100644 --- a/src/components/RoundButton/index.module.scss +++ b/src/components/RoundButton/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .roundButton { width: fit-content; diff --git a/src/components/Timeline/index.module.scss b/src/components/Timeline/index.module.scss index 53c6590..943b5e4 100644 --- a/src/components/Timeline/index.module.scss +++ b/src/components/Timeline/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .timelineContainer { border-collapse: collapse; diff --git a/src/components/Typography/index.module.scss b/src/components/Typography/index.module.scss index 881e088..962dc02 100644 --- a/src/components/Typography/index.module.scss +++ b/src/components/Typography/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .centered { text-align: center; diff --git a/src/icons/AfterEffectsIcon/index.tsx b/src/icons/AfterEffectsIcon/index.tsx index c8ddf64..89ef37e 100644 --- a/src/icons/AfterEffectsIcon/index.tsx +++ b/src/icons/AfterEffectsIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function AfterEffectsIcon({ diff --git a/src/icons/BaseIcon/index.module.scss b/src/icons/BaseIcon/index.module.scss index 1f35c6d..c08409c 100644 --- a/src/icons/BaseIcon/index.module.scss +++ b/src/icons/BaseIcon/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; %baseSvgIconContainer { width: 100%; diff --git a/src/icons/FacebookIcon/index.tsx b/src/icons/FacebookIcon/index.tsx index a33c341..bbf882f 100644 --- a/src/icons/FacebookIcon/index.tsx +++ b/src/icons/FacebookIcon/index.tsx @@ -1,5 +1,5 @@ +import styles from 'styles/index.module.scss'; import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function FacebookIcon({ diff --git a/src/icons/FigmaIcon/index.tsx b/src/icons/FigmaIcon/index.tsx index 227af74..75a662d 100644 --- a/src/icons/FigmaIcon/index.tsx +++ b/src/icons/FigmaIcon/index.tsx @@ -1,5 +1,5 @@ +import styles from 'styles/index.module.scss'; import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function FigmaIcon({ diff --git a/src/icons/FlutterIcon/index.tsx b/src/icons/FlutterIcon/index.tsx index 43fd7b9..06d204f 100644 --- a/src/icons/FlutterIcon/index.tsx +++ b/src/icons/FlutterIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function FlutterIcon({ className, diff --git a/src/icons/IllustratorIcon/index.tsx b/src/icons/IllustratorIcon/index.tsx index ab90221..b1a7c2d 100644 --- a/src/icons/IllustratorIcon/index.tsx +++ b/src/icons/IllustratorIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function IllustratorIcon({ diff --git a/src/icons/InstagramIcon/index.tsx b/src/icons/InstagramIcon/index.tsx index 756424c..10c5e4d 100644 --- a/src/icons/InstagramIcon/index.tsx +++ b/src/icons/InstagramIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function InstagramIcon({ diff --git a/src/icons/JavaIcon/index.tsx b/src/icons/JavaIcon/index.tsx index 8047dcd..aad7b6f 100644 --- a/src/icons/JavaIcon/index.tsx +++ b/src/icons/JavaIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function JavaIcon({ className, diff --git a/src/icons/JavaScriptIcon/index.tsx b/src/icons/JavaScriptIcon/index.tsx index 0ee723f..1e85851 100644 --- a/src/icons/JavaScriptIcon/index.tsx +++ b/src/icons/JavaScriptIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function JavaScriptIcon({ className, diff --git a/src/icons/LinkIcon/index.tsx b/src/icons/LinkIcon/index.tsx index 714ebaf..3be8742 100644 --- a/src/icons/LinkIcon/index.tsx +++ b/src/icons/LinkIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function LinkIcon({ className, diff --git a/src/icons/MattermostIcon/index.tsx b/src/icons/MattermostIcon/index.tsx index 007b665..042df11 100644 --- a/src/icons/MattermostIcon/index.tsx +++ b/src/icons/MattermostIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function MattermostIcon({ diff --git a/src/icons/MediumIcon/index.tsx b/src/icons/MediumIcon/index.tsx index c71585b..4d50c37 100644 --- a/src/icons/MediumIcon/index.tsx +++ b/src/icons/MediumIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function MediumIcon({ diff --git a/src/icons/MongoDbIcon/index.tsx b/src/icons/MongoDbIcon/index.tsx index 4f00af7..d99c73a 100644 --- a/src/icons/MongoDbIcon/index.tsx +++ b/src/icons/MongoDbIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function MongoDbIcon({ className, diff --git a/src/icons/NextJsIcon/index.tsx b/src/icons/NextJsIcon/index.tsx index 0569a41..433a4eb 100644 --- a/src/icons/NextJsIcon/index.tsx +++ b/src/icons/NextJsIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function NextJsIcon({ className, diff --git a/src/icons/OpenStreetMapIcon/index.tsx b/src/icons/OpenStreetMapIcon/index.tsx index 360e4ab..38329dd 100644 --- a/src/icons/OpenStreetMapIcon/index.tsx +++ b/src/icons/OpenStreetMapIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function OpenStreetMapIcon({ diff --git a/src/icons/ProcreateIcon/index.tsx b/src/icons/ProcreateIcon/index.tsx index 5046d98..14ce346 100644 --- a/src/icons/ProcreateIcon/index.tsx +++ b/src/icons/ProcreateIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function ProcreateIcon({ diff --git a/src/icons/ReactIcon/index.tsx b/src/icons/ReactIcon/index.tsx index 7add12e..5750ca1 100644 --- a/src/icons/ReactIcon/index.tsx +++ b/src/icons/ReactIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function ReactIcon({ diff --git a/src/icons/SlackIcon/index.tsx b/src/icons/SlackIcon/index.tsx index e7af64f..3941051 100644 --- a/src/icons/SlackIcon/index.tsx +++ b/src/icons/SlackIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function SlackIcon({ diff --git a/src/icons/TailwindIcon/index.tsx b/src/icons/TailwindIcon/index.tsx index b071862..ef0cad5 100644 --- a/src/icons/TailwindIcon/index.tsx +++ b/src/icons/TailwindIcon/index.tsx @@ -1,6 +1,6 @@ import BaseIcon from '../BaseIcon'; import { SvgIconProps } from '../SvgIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; export default function TailwindIcon({ className, diff --git a/src/icons/TypeScriptIcon/index.tsx b/src/icons/TypeScriptIcon/index.tsx index 7d567bf..3f15f6f 100644 --- a/src/icons/TypeScriptIcon/index.tsx +++ b/src/icons/TypeScriptIcon/index.tsx @@ -1,5 +1,5 @@ import BaseIcon from '../BaseIcon'; -import styles from '../styles/index.module.scss'; +import styles from 'styles/index.module.scss'; import { SvgIconProps } from '../SvgIcon'; export default function TypeScriptIcon({ diff --git a/src/layouts/BaseLayout/index.module.scss b/src/layouts/BaseLayout/index.module.scss index 6bd536d..d6db262 100644 --- a/src/layouts/BaseLayout/index.module.scss +++ b/src/layouts/BaseLayout/index.module.scss @@ -1,5 +1,5 @@ -@import '~/styles/variables.scss'; -@import '~/styles/mixins.scss'; +@import 'styles/variables.scss'; +@import 'styles/mixins.scss'; .pageContainer { display: flex; diff --git a/pages/_app.tsx b/src/pages/_app.tsx similarity index 81% rename from pages/_app.tsx rename to src/pages/_app.tsx index 1b49de8..1c78c27 100755 --- a/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -2,13 +2,13 @@ import { library } from '@fortawesome/fontawesome-svg-core'; import { faCircle as faCircleHollow } from '@fortawesome/free-regular-svg-icons'; import { faBars, faCircle } from '@fortawesome/free-solid-svg-icons'; import type { AppProps } from 'next/app'; -import '../styles/globals.scss'; +import 'styles/globals.scss'; function MyApp({ Component, pageProps }: AppProps) { library.add(faBars); library.add(faCircle); library.add(faCircleHollow); - return ; + return ; } export default MyApp; diff --git a/pages/_document.tsx b/src/pages/_document.tsx similarity index 100% rename from pages/_document.tsx rename to src/pages/_document.tsx diff --git a/pages/design.tsx b/src/pages/design.tsx similarity index 84% rename from pages/design.tsx rename to src/pages/design.tsx index d6fe5b0..fc942a2 100755 --- a/pages/design.tsx +++ b/src/pages/design.tsx @@ -1,13 +1,13 @@ import Image from 'next/image'; -import Project from '../src/components/Project'; -import Timeline from '../src/components/Timeline'; -import Typography from '../src/components/Typography'; -import AfterEffectsIcon from '../src/icons/AfterEffectsIcon'; -import FigmaIcon from '../src/icons/FigmaIcon'; -import IllustratorIcon from '../src/icons/IllustratorIcon'; -import ProcreateIcon from '../src/icons/ProcreateIcon'; -import BaseLayout from '../src/layouts/BaseLayout'; -import styles from '../styles/Design.module.scss'; +import Project from 'components/Project'; +import Timeline from 'components/Timeline'; +import Typography from 'components/Typography'; +import AfterEffectsIcon from 'icons//AfterEffectsIcon'; +import FigmaIcon from 'icons//FigmaIcon'; +import IllustratorIcon from 'icons//IllustratorIcon'; +import ProcreateIcon from 'icons//ProcreateIcon'; +import BaseLayout from 'layouts/BaseLayout'; +import styles from 'styles/Design.module.scss'; export default function Design() { return ( diff --git a/pages/events.tsx b/src/pages/events.tsx similarity index 85% rename from pages/events.tsx rename to src/pages/events.tsx index b5b786c..1f6f7bd 100755 --- a/pages/events.tsx +++ b/src/pages/events.tsx @@ -1,9 +1,9 @@ import Image from 'next/image'; -import Event from '../src/components/Event'; -import Timeline from '../src/components/Timeline'; -import Typography from '../src/components/Typography'; -import BaseLayout from '../src/layouts/BaseLayout'; -import styles from '../styles/Events.module.scss'; +import Event from 'components/Event'; +import Timeline from 'components/Timeline'; +import Typography from 'components/Typography'; +import BaseLayout from 'layouts/BaseLayout'; +import styles from 'styles/Events.module.scss'; export default function Events() { return ( diff --git a/pages/index.tsx b/src/pages/index.tsx similarity index 88% rename from pages/index.tsx rename to src/pages/index.tsx index e1277c0..6cc05bb 100755 --- a/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,10 +1,10 @@ import Image from 'next/legacy/image'; -import EventCarousel from '../src/components/EventCarousel'; -import Hero from '../src/components/Hero'; -import RoundButton from '../src/components/RoundButton'; -import Typography from '../src/components/Typography'; -import BaseLayout from '../src/layouts/BaseLayout'; -import styles from '../styles/Home.module.scss'; +import EventCarousel from 'components/EventCarousel'; +import Hero from 'components/Hero'; +import RoundButton from 'components/RoundButton'; +import Typography from 'components/Typography'; +import BaseLayout from 'layouts/BaseLayout'; +import styles from 'styles/Home.module.scss'; export default function Home() { return ( diff --git a/pages/tech.tsx b/src/pages/tech.tsx similarity index 94% rename from pages/tech.tsx rename to src/pages/tech.tsx index 966f969..24e16d8 100755 --- a/pages/tech.tsx +++ b/src/pages/tech.tsx @@ -1,9 +1,9 @@ import Image from 'next/image'; -import Project from '../src/components/Project'; -import Timeline from '../src/components/Timeline'; -import Typography from '../src/components/Typography'; -import BaseLayout from '../src/layouts/BaseLayout'; -import styles from '../styles/Tech.module.scss'; +import Project from 'components/Project'; +import Timeline from 'components/Timeline'; +import Typography from 'components/Typography'; +import BaseLayout from 'layouts/BaseLayout'; +import styles from 'styles/Tech.module.scss'; export default function Tech() { return ( diff --git a/styles/Design.module.scss b/src/styles/Design.module.scss similarity index 100% rename from styles/Design.module.scss rename to src/styles/Design.module.scss diff --git a/styles/Events.module.scss b/src/styles/Events.module.scss similarity index 100% rename from styles/Events.module.scss rename to src/styles/Events.module.scss diff --git a/styles/Home.module.scss b/src/styles/Home.module.scss similarity index 100% rename from styles/Home.module.scss rename to src/styles/Home.module.scss diff --git a/styles/Tech.module.scss b/src/styles/Tech.module.scss similarity index 100% rename from styles/Tech.module.scss rename to src/styles/Tech.module.scss diff --git a/styles/globals.scss b/src/styles/globals.scss similarity index 100% rename from styles/globals.scss rename to src/styles/globals.scss diff --git a/src/icons/styles/index.module.scss b/src/styles/index.module.scss similarity index 100% rename from src/icons/styles/index.module.scss rename to src/styles/index.module.scss diff --git a/styles/mixins.scss b/src/styles/mixins.scss similarity index 100% rename from styles/mixins.scss rename to src/styles/mixins.scss diff --git a/styles/variables.scss b/src/styles/variables.scss similarity index 88% rename from styles/variables.scss rename to src/styles/variables.scss index dd04cfb..09d6692 100644 --- a/styles/variables.scss +++ b/src/styles/variables.scss @@ -28,10 +28,10 @@ $text-size-subtitle-xs: 0.4rem; $container-padding: 1em 1.5em 1em 1.5em; $box-shadow: - 0 1px 2px rgba(0, 0, 0, 0.07), - 0 2px 4px rgba(0, 0, 0, 0.07), - 0 4px 8px rgba(0, 0, 0, 0.07), - 0 8px 16px rgba(0, 0, 0, 0.07); + 0 1px 2px rgba(0, 0, 0, 0.07), + 0 2px 4px rgba(0, 0, 0, 0.07), + 0 4px 8px rgba(0, 0, 0, 0.07), + 0 8px 16px rgba(0, 0, 0, 0.07); $text-shadow: 1px 1px 10px #0005; $button-hover: #d9d9d9; diff --git a/tsconfig.json b/tsconfig.json index fb0a8f3..fc6e6ab 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "target": "ESNext", + "baseUrl": "src", "useDefineForClassFields": true, "lib": [ "ESNext", diff --git a/tsconfig.node.json b/tsconfig.node.json index d73acdc..9e64f52 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -9,5 +9,5 @@ "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, - "include": ["vite.config.ts"] + "include": ["vite.config.ts", "next.config.js"] } \ No newline at end of file