From 36bba6c5a195b5165c1cac37899ef624a7cf37fd Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Thu, 27 Apr 2023 15:13:14 +0300 Subject: [PATCH 1/4] Create new page Blog --- src/App.js | 5 ++- .../SideBar/{SideBar.js => SideBar.jsx} | 7 +-- .../{FreeDevelopers.js => FreeDevelopers.jsx} | 0 .../UI/ModalAdd/{ModalAdd.js => ModalAdd.jsx} | 0 .../ModalAspt/{ModalAspt.js => ModalAspt.jsx} | 0 .../{ModalCreate.js => ModalCreate.jsx} | 0 ...ModalErrorLogin.js => ModalErrorLogin.jsx} | 0 ...lRegistration.js => ModalRegistration.jsx} | 0 .../{ModalSettings.js => ModalSettings.jsx} | 0 .../{ModalTicket.js => ModalTicket.jsx} | 2 +- ...cketFullScreen.js => TicketFullScreen.jsx} | 0 src/pages/Blog/Blog.jsx | 45 +++++++++++++++++++ src/pages/Blog/blog.scss | 40 +++++++++++++++++ 13 files changed, 94 insertions(+), 5 deletions(-) rename src/components/SideBar/{SideBar.js => SideBar.jsx} (89%) rename src/components/UI/FreeDevelopers/{FreeDevelopers.js => FreeDevelopers.jsx} (100%) rename src/components/UI/ModalAdd/{ModalAdd.js => ModalAdd.jsx} (100%) rename src/components/UI/ModalAspt/{ModalAspt.js => ModalAspt.jsx} (100%) rename src/components/UI/ModalCreate/{ModalCreate.js => ModalCreate.jsx} (100%) rename src/components/UI/ModalErrorLogin/{ModalErrorLogin.js => ModalErrorLogin.jsx} (100%) rename src/components/UI/ModalRegistration/{ModalRegistration.js => ModalRegistration.jsx} (100%) rename src/components/UI/ModalSettings/{ModalSettings.js => ModalSettings.jsx} (100%) rename src/components/UI/ModalTicket/{ModalTicket.js => ModalTicket.jsx} (98%) rename src/components/UI/TicketFullScreen/{TicketFullScreen.js => TicketFullScreen.jsx} (100%) create mode 100644 src/pages/Blog/Blog.jsx create mode 100644 src/pages/Blog/blog.scss diff --git a/src/App.js b/src/App.js index e459d6c9..adf38d3b 100644 --- a/src/App.js +++ b/src/App.js @@ -39,6 +39,7 @@ import { PassingTests } from "./pages/quiz/PassingTests"; import "./assets/global.scss"; import "./fonts/stylesheet.css"; import "bootstrap/dist/css/bootstrap.min.css"; +import Blog from "./pages/Blog/Blog"; const App = () => { return ( @@ -50,7 +51,7 @@ const App = () => { } /> } > } /> @@ -60,6 +61,8 @@ const App = () => { element={} /> + }> + } /> } /> } /> diff --git a/src/components/SideBar/SideBar.js b/src/components/SideBar/SideBar.jsx similarity index 89% rename from src/components/SideBar/SideBar.js rename to src/components/SideBar/SideBar.jsx index 537afbab..89201a26 100644 --- a/src/components/SideBar/SideBar.js +++ b/src/components/SideBar/SideBar.jsx @@ -4,6 +4,7 @@ import arrow from "../../images/sideBarArrow.svg"; import LogoITguild from "../../images/LogoITguild.svg"; import "./sidebar.scss"; +import { Link } from "react-router-dom"; export const SideBar = () => { const [active, setActive] = useState(false); @@ -46,10 +47,10 @@ export const SideBar = () => {