Merge branch 'refactor/componentsAndPages' into dev
This commit is contained in:
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/public/assets/images/logo.svg" />
|
<link rel="icon" type="image/svg+xml" href="/assets/images/logo.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||||
|
|||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
import './App.css'
|
import './App.css'
|
||||||
import { Routes, Route, Link } from 'react-router-dom';
|
import { Routes, Route } from 'react-router-dom';
|
||||||
import HomePage from './pages/HomePage.jsx';
|
import HomePage from './pages/Home/HomePage.jsx';
|
||||||
import ProjectsPage from './pages/ProjectsPage';
|
import ProjectsPage from './pages/Projects/ProjectsPage.jsx';
|
||||||
import ProjectDetailsPage from "./pages/ProjectDetailsPage.jsx";
|
import ProjectDetailsPage from "./pages/ProjectDetails/ProjectDetailsPage.jsx";
|
||||||
|
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import "./Projects.css"
|
|||||||
import React, {useEffect, useState} from "react";
|
import React, {useEffect, useState} from "react";
|
||||||
import {Link, useLocation} from "react-router-dom";
|
import {Link, useLocation} from "react-router-dom";
|
||||||
import NavBar from "../NavBar/NavBar.jsx";
|
import NavBar from "../NavBar/NavBar.jsx";
|
||||||
import Filter from "../Filter/Filter.jsx";
|
import Filter from "../../pages/Projects/components/Filter/Filter.jsx";
|
||||||
|
|
||||||
function Projects() {
|
function Projects() {
|
||||||
const [projects, setProjects] = useState([]);
|
const [projects, setProjects] = useState([]);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import {useEffect, useState} from 'react'; // 1. Import useEffect
|
import {useEffect} from 'react';
|
||||||
import { useLocation } from 'react-router-dom'; // 2. Import useLocation
|
import { useLocation } from 'react-router-dom';
|
||||||
import Home from '../components/Home/Home.jsx';
|
import Home from './components/Home/Home.jsx';
|
||||||
import Experiences from '../components/Experiences/Experiences.jsx';
|
import Experiences from './components/Experiences/Experiences.jsx';
|
||||||
import Projects from '../components/Projects/Projects.jsx';
|
import Projects from '../../components/Projects/Projects.jsx';
|
||||||
import Skills from '../components/Skills/Skills.jsx';
|
import Skills from './components/Skills/Skills.jsx';
|
||||||
import Footer from '../components/Footer/Footer.jsx';
|
import Footer from '../../components/Footer/Footer.jsx';
|
||||||
|
|
||||||
function HomePage() {
|
function HomePage() {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import './Home.css';
|
import './Home.css';
|
||||||
import Background from "../thirdParty/Background/Background.jsx";
|
import Background from "../../../../components/thirdParty/Background/Background.jsx";
|
||||||
import NavBar from "../NavBar/NavBar.jsx";
|
import NavBar from "../../../../components/NavBar/NavBar.jsx";
|
||||||
function Home() {
|
function Home() {
|
||||||
return (
|
return (
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import SkillCard from "../SkillCard/SkillCard.jsx";
|
import SkillCard from "../../../../components/SkillCard/SkillCard.jsx";
|
||||||
import "./Skills.css";
|
import "./Skills.css";
|
||||||
|
|
||||||
function Skills() {
|
function Skills() {
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import NavBar from "../components/NavBar/NavBar.jsx";
|
import ProjectDetails from "./components/ProjectDetails/ProjectDetails.jsx";
|
||||||
import ProjectDetails from "../components/ProjectDetails/ProjectDetails.jsx";
|
import Footer from "../../components/Footer/Footer.jsx";
|
||||||
import Footer from "../components/Footer/Footer.jsx";
|
|
||||||
|
|
||||||
function ProjectDetailsPage() {
|
function ProjectDetailsPage() {
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
import "./ProjectDetails.css"
|
import "./ProjectDetails.css"
|
||||||
import SkillCard from "../SkillCard/SkillCard.jsx";
|
import SkillCard from "../../../../components/SkillCard/SkillCard.jsx";
|
||||||
import React, {useEffect, useState} from "react";
|
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 ReactMarkdown from 'react-markdown';
|
||||||
import remarkGfm from 'remark-gfm';
|
import remarkGfm from 'remark-gfm';
|
||||||
import {useNavigate} from "react-router-dom";
|
import {useNavigate} from "react-router-dom";
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import Projects from "../components/Projects/Projects.jsx";
|
import Projects from "../../components/Projects/Projects.jsx";
|
||||||
import Footer from "../components/Footer/Footer.jsx";
|
import Footer from "../../components/Footer/Footer.jsx";
|
||||||
|
|
||||||
function ProjectsPage() {
|
function ProjectsPage() {
|
||||||
return (
|
return (
|
||||||
Reference in New Issue
Block a user