From 840b2e6fa194e6c0ffafaabc3a22bade27b788c7 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Sat, 12 Nov 2022 12:24:58 +0200 Subject: [PATCH] refactor (og tags): create a new OgTags component --- public/index.html | 1 + src/App.tsx | 20 ++++++------------- src/Components/OgTags/OgTags.tsx | 20 +++++++++++++++++++ src/features/About/AboutPage.tsx | 12 +++++------ .../pages/ExplorePage/ExplorePage.tsx | 14 ++++++------- .../pages/ExplorePage/Header/Header.tsx | 4 ++-- .../ProjectDetailsCard/ProjectDetailsCard.tsx | 9 ++++++--- 7 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 src/Components/OgTags/OgTags.tsx diff --git a/public/index.html b/public/index.html index 3830b3d..5731011 100644 --- a/public/index.html +++ b/public/index.html @@ -39,6 +39,7 @@ diff --git a/src/App.tsx b/src/App.tsx index 6be8747..d9e8137 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,12 +3,12 @@ import ModalsContainer from "src/Components/Modals/ModalsContainer/ModalsContain import { Navigate, Route, Routes } from "react-router-dom"; import { useWrapperSetup } from "./utils/Wrapper"; import LoadingPage from "./Components/LoadingPage/LoadingPage"; -import { Helmet } from "react-helmet"; import { NavbarLayout } from "./utils/routing/layouts"; import { Loadable, PAGES_ROUTES } from "./utils/routing"; import { URLModal } from "react-url-modal"; import ProjectDetailsCard from 'src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard'; import ReactModal from "react-modal"; +import OgTags from "./Components/OgTags/OgTags"; const ExplorePage = Loadable(React.lazy(() => import( /* webpackChunkName: "explore_page" */ "src/features/Projects/pages/ExplorePage/ExplorePage"))) const AboutPage = Loadable(React.lazy(() => import( /* webpackChunkName: "about_page" */ "src/features/About/AboutPage"))) @@ -52,19 +52,11 @@ function App() { return
- - Lightning Landscape - - - + + {props.title && {props.title}} + {props.title && } + {props.description && } + {props.description && } + {props.image && } + + ) +} diff --git a/src/features/About/AboutPage.tsx b/src/features/About/AboutPage.tsx index 2257e1d..0492695 100644 --- a/src/features/About/AboutPage.tsx +++ b/src/features/About/AboutPage.tsx @@ -1,10 +1,10 @@ -import React, { useEffect } from 'react' -import { Helmet } from 'react-helmet' +import { useEffect } from 'react' import Header from './components/Header' import MadeBy from './components/MadeBy' import Missions from './components/Missions' import { setTheme } from 'src/redux/features/ui.slice' import { useAppDispatch } from 'src/utils/hooks' +import OgTags from 'src/Components/OgTags/OgTags' export default function AboutPage() { @@ -20,10 +20,10 @@ export default function AboutPage() { return ( <> - - {`About Lightning Landscape`} - - +
diff --git a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx index 97c9b12..02ee9cf 100644 --- a/src/features/Projects/pages/ExplorePage/ExplorePage.tsx +++ b/src/features/Projects/pages/ExplorePage/ExplorePage.tsx @@ -2,9 +2,8 @@ import ErrorMessage from 'src/Components/Errors/ErrorMessage/ErrorMessage'; import { useExplorePageQuery } from 'src/graphql'; import ProjectsGrid from './ProjectsGrid/ProjectsGrid'; -import { Helmet } from "react-helmet"; import Categories, { Category } from '../../Components/Categories/Categories'; -import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { useCallback, useEffect, useMemo, useState } from 'react'; import Header from './Header/Header'; import Button from 'src/Components/Button/Button'; import { useAppDispatch } from 'src/utils/hooks'; @@ -19,6 +18,7 @@ import { useUpdateUrlWithFilters } from './helpers'; import { withBasicProvider } from 'src/utils/helperFunctions'; import { ProjectsFiltersProvider, useProjectsFilters } from './filters-context'; import { setTheme } from 'src/redux/features/ui.slice'; +import OgTags from 'src/Components/OgTags/OgTags'; function ExplorePage() { @@ -102,12 +102,10 @@ function ExplorePage() { return ( <> - - {`Lightning Landscape`} - - - - +
diff --git a/src/features/Projects/pages/ExplorePage/Header/Header.tsx b/src/features/Projects/pages/ExplorePage/Header/Header.tsx index 02e0b03..7f6325f 100644 --- a/src/features/Projects/pages/ExplorePage/Header/Header.tsx +++ b/src/features/Projects/pages/ExplorePage/Header/Header.tsx @@ -52,10 +52,10 @@ export default function Header(props: Props) { {currentHeader === 'all-default' && <>

Brought to you by

diff --git a/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.tsx b/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.tsx index 2332a58..da3ccc0 100644 --- a/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.tsx +++ b/src/features/Projects/pages/ProjectPage/ProjectDetailsCard/ProjectDetailsCard.tsx @@ -1,8 +1,6 @@ -import { useEffect, useState } from 'react' -import { MdLocalFireDepartment } from 'react-icons/md'; +import { useState } from 'react' import { ModalCard } from 'src/Components/Modals/ModalsContainer/ModalsContainer'; import { useAppDispatch, useAppSelector, useMediaQuery } from 'src/utils/hooks'; -import { Direction, openModal, scheduleModal } from 'src/redux/features/modals.slice'; import { setProject } from 'src/redux/features/project.slice'; import Button from 'src/Components/Button/Button'; import ProjectCardSkeleton from './ProjectDetailsCard.Skeleton' @@ -17,6 +15,7 @@ import Badge from 'src/Components/Badge/Badge'; import { IoMdClose } from 'react-icons/io'; import { CgGitFork } from 'react-icons/cg'; import { Helmet } from 'react-helmet'; +import OgTags from 'src/Components/OgTags/OgTags'; interface Props extends ModalCard { @@ -120,6 +119,10 @@ export default function ProjectDetailsCard({ params: { projectId }, ...props }: + {/* Cover Image */}
{/* */}