From 36bba6c5a195b5165c1cac37899ef624a7cf37fd Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Thu, 27 Apr 2023 15:13:14 +0300 Subject: [PATCH] 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 = () => {
  • - Вход для партнеров + Вход для партнеров
  • - Кабинет разработчика + Кабинет разработчика
  • Школа @@ -61,7 +62,7 @@ export const SideBar = () => { Контакты
  • - Блог + Блог
  • FAQ diff --git a/src/components/UI/FreeDevelopers/FreeDevelopers.js b/src/components/UI/FreeDevelopers/FreeDevelopers.jsx similarity index 100% rename from src/components/UI/FreeDevelopers/FreeDevelopers.js rename to src/components/UI/FreeDevelopers/FreeDevelopers.jsx diff --git a/src/components/UI/ModalAdd/ModalAdd.js b/src/components/UI/ModalAdd/ModalAdd.jsx similarity index 100% rename from src/components/UI/ModalAdd/ModalAdd.js rename to src/components/UI/ModalAdd/ModalAdd.jsx diff --git a/src/components/UI/ModalAspt/ModalAspt.js b/src/components/UI/ModalAspt/ModalAspt.jsx similarity index 100% rename from src/components/UI/ModalAspt/ModalAspt.js rename to src/components/UI/ModalAspt/ModalAspt.jsx diff --git a/src/components/UI/ModalCreate/ModalCreate.js b/src/components/UI/ModalCreate/ModalCreate.jsx similarity index 100% rename from src/components/UI/ModalCreate/ModalCreate.js rename to src/components/UI/ModalCreate/ModalCreate.jsx diff --git a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js b/src/components/UI/ModalErrorLogin/ModalErrorLogin.jsx similarity index 100% rename from src/components/UI/ModalErrorLogin/ModalErrorLogin.js rename to src/components/UI/ModalErrorLogin/ModalErrorLogin.jsx diff --git a/src/components/UI/ModalRegistration/ModalRegistration.js b/src/components/UI/ModalRegistration/ModalRegistration.jsx similarity index 100% rename from src/components/UI/ModalRegistration/ModalRegistration.js rename to src/components/UI/ModalRegistration/ModalRegistration.jsx diff --git a/src/components/UI/ModalSettings/ModalSettings.js b/src/components/UI/ModalSettings/ModalSettings.jsx similarity index 100% rename from src/components/UI/ModalSettings/ModalSettings.js rename to src/components/UI/ModalSettings/ModalSettings.jsx diff --git a/src/components/UI/ModalTicket/ModalTicket.js b/src/components/UI/ModalTicket/ModalTicket.jsx similarity index 98% rename from src/components/UI/ModalTicket/ModalTicket.js rename to src/components/UI/ModalTicket/ModalTicket.jsx index 89933e43..a2d00e58 100644 --- a/src/components/UI/ModalTicket/ModalTicket.js +++ b/src/components/UI/ModalTicket/ModalTicket.jsx @@ -52,7 +52,7 @@ export const ModalTiсket = ({ active, setActive, index }) => {

    Проект: {tiket.name} - +

    diff --git a/src/components/UI/TicketFullScreen/TicketFullScreen.js b/src/components/UI/TicketFullScreen/TicketFullScreen.jsx similarity index 100% rename from src/components/UI/TicketFullScreen/TicketFullScreen.js rename to src/components/UI/TicketFullScreen/TicketFullScreen.jsx diff --git a/src/pages/Blog/Blog.jsx b/src/pages/Blog/Blog.jsx new file mode 100644 index 00000000..fb09224d --- /dev/null +++ b/src/pages/Blog/Blog.jsx @@ -0,0 +1,45 @@ +import React from "react"; + +import AuthHeader from "../../components/AuthHeader/AuthHeader"; +import SideBar from "../../components/SideBar/SideBar"; +import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { Footer } from "../../components/Footer/Footer"; + +import arrowRight from "../../images/arrowRight.png"; + +import "./blog.scss"; + +export const Blog = ({}) => { + return ( +
    + + + +
    +
    + +
    + +
    +

    Блог

    +
    + +
    +

    + Из первых уст рассказываем о себе пользователям, делимся полезными и + важными материалами, стремимся получать обратную связь +

    +
    +
    + +
    + ); +}; + +export default Blog; diff --git a/src/pages/Blog/blog.scss b/src/pages/Blog/blog.scss new file mode 100644 index 00000000..8d9a44d4 --- /dev/null +++ b/src/pages/Blog/blog.scss @@ -0,0 +1,40 @@ +.blog { + background: #f1f1f1; + + &__breadCrumbs { + margin-top: 30px; + } + + &__title { + display: flex; + align-items: center; + justify-content: center; + + h1 { + font-weight: 500; + font-size: 48px; + line-height: 32px; + } + + h3 { + font-weight: 400; + font-size: 18px; + line-height: 28px; + } + + &-arrow { + margin: 0 27px 0 20px; + background: #80777769; + border-radius: 44px; + width: 30px; + height: 27px; + display: flex; + align-items: center; + justify-content: center; + + img { + width: 56%; + } + } + } +}