diff --git a/index.html b/index.html index e22d200..34e1286 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@
- + diff --git a/src/App.jsx b/src/App.jsx index 0711c3a..ca5506d 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,8 +1,8 @@ import './App.css' -import { Routes, Route, Link } from 'react-router-dom'; -import HomePage from './pages/HomePage.jsx'; -import ProjectsPage from './pages/ProjectsPage'; -import ProjectDetailsPage from "./pages/ProjectDetailsPage.jsx"; +import { Routes, Route } from 'react-router-dom'; +import HomePage from './pages/Home/HomePage.jsx'; +import ProjectsPage from './pages/Projects/ProjectsPage.jsx'; +import ProjectDetailsPage from "./pages/ProjectDetails/ProjectDetailsPage.jsx"; function App() { diff --git a/src/components/Projects/Projects.jsx b/src/components/Projects/Projects.jsx index 8157a6c..2f8065a 100644 --- a/src/components/Projects/Projects.jsx +++ b/src/components/Projects/Projects.jsx @@ -3,7 +3,7 @@ import "./Projects.css" import React, {useEffect, useState} from "react"; import {Link, useLocation} from "react-router-dom"; import NavBar from "../NavBar/NavBar.jsx"; -import Filter from "../Filter/Filter.jsx"; +import Filter from "../../pages/Projects/components/Filter/Filter.jsx"; function Projects() { const [projects, setProjects] = useState([]); diff --git a/src/pages/HomePage.jsx b/src/pages/Home/HomePage.jsx similarity index 59% rename from src/pages/HomePage.jsx rename to src/pages/Home/HomePage.jsx index fed75ea..151be00 100644 --- a/src/pages/HomePage.jsx +++ b/src/pages/Home/HomePage.jsx @@ -1,10 +1,10 @@ -import {useEffect, useState} from 'react'; // 1. Import useEffect -import { useLocation } from 'react-router-dom'; // 2. Import useLocation -import Home from '../components/Home/Home.jsx'; -import Experiences from '../components/Experiences/Experiences.jsx'; -import Projects from '../components/Projects/Projects.jsx'; -import Skills from '../components/Skills/Skills.jsx'; -import Footer from '../components/Footer/Footer.jsx'; +import {useEffect} from 'react'; +import { useLocation } from 'react-router-dom'; +import Home from './components/Home/Home.jsx'; +import Experiences from './components/Experiences/Experiences.jsx'; +import Projects from '../../components/Projects/Projects.jsx'; +import Skills from './components/Skills/Skills.jsx'; +import Footer from '../../components/Footer/Footer.jsx'; function HomePage() { const location = useLocation(); diff --git a/src/components/Experiences/Experiences.css b/src/pages/Home/components/Experiences/Experiences.css similarity index 100% rename from src/components/Experiences/Experiences.css rename to src/pages/Home/components/Experiences/Experiences.css diff --git a/src/components/Experiences/Experiences.jsx b/src/pages/Home/components/Experiences/Experiences.jsx similarity index 100% rename from src/components/Experiences/Experiences.jsx rename to src/pages/Home/components/Experiences/Experiences.jsx diff --git a/src/components/Home/Home.css b/src/pages/Home/components/Home/Home.css similarity index 100% rename from src/components/Home/Home.css rename to src/pages/Home/components/Home/Home.css diff --git a/src/components/Home/Home.jsx b/src/pages/Home/components/Home/Home.jsx similarity index 79% rename from src/components/Home/Home.jsx rename to src/pages/Home/components/Home/Home.jsx index 99f9be5..d8d8ff5 100644 --- a/src/components/Home/Home.jsx +++ b/src/pages/Home/components/Home/Home.jsx @@ -1,6 +1,6 @@ import './Home.css'; -import Background from "../thirdParty/Background/Background.jsx"; -import NavBar from "../NavBar/NavBar.jsx"; +import Background from "../../../../components/thirdParty/Background/Background.jsx"; +import NavBar from "../../../../components/NavBar/NavBar.jsx"; function Home() { return ( diff --git a/src/components/SingleExperience/SingleExperience.css b/src/pages/Home/components/SingleExperience/SingleExperience.css similarity index 100% rename from src/components/SingleExperience/SingleExperience.css rename to src/pages/Home/components/SingleExperience/SingleExperience.css diff --git a/src/components/SingleExperience/SingleExperience.jsx b/src/pages/Home/components/SingleExperience/SingleExperience.jsx similarity index 100% rename from src/components/SingleExperience/SingleExperience.jsx rename to src/pages/Home/components/SingleExperience/SingleExperience.jsx diff --git a/src/components/Skills/Skills.css b/src/pages/Home/components/Skills/Skills.css similarity index 100% rename from src/components/Skills/Skills.css rename to src/pages/Home/components/Skills/Skills.css diff --git a/src/components/Skills/Skills.jsx b/src/pages/Home/components/Skills/Skills.jsx similarity index 95% rename from src/components/Skills/Skills.jsx rename to src/pages/Home/components/Skills/Skills.jsx index 7ac52e8..cfc984b 100644 --- a/src/components/Skills/Skills.jsx +++ b/src/pages/Home/components/Skills/Skills.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import SkillCard from "../SkillCard/SkillCard.jsx"; +import SkillCard from "../../../../components/SkillCard/SkillCard.jsx"; import "./Skills.css"; function Skills() { diff --git a/src/pages/ProjectDetailsPage.jsx b/src/pages/ProjectDetails/ProjectDetailsPage.jsx similarity index 84% rename from src/pages/ProjectDetailsPage.jsx rename to src/pages/ProjectDetails/ProjectDetailsPage.jsx index bb82aec..7333aeb 100644 --- a/src/pages/ProjectDetailsPage.jsx +++ b/src/pages/ProjectDetails/ProjectDetailsPage.jsx @@ -1,8 +1,7 @@ import { useParams } from "react-router-dom"; import React, { useEffect, useState } from "react"; -import NavBar from "../components/NavBar/NavBar.jsx"; -import ProjectDetails from "../components/ProjectDetails/ProjectDetails.jsx"; -import Footer from "../components/Footer/Footer.jsx"; +import ProjectDetails from "./components/ProjectDetails/ProjectDetails.jsx"; +import Footer from "../../components/Footer/Footer.jsx"; function ProjectDetailsPage() { const { id } = useParams(); diff --git a/src/components/ProjectDetails/ProjectDetails.css b/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css similarity index 100% rename from src/components/ProjectDetails/ProjectDetails.css rename to src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.css diff --git a/src/components/ProjectDetails/ProjectDetails.jsx b/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx similarity index 98% rename from src/components/ProjectDetails/ProjectDetails.jsx rename to src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx index a9775a2..7d9e289 100644 --- a/src/components/ProjectDetails/ProjectDetails.jsx +++ b/src/pages/ProjectDetails/components/ProjectDetails/ProjectDetails.jsx @@ -1,7 +1,7 @@ import "./ProjectDetails.css" -import SkillCard from "../SkillCard/SkillCard.jsx"; +import SkillCard from "../../../../components/SkillCard/SkillCard.jsx"; import React, {useEffect, useState} from "react"; -import NavBar from "../NavBar/NavBar.jsx"; +import NavBar from "../../../../components/NavBar/NavBar.jsx"; import ReactMarkdown from 'react-markdown'; import remarkGfm from 'remark-gfm'; import {useNavigate} from "react-router-dom"; diff --git a/src/pages/ProjectsPage.jsx b/src/pages/Projects/ProjectsPage.jsx similarity index 55% rename from src/pages/ProjectsPage.jsx rename to src/pages/Projects/ProjectsPage.jsx index 2628426..2053128 100644 --- a/src/pages/ProjectsPage.jsx +++ b/src/pages/Projects/ProjectsPage.jsx @@ -1,5 +1,5 @@ -import Projects from "../components/Projects/Projects.jsx"; -import Footer from "../components/Footer/Footer.jsx"; +import Projects from "../../components/Projects/Projects.jsx"; +import Footer from "../../components/Footer/Footer.jsx"; function ProjectsPage() { return ( diff --git a/src/components/Filter/Filter.css b/src/pages/Projects/components/Filter/Filter.css similarity index 100% rename from src/components/Filter/Filter.css rename to src/pages/Projects/components/Filter/Filter.css diff --git a/src/components/Filter/Filter.jsx b/src/pages/Projects/components/Filter/Filter.jsx similarity index 100% rename from src/components/Filter/Filter.jsx rename to src/pages/Projects/components/Filter/Filter.jsx