diff --git a/src/App.tsx b/src/App.tsx index 2d2adeb..cedc8de 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,12 +1,10 @@ -import Body from './Body' -import Header from './Header' +import Home from './pages/Home' import './App.scss' const App = () => { return (
-
- +
) } diff --git a/src/Text/Text.scss b/src/components/Text/Text.scss similarity index 100% rename from src/Text/Text.scss rename to src/components/Text/Text.scss diff --git a/src/Text/index.tsx b/src/components/Text/index.tsx similarity index 100% rename from src/Text/index.tsx rename to src/components/Text/index.tsx diff --git a/src/Body/Body.scss b/src/pages/Home/Body/Body.scss similarity index 100% rename from src/Body/Body.scss rename to src/pages/Home/Body/Body.scss diff --git a/src/Body/FooBarActive.svg b/src/pages/Home/Body/FooBarActive.svg similarity index 100% rename from src/Body/FooBarActive.svg rename to src/pages/Home/Body/FooBarActive.svg diff --git a/src/Body/FooBarInactive.svg b/src/pages/Home/Body/FooBarInactive.svg similarity index 100% rename from src/Body/FooBarInactive.svg rename to src/pages/Home/Body/FooBarInactive.svg diff --git a/src/Body/ProjectCards.scss b/src/pages/Home/Body/ProjectCards.scss similarity index 100% rename from src/Body/ProjectCards.scss rename to src/pages/Home/Body/ProjectCards.scss diff --git a/src/Body/TerraActive.svg b/src/pages/Home/Body/TerraActive.svg similarity index 100% rename from src/Body/TerraActive.svg rename to src/pages/Home/Body/TerraActive.svg diff --git a/src/Body/TerraInactive.svg b/src/pages/Home/Body/TerraInactive.svg similarity index 100% rename from src/Body/TerraInactive.svg rename to src/pages/Home/Body/TerraInactive.svg diff --git a/src/Body/WebsiteActive.svg b/src/pages/Home/Body/WebsiteActive.svg similarity index 100% rename from src/Body/WebsiteActive.svg rename to src/pages/Home/Body/WebsiteActive.svg diff --git a/src/Body/WebsiteInactive.svg b/src/pages/Home/Body/WebsiteInactive.svg similarity index 100% rename from src/Body/WebsiteInactive.svg rename to src/pages/Home/Body/WebsiteInactive.svg diff --git a/src/Body/index.tsx b/src/pages/Home/Body/index.tsx similarity index 98% rename from src/Body/index.tsx rename to src/pages/Home/Body/index.tsx index c17545f..91b93fe 100644 --- a/src/Body/index.tsx +++ b/src/pages/Home/Body/index.tsx @@ -1,4 +1,4 @@ -import Text from '../Text' +import Text from '@/components/Text' import './Body.scss' import './ProjectCards.scss' diff --git a/src/Header/Header.scss b/src/pages/Home/Header/Header.scss similarity index 100% rename from src/Header/Header.scss rename to src/pages/Home/Header/Header.scss diff --git a/src/Header/index.tsx b/src/pages/Home/Header/index.tsx similarity index 96% rename from src/Header/index.tsx rename to src/pages/Home/Header/index.tsx index 2f02db7..b9417ca 100644 --- a/src/Header/index.tsx +++ b/src/pages/Home/Header/index.tsx @@ -1,4 +1,4 @@ -import Text from '../Text' +import Text from '@/components/Text' import SocialButton from '../SocialButton' import PhotoOfMeURL from './profile.jpeg' import './Header.scss' diff --git a/src/Header/profile.jpeg b/src/pages/Home/Header/profile.jpeg similarity index 100% rename from src/Header/profile.jpeg rename to src/pages/Home/Header/profile.jpeg diff --git a/src/SocialButton/SocialButton.scss b/src/pages/Home/SocialButton/SocialButton.scss similarity index 100% rename from src/SocialButton/SocialButton.scss rename to src/pages/Home/SocialButton/SocialButton.scss diff --git a/src/SocialButton/icon-GitHub.png b/src/pages/Home/SocialButton/icon-GitHub.png similarity index 100% rename from src/SocialButton/icon-GitHub.png rename to src/pages/Home/SocialButton/icon-GitHub.png diff --git a/src/SocialButton/icon-LinkedIn.png b/src/pages/Home/SocialButton/icon-LinkedIn.png similarity index 100% rename from src/SocialButton/icon-LinkedIn.png rename to src/pages/Home/SocialButton/icon-LinkedIn.png diff --git a/src/SocialButton/icon-StackOverflow.png b/src/pages/Home/SocialButton/icon-StackOverflow.png similarity index 100% rename from src/SocialButton/icon-StackOverflow.png rename to src/pages/Home/SocialButton/icon-StackOverflow.png diff --git a/src/SocialButton/index.tsx b/src/pages/Home/SocialButton/index.tsx similarity index 100% rename from src/SocialButton/index.tsx rename to src/pages/Home/SocialButton/index.tsx diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx new file mode 100644 index 0000000..44e3945 --- /dev/null +++ b/src/pages/Home/index.tsx @@ -0,0 +1,13 @@ +import Header from './Header' +import Body from './Body' + +const Home = () => { + return ( +
+
+ +
+ ) +} + +export default Home diff --git a/tsconfig.json b/tsconfig.json index 07fa4a6..cdef69b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,16 @@ { "compilerOptions": { + "baseUrl": "src", + "jsx": "preserve", "module": "commonjs", - "target": "es5", + "outDir": "dist", + "paths": { + "@/*": [ + "./*" + ] + }, "sourceMap": true, - "jsx": "preserve", - "outDir": "dist" + "target": "es5" }, "exclude": [ "node_modules" diff --git a/webpack.config.js b/webpack.config.js index 30118cc..d73d6c3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,7 +4,8 @@ const CopyPlugin = require("copy-webpack-plugin"); const configs = { paths: { - output: path.resolve(__dirname, 'dist') + output: path.resolve(__dirname, 'dist'), + src: path.resolve(__dirname, 'src') } } @@ -65,6 +66,9 @@ module.exports = { watchFiles: ['node_modules/terra/dist'] }, resolve: { - extensions: ['.js', '.json', '.wasm', '.jsx', '.ts', '.tsx'] + extensions: ['.js', '.json', '.wasm', '.jsx', '.ts', '.tsx'], + alias: { + '@': [configs.paths.src] + } } }