From 6b1ac3b18c01b24e44ac936770047d1dc0fb71ab Mon Sep 17 00:00:00 2001 From: Mariusz Najwer Date: Mon, 6 May 2024 15:05:07 +0200 Subject: [PATCH] simplified structure --- package.json | 4 ++-- src/{components => }/github/GithubLastMody.tsx | 2 +- src/{components => }/nav/Nav.styled.ts | 0 src/{components => }/nav/Nav.tsx | 2 +- src/{components => }/pageA4/Page.styled.ts | 0 src/{components => }/pageA4/PageA4.tsx | 0 src/pages/{home => }/Home.tsx | 14 +++++++------- src/{components => }/resumeSection/Education.tsx | 2 +- src/{components => }/resumeSection/Exp.tsx | 2 +- src/{components => }/resumeSection/Intro.tsx | 0 src/{components => }/resumeSection/Project.tsx | 4 ++-- .../ResumeSection.styled.ts} | 0 src/{components => }/resumeSection/Skills.tsx | 2 +- src/router/RouterHash.tsx | 2 +- yarn.lock | 10 +++++----- 15 files changed, 22 insertions(+), 22 deletions(-) rename src/{components => }/github/GithubLastMody.tsx (91%) rename src/{components => }/nav/Nav.styled.ts (100%) rename src/{components => }/nav/Nav.tsx (92%) rename src/{components => }/pageA4/Page.styled.ts (100%) rename src/{components => }/pageA4/PageA4.tsx (100%) rename src/pages/{home => }/Home.tsx (63%) rename src/{components => }/resumeSection/Education.tsx (97%) rename src/{components => }/resumeSection/Exp.tsx (99%) rename src/{components => }/resumeSection/Intro.tsx (100%) rename src/{components => }/resumeSection/Project.tsx (99%) rename src/{components/resumeSection/resumeSection.styled.ts => resumeSection/ResumeSection.styled.ts} (100%) rename src/{components => }/resumeSection/Skills.tsx (96%) diff --git a/package.json b/package.json index 807db18..22b463a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resume", - "version": "3.1.2", + "version": "3.1.3", "type": "module", "homepage": "https://najwer23.github.io/resume/", "scripts": { @@ -30,7 +30,7 @@ "eslint-plugin-react-refresh": "^0.4.6", "gh-pages": "^6.1.1", "husky": "^9.0.11", - "najwer23storybook": "^4.1.85", + "najwer23storybook": "^4.1.95", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.23.0", diff --git a/src/components/github/GithubLastMody.tsx b/src/github/GithubLastMody.tsx similarity index 91% rename from src/components/github/GithubLastMody.tsx rename to src/github/GithubLastMody.tsx index 3e9086f..2227dee 100644 --- a/src/components/github/GithubLastMody.tsx +++ b/src/github/GithubLastMody.tsx @@ -1,4 +1,4 @@ -import { useFetch } from "../../hooks/useFetch"; +import { useFetch } from "../hooks/useFetch"; interface Props { repoName: string; diff --git a/src/components/nav/Nav.styled.ts b/src/nav/Nav.styled.ts similarity index 100% rename from src/components/nav/Nav.styled.ts rename to src/nav/Nav.styled.ts diff --git a/src/components/nav/Nav.tsx b/src/nav/Nav.tsx similarity index 92% rename from src/components/nav/Nav.tsx rename to src/nav/Nav.tsx index 65e30cd..07ad639 100644 --- a/src/components/nav/Nav.tsx +++ b/src/nav/Nav.tsx @@ -1,7 +1,7 @@ import { BoxMody, NavContainer, NavUtils } from "./Nav.styled" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faFilePdf } from "@fortawesome/free-solid-svg-icons"; -import { useTranslationContext } from "../../translation/useTranslationContext"; +import { useTranslationContext } from "../translation/useTranslationContext"; import { GithubLastMody } from "../github/GithubLastMody"; import { Button } from "najwer23storybook/lib/Button"; diff --git a/src/components/pageA4/Page.styled.ts b/src/pageA4/Page.styled.ts similarity index 100% rename from src/components/pageA4/Page.styled.ts rename to src/pageA4/Page.styled.ts diff --git a/src/components/pageA4/PageA4.tsx b/src/pageA4/PageA4.tsx similarity index 100% rename from src/components/pageA4/PageA4.tsx rename to src/pageA4/PageA4.tsx diff --git a/src/pages/home/Home.tsx b/src/pages/Home.tsx similarity index 63% rename from src/pages/home/Home.tsx rename to src/pages/Home.tsx index ced6fc3..e638445 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/Home.tsx @@ -1,10 +1,10 @@ -import { Nav } from "../../components/nav/Nav" -import { PageA4 } from "../../components/pageA4/PageA4" -import { Education } from "../../components/resumeSection/Education" -import { Exp } from "../../components/resumeSection/Exp" -import { Intro } from "../../components/resumeSection/Intro" -import { Project } from "../../components/resumeSection/Project" -import { Skills } from "../../components/resumeSection/Skills" +import { Nav } from "../nav/Nav" +import { PageA4 } from "../pageA4/PageA4" +import { Education } from "../resumeSection/Education" +import { Exp } from "../resumeSection/Exp" +import { Intro } from "../resumeSection/Intro" +import { Project } from "../resumeSection/Project" +import { Skills } from "../resumeSection/Skills" export const Home = () => { return ( diff --git a/src/components/resumeSection/Education.tsx b/src/resumeSection/Education.tsx similarity index 97% rename from src/components/resumeSection/Education.tsx rename to src/resumeSection/Education.tsx index 893f057..a22f797 100644 --- a/src/components/resumeSection/Education.tsx +++ b/src/resumeSection/Education.tsx @@ -1,4 +1,4 @@ -import { T } from "../../translation/T"; +import { T } from "../translation/T"; import { Section, Section2Col, Section2ColDesc, Section2ColDescDesc, Section2ColDescDescInner, Section2ColDescTitle, Section2ColLogo, SectionInner, SectionTitle, SectionTitleLine } from "./ResumeSection.styled"; export const Education = () => { diff --git a/src/components/resumeSection/Exp.tsx b/src/resumeSection/Exp.tsx similarity index 99% rename from src/components/resumeSection/Exp.tsx rename to src/resumeSection/Exp.tsx index e2547ff..aa54e8a 100644 --- a/src/components/resumeSection/Exp.tsx +++ b/src/resumeSection/Exp.tsx @@ -1,4 +1,4 @@ -import { T } from "../../translation/T"; +import { T } from "../translation/T"; import { Section, Section2Col, Section2ColDesc, Section2ColDescDesc, Section2ColDescDescInner, Section2ColDescDescInnerStory, Section2ColDescDescInnerTech, Section2ColDescTitle, Section2ColLogo, SectionInner, SectionTitle, SectionTitleLine } from "./ResumeSection.styled"; const ExpTitle = () => { diff --git a/src/components/resumeSection/Intro.tsx b/src/resumeSection/Intro.tsx similarity index 100% rename from src/components/resumeSection/Intro.tsx rename to src/resumeSection/Intro.tsx diff --git a/src/components/resumeSection/Project.tsx b/src/resumeSection/Project.tsx similarity index 99% rename from src/components/resumeSection/Project.tsx rename to src/resumeSection/Project.tsx index 732bef2..9e5d2e8 100644 --- a/src/components/resumeSection/Project.tsx +++ b/src/resumeSection/Project.tsx @@ -1,5 +1,5 @@ -import { useFetch } from "../../hooks/useFetch"; -import { T } from "../../translation/T"; +import { useFetch } from "../hooks/useFetch"; +import { T } from "../translation/T"; import { HRLine, Section, SectionProjectDesc, SectionProjectTech, SectionProjectTitle, SectionTitle, SectionTitleLine } from "./ResumeSection.styled"; diff --git a/src/components/resumeSection/resumeSection.styled.ts b/src/resumeSection/ResumeSection.styled.ts similarity index 100% rename from src/components/resumeSection/resumeSection.styled.ts rename to src/resumeSection/ResumeSection.styled.ts diff --git a/src/components/resumeSection/Skills.tsx b/src/resumeSection/Skills.tsx similarity index 96% rename from src/components/resumeSection/Skills.tsx rename to src/resumeSection/Skills.tsx index 697e9b5..96f2a31 100644 --- a/src/components/resumeSection/Skills.tsx +++ b/src/resumeSection/Skills.tsx @@ -1,5 +1,5 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { T } from "../../translation/T"; +import { T } from "../translation/T"; import { SectionTitle, SectionTitleLine, SkillsWrapper, SkillsWrapperChild } from "./ResumeSection.styled"; import { faCircle } from "@fortawesome/free-solid-svg-icons"; diff --git a/src/router/RouterHash.tsx b/src/router/RouterHash.tsx index 37a2ed1..2dc43dd 100644 --- a/src/router/RouterHash.tsx +++ b/src/router/RouterHash.tsx @@ -1,5 +1,5 @@ import { RouterProvider, ScrollRestoration, createHashRouter } from "react-router-dom"; -import { Home } from "../pages/home/Home"; +import { Home } from "../pages/Home"; export const router = createHashRouter([ { diff --git a/yarn.lock b/yarn.lock index 0b04c44..77e2c41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2776,13 +2776,13 @@ __metadata: languageName: node linkType: hard -"najwer23storybook@npm:^4.1.85": - version: 4.1.85 - resolution: "najwer23storybook@npm:4.1.85" +"najwer23storybook@npm:^4.1.95": + version: 4.1.95 + resolution: "najwer23storybook@npm:4.1.95" peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 - checksum: 10c0/0e3a54df0ef14d11f4329ab1d7b60c5216216b1b46724e814984fb9733b7312322b5da86d3cc6b08995c1f88f76846f113f440b8b68294fd0eb21916f6d776a9 + checksum: 10c0/fd4648a9357579629d1b0e1c4f82cc7d8ec4fcff0de3cf17f9991bdd5e32326b214f9b87ccce138f31fb058bfa54ac1e48941e7fb5ba34feae0a8f0158ffb3fc languageName: node linkType: hard @@ -3230,7 +3230,7 @@ __metadata: eslint-plugin-react-refresh: "npm:^0.4.6" gh-pages: "npm:^6.1.1" husky: "npm:^9.0.11" - najwer23storybook: "npm:^4.1.85" + najwer23storybook: "npm:^4.1.95" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" react-router-dom: "npm:^6.23.0"