From a75285d22abdc58d88c5f51d8b2c32061107df98 Mon Sep 17 00:00:00 2001 From: skidoodle <53189968+skidoodle@users.noreply.github.com> Date: Tue, 29 Mar 2022 23:08:44 +0200 Subject: [PATCH] path and single quotes --- pages/_app.tsx | 2 +- pages/_document.tsx | 8 ++++---- pages/index.tsx | 16 ++++++++-------- src/components/Body.tsx | 2 +- src/components/Footer.tsx | 4 ++-- src/components/Icon.tsx | 2 +- src/components/IconLayout.tsx | 2 +- src/components/MainLayout.tsx | 2 +- src/components/Spotify.tsx | 8 ++++---- src/components/Time.tsx | 3 +-- src/components/Weather.tsx | 2 +- tsconfig.json | 7 ++++++- 12 files changed, 31 insertions(+), 27 deletions(-) diff --git a/pages/_app.tsx b/pages/_app.tsx index 570942a..309abc2 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -4,7 +4,7 @@ import { config, library } from '@fortawesome/fontawesome-svg-core'; import type { AppProps } from 'next/app' -import '../src/styles/globals.scss' +import '@/styles/globals.scss' import '@fortawesome/fontawesome-svg-core/styles.css' library.add(fab, fas) diff --git a/pages/_document.tsx b/pages/_document.tsx index 57fff13..7de9b67 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -5,10 +5,10 @@ const Document = () => { <> - - - - + + + + diff --git a/pages/index.tsx b/pages/index.tsx index 52d1c17..cd277b2 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,13 +1,13 @@ import { GetServerSideProps } from 'next' import Head from 'next/head' -import Body from '../src/components/Body' -import Footer from '../src/components/Footer' -import Icon from '../src/components/Icon' -import IconLayout from '../src/components/IconLayout' -import MainLayout from '../src/components/MainLayout' -import Spotify from '../src/components/Spotify' -import Time from '../src/components/Time' -import Weather from '../src/components/Weather' +import Body from '@/components/Body' +import Footer from '@/components/Footer' +import Icon from '@/components/Icon' +import IconLayout from '@/components/IconLayout' +import MainLayout from '@/components/MainLayout' +import Spotify from '@/components/Spotify' +import Time from '@/components/Time' +import Weather from '@/components/Weather' const Home = ({data}: any) => { return( diff --git a/src/components/Body.tsx b/src/components/Body.tsx index f6f5ad7..c147ca7 100644 --- a/src/components/Body.tsx +++ b/src/components/Body.tsx @@ -1,4 +1,4 @@ -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const Body = ({children}: {children: any}) => { return( diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 5139275..7169e42 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,9 +1,9 @@ -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const Footer = () => { return(
- ? + ?
) } diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx index b876361..287d04d 100644 --- a/src/components/Icon.tsx +++ b/src/components/Icon.tsx @@ -11,7 +11,7 @@ const Icon = ({icon, reference, copy = false} : {icon: any, reference: any, copy ) : ( - + ) diff --git a/src/components/IconLayout.tsx b/src/components/IconLayout.tsx index e350b13..4cf5558 100644 --- a/src/components/IconLayout.tsx +++ b/src/components/IconLayout.tsx @@ -1,4 +1,4 @@ -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const IconLayout = ({children}: {children: any}) => { return( diff --git a/src/components/MainLayout.tsx b/src/components/MainLayout.tsx index c0b6908..a291134 100644 --- a/src/components/MainLayout.tsx +++ b/src/components/MainLayout.tsx @@ -1,4 +1,4 @@ -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const MainLayout = () => { return( diff --git a/src/components/Spotify.tsx b/src/components/Spotify.tsx index 8d76b82..e704ef9 100644 --- a/src/components/Spotify.tsx +++ b/src/components/Spotify.tsx @@ -1,6 +1,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { useLastFM } from 'use-last-fm' -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const Spotify = () => { const lastFM = useLastFM('albrtadam', 'f6d19bc25ca340225c70c3d386cd4eab'); @@ -10,14 +10,14 @@ const Spotify = () => { {lastFM.status === 'playing' ? <> - - + +

Listening to {lastFM.song.name}

 : <> - +

Not listening to anything

} diff --git a/src/components/Time.tsx b/src/components/Time.tsx index d8563b0..cb14776 100644 --- a/src/components/Time.tsx +++ b/src/components/Time.tsx @@ -1,7 +1,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { useEffect, useState } from 'react' - -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const Timer = () => { const [date, setDate] = useState(new Date()) diff --git a/src/components/Weather.tsx b/src/components/Weather.tsx index d22ba55..09a0dcf 100644 --- a/src/components/Weather.tsx +++ b/src/components/Weather.tsx @@ -1,5 +1,5 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import styles from '../styles/Home.module.scss' +import styles from '@/styles/Home.module.scss' const Weather = ({data}: {data: any}) => { const { temp: temperature } = data.main diff --git a/tsconfig.json b/tsconfig.json index 99710e8..85ea808 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,7 +13,12 @@ "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", - "incremental": true + "incremental": true, + "baseUrl": ".", + "paths": { + "@/styles/*": ["styles/*"], + "@/components/*": ["components/*"] + } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], "exclude": ["node_modules"]