diff --git a/src/components/common/BackToTop.jsx b/src/components/common/BackToTop.jsx deleted file mode 100644 index d9c51a7..0000000 --- a/src/components/common/BackToTop.jsx +++ /dev/null @@ -1,47 +0,0 @@ -import React, { useEffect, useState } from 'react' -import { BsFillArrowUpCircleFill } from 'react-icons/bs' - -export default function BackToTop() { - const [backToTop,setBackToTop]=useState(false) - useEffect(()=>{ - window.addEventListener('scroll',()=>{ - if(window.scrollY>100){ - setBackToTop(true) - - }else{ - setBackToTop(false) - } - }) - },[]) - const scrollUp=()=>{ - window.scrollTo({ - top:0, - behavior:'smooth', - }) - } - return ( - <> - - {backToTop && ( - - - - - )} - - ) -} diff --git a/src/components/layout/DashboardLayout.jsx b/src/components/layout/DashboardLayout.jsx index 760dfdd..6bb7905 100644 --- a/src/components/layout/DashboardLayout.jsx +++ b/src/components/layout/DashboardLayout.jsx @@ -8,15 +8,11 @@ import { useNavigate, } from "react-router-dom"; import Login from "../../pages/auth/Login"; -import {BsFillArrowUpCircleFill} from 'react-icons/bs' - import "../../styles/argon.css"; import "../../styles/style.css"; -import BackToTop from "../common/BackToTop"; const DashboardLayout = () => { - const navigate = useNavigate(); const logout = () => { @@ -46,7 +42,6 @@ const DashboardLayout = () => { - ); }; diff --git a/src/components/layout/HomeLayout.jsx b/src/components/layout/HomeLayout.jsx index e5bdef9..f0b97e5 100644 --- a/src/components/layout/HomeLayout.jsx +++ b/src/components/layout/HomeLayout.jsx @@ -7,7 +7,6 @@ import { Link, Outlet } from "react-router-dom"; import "bootstrap/dist/css/bootstrap.min.css"; import "../../styles/argon.css"; import "../../styles/style.css"; -import BackToTop from "../common/BackToTop"; const HomeLayout = () => { @@ -118,11 +117,7 @@ const HomeLayout = () => { - - - - - + ); }; diff --git a/src/pages/portfolio/template/common/BackToTop.jsx b/src/pages/portfolio/template/common/BackToTop.jsx new file mode 100644 index 0000000..1ed0607 --- /dev/null +++ b/src/pages/portfolio/template/common/BackToTop.jsx @@ -0,0 +1,35 @@ +import React, { useEffect, useState } from "react"; +import { FaChevronUp } from "react-icons/fa"; + +const BackToTop = () => { + const [backToTop, setBackToTop] = useState(false); + + useEffect(() => { + window.addEventListener("scroll", () => { + if (window.scrollY > 150) { + setBackToTop(true); + } else { + setBackToTop(false); + } + }); + }, []); + + const scrollUp = () => { + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + }; + + return ( + <> + {backToTop && ( +
+ scrollUp()} size={24} /> +
+ )} + + ); +}; + +export default BackToTop; diff --git a/src/pages/portfolio/template/common/Footer.jsx b/src/pages/portfolio/template/common/Footer.jsx index f80ca95..c9180ea 100644 --- a/src/pages/portfolio/template/common/Footer.jsx +++ b/src/pages/portfolio/template/common/Footer.jsx @@ -6,7 +6,7 @@ const Footer = ({ portfolioDetails }) => {
-

Copyrights © 2022 {portfolioDetails?.name}

+

Copyrights © 2023 {portfolioDetails?.name}

diff --git a/src/pages/portfolio/template/template1/Template1.jsx b/src/pages/portfolio/template/template1/Template1.jsx index 4b8e1c5..3c53cc3 100644 --- a/src/pages/portfolio/template/template1/Template1.jsx +++ b/src/pages/portfolio/template/template1/Template1.jsx @@ -4,13 +4,14 @@ import Projects from "./components/Projects"; import Skills from "./components/Skills"; import Works from "./components/Works"; import Toggle from "../common/Toggle"; +import BackToTop from "../common/BackToTop"; + import { useParams } from "react-router"; import { apiCommon } from "../../../../services/models/CommonModel"; import { PageLoader } from "../../../../components/common/CustomLoaders"; import "./styles/style.css"; -import BackToTop from "../../../../components/common/BackToTop"; const Portfolio = () => { const [isLoading, setLoading] = useState(true); @@ -28,6 +29,7 @@ const Portfolio = () => { }); setLoading(false); } catch (error) { + // eslint-disable-next-line no-console console.log(error); } }; @@ -42,7 +44,8 @@ const Portfolio = () => { ) : (
- + + @@ -50,7 +53,6 @@ const Portfolio = () => {
)} - ); }; diff --git a/src/pages/portfolio/template/template1/styles/style.css b/src/pages/portfolio/template/template1/styles/style.css index 1ccee4f..b811106 100644 --- a/src/pages/portfolio/template/template1/styles/style.css +++ b/src/pages/portfolio/template/template1/styles/style.css @@ -34,7 +34,7 @@ .img-align { justify-content: left; - margin-left: -50px; + margin-left: -80px; } @media only screen and (max-width: 770px) { .img-align { @@ -113,23 +113,6 @@ li.timeline-item::before { box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); } -.toggle-div { - position: fixed; - width: 52px; - height: 50px; - bottom: 10px; - right: 10px; - background-color: #fff; - border-radius: 50%; - text-align: center; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); - z-index: 10; - display: flex; - align-items: center; - justify-content: center; -} - - .template1 .btn-resume-1 { background-color: transparent; border: 1px solid #fff; diff --git a/src/pages/portfolio/template/template1/styles/style.css.map b/src/pages/portfolio/template/template1/styles/style.css.map index 49d9e5c..632b489 100644 --- a/src/pages/portfolio/template/template1/styles/style.css.map +++ b/src/pages/portfolio/template/template1/styles/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"AAMA;EACE,kBAAA;ACLF;;ADQA;EACE,yBAAA;ACLF;;ADQA;EACE,6CAfmB;EAgBnB,mDAhBmB;ACWrB;;ADQA;EACE,6CAjBkB;EAkBlB,mDAlBkB;ACapB;;ADQA;EACE,2CAAA;ACLF;;ADQA;EACE,qCAAA;EACA,oBAAA;KAAA,iBAAA;ACLF;;ADQA;EACE,qCAAA;EACA,oBAAA;KAAA,iBAAA;ACLF;;ADQA;EACE,qBAAA;EACA,kBAAA;ACLF;ADME;EAHF;IAII,uBAAA;ECHF;AACF;;ADMA;EACE,oCAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,UAAA;EACA,qCAAA;ACHF;;ADMA;EACE,oCAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,UAAA;EACA,qCAAA;ACHF;;ADMA;EACE,mBAAA;ACHF;;ADMA,oBAAA;AACA;EACE,qBAAA;EACA,kBAAA;EACA,oBAAA;ACHF;;ADMA,2BAAA;AACA;EACE,YAAA;EACA,gBAAA;EACA,qBAAA;EACA,kBAAA;EACA,UAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,mBAAA;ACHF;;ADMA;EACE,cAAA;ACHF;;ADMA,wBAAA;AACA;EACE,oCAAA;EACA,+BAAA;EACA,uCAAA;EACA,cAAA;EACA,kBAAA;EACA,UAAA;ACHF;;ADMA,gCAAA;AACA;EACE,YAAA;EACA,gBAAA;EACA,qBAAA;EACA,kBAAA;EACA,kBAAA;EACA,sBAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,sCAAA;ACHF;;ADMA;EACE,eAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,sBAAA;EACA,mBAAA;EACA,kBAAA;EACA,sCAAA;EACA,WAAA;ACHF;ADIE;EACE,gBAAA;ACFJ;;ADMA;EACE,6BAAA;EACA,sBAAA;EACA,kBAAA;EACA,0BAAA;ACHF","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"AAMA;EACE,kBAAA;ACLF;;ADQA;EACE,yBAAA;ACLF;;ADQA;EACE,6CAfmB;EAgBnB,mDAhBmB;ACWrB;;ADQA;EACE,6CAjBkB;EAkBlB,mDAlBkB;ACapB;;ADQA;EACE,2CAAA;ACLF;;ADQA;EACE,qCAAA;EACA,oBAAA;KAAA,iBAAA;ACLF;;ADQA;EACE,qCAAA;EACA,oBAAA;KAAA,iBAAA;ACLF;;ADQA;EACE,qBAAA;EACA,kBAAA;ACLF;ADME;EAHF;IAII,uBAAA;ECHF;AACF;;ADMA;EACE,oCAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,UAAA;EACA,qCAAA;ACHF;;ADMA;EACE,oCAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,UAAA;EACA,qCAAA;ACHF;;ADMA;EACE,mBAAA;ACHF;;ADMA,oBAAA;AACA;EACE,qBAAA;EACA,kBAAA;EACA,oBAAA;ACHF;;ADMA,2BAAA;AACA;EACE,YAAA;EACA,gBAAA;EACA,qBAAA;EACA,kBAAA;EACA,UAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,mBAAA;ACHF;;ADMA;EACE,cAAA;ACHF;;ADMA,wBAAA;AACA;EACE,oCAAA;EACA,+BAAA;EACA,uCAAA;EACA,cAAA;EACA,kBAAA;EACA,UAAA;ACHF;;ADMA,gCAAA;AACA;EACE,YAAA;EACA,gBAAA;EACA,qBAAA;EACA,kBAAA;EACA,kBAAA;EACA,sBAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,sCAAA;ACHF;;ADMA;EACE,6BAAA;EACA,sBAAA;EACA,kBAAA;EACA,0BAAA;ACHF","file":"style.css"} \ No newline at end of file diff --git a/src/pages/portfolio/template/template1/styles/style.scss b/src/pages/portfolio/template/template1/styles/style.scss index 1bc83a2..339f402 100644 --- a/src/pages/portfolio/template/template1/styles/style.scss +++ b/src/pages/portfolio/template/template1/styles/style.scss @@ -115,22 +115,6 @@ li.timeline-item::before { box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); } -.toggle-div { - position: fixed; - width: 60px; - height: 60px; - bottom: 70px; - right: 10px; - background-color: #fff; - border-radius: 50px; - text-align: center; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); - z-index: 10; - svg { - margin-top: 18px; - } -} - .template1 .btn-resume-1 { background-color: transparent; border: 1px solid #fff; diff --git a/src/pages/portfolio/template/template2/Template2.jsx b/src/pages/portfolio/template/template2/Template2.jsx index 9b5d86f..746f920 100644 --- a/src/pages/portfolio/template/template2/Template2.jsx +++ b/src/pages/portfolio/template/template2/Template2.jsx @@ -8,11 +8,11 @@ import Gallery from "./components/Gallery"; import Footer from "../common/Footer"; import Toggle from "../common/Toggle"; +import BackToTop from "../common/BackToTop"; import { PageLoader } from "../../../../components/common/CustomLoaders"; import "./styles/style.css"; -import BackToTop from "../../../../components/common/BackToTop"; const Portfolio = () => { const [isLoading, setLoading] = useState(true); @@ -33,6 +33,7 @@ const Portfolio = () => { }); setLoading(false); } catch (error) { + // eslint-disable-next-line no-console console.log(error); } }; @@ -47,6 +48,7 @@ const Portfolio = () => { ) : ( +
@@ -54,7 +56,6 @@ const Portfolio = () => {
)} - ); }; diff --git a/src/pages/portfolio/template/template2/styles/style.css b/src/pages/portfolio/template/template2/styles/style.css index f387558..6f79683 100644 --- a/src/pages/portfolio/template/template2/styles/style.css +++ b/src/pages/portfolio/template/template2/styles/style.css @@ -14,21 +14,31 @@ .name::before { content: ""; display: block; - width: 11%; + width: 200px; height: 2px; left: 0; top: 50%; position: absolute; } +@media only screen and (max-width: 700px) { + .name::before { + width: 50px; + } +} .name::after { content: ""; display: block; - width: 11%; + width: 200px; height: 2px; right: 0; top: 50%; position: absolute; } +@media only screen and (max-width: 700px) { + .name::after { + width: 50px; + } +} .gallery .col-md-3 { padding: 0.35rem; @@ -39,4 +49,4 @@ .bg-dark { background-color: #212121 !important; -} /*# sourceMappingURL=style.css.map */ +}/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/src/pages/portfolio/template/template2/styles/style.css.map b/src/pages/portfolio/template/template2/styles/style.css.map index bddec1c..286974f 100644 --- a/src/pages/portfolio/template/template2/styles/style.css.map +++ b/src/pages/portfolio/template/template2/styles/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"AAAA;EACE,iBAAA;ACCF;;ADCA;EACE,iBAAA;ACEF;;ADAA;EACE,kBAAA;ACGF;ADDE;EACE,WAAA;EACA,cAAA;EACA,YAAA;EACA,WAAA;EAEA,OAAA;EACA,QAAA;EACA,kBAAA;ACEJ;ADAE;EACE,WAAA;EACA,cAAA;EACA,YAAA;EACA,WAAA;EAEA,QAAA;EACA,QAAA;EACA,kBAAA;ACCJ;;ADIE;EACE,gBAAA;ACDJ;ADEI;EACE,kBAAA;ACAN;;ADKA;EACE,oCAAA;ACFF","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.scss","style.css"],"names":[],"mappings":"AAEA;;EAEE,iBAAA;ACDF;;ADGA;;EAEE,iBAAA;ACAF;;ADGA;EACE,kBAAA;ACAF;ADEE;EACE,WAAA;EACA,cAAA;EACA,YAAA;EACA,WAAA;EAEA,OAAA;EACA,QAAA;EACA,kBAAA;ACDJ;ADGI;EAVF;IAWI,WAAA;ECAJ;AACF;ADGE;EACE,WAAA;EACA,cAAA;EACA,YAAA;EACA,WAAA;EAEA,QAAA;EACA,QAAA;EACA,kBAAA;ACFJ;ADII;EAVF;IAWI,WAAA;ECDJ;AACF;;ADME;EACE,gBAAA;ACHJ;ADII;EACE,kBAAA;ACFN;;ADOA;EACE,oCAAA;ACJF","file":"style.css"} \ No newline at end of file diff --git a/src/pages/portfolio/template/template2/styles/style.scss b/src/pages/portfolio/template/template2/styles/style.scss index 4158041..d852e8d 100644 --- a/src/pages/portfolio/template/template2/styles/style.scss +++ b/src/pages/portfolio/template/template2/styles/style.scss @@ -1,31 +1,45 @@ -.ba1::before,.ba1::after{ +$tab-device: 700px; + +.ba1::before, +.ba1::after { background: white; } -.ba2::before,.ba2::after{ +.ba2::before, +.ba2::after { background: black; } + .name { position: relative; &::before { content: ""; display: block; - width: 120px; + width: 200px; height: 2px; - + left: 0; top: 50%; position: absolute; + + @media only screen and (max-width: $tab-device) { + width: 50px; + } } + &::after { content: ""; display: block; - width: 120px; + width: 200px; height: 2px; - + right: 0; top: 50%; position: absolute; + + @media only screen and (max-width: $tab-device) { + width: 50px; + } } } diff --git a/src/pages/portfolio/template/template3/Template3.jsx b/src/pages/portfolio/template/template3/Template3.jsx index 7d2c58b..20e150f 100644 --- a/src/pages/portfolio/template/template3/Template3.jsx +++ b/src/pages/portfolio/template/template3/Template3.jsx @@ -13,7 +13,7 @@ import { PageLoader } from "../../../../components/common/CustomLoaders"; import Behance from "./components/Behance"; import Medium from "./components/Medium"; import Footer from "../common/Footer"; -import BackToTop from "../../../../components/common/BackToTop"; +import BackToTop from "../common/BackToTop"; import Grad1 from "../../../../assets/gradients/gradient-1.svg"; import Grad2 from "../../../../assets/gradients/gradient-2.svg"; @@ -67,14 +67,21 @@ const Portfolio = () => { ) : ( - + -
+ +
{checkFields("behanceRssLink") && ( @@ -87,7 +94,6 @@ const Portfolio = () => {
)} - ); }; diff --git a/src/pages/portfolio/template/template3/components/Topbar.jsx b/src/pages/portfolio/template/template3/components/Topbar.jsx index 1b0fb51..d993de6 100644 --- a/src/pages/portfolio/template/template3/components/Topbar.jsx +++ b/src/pages/portfolio/template/template3/components/Topbar.jsx @@ -14,7 +14,7 @@ const Topbar = ({ portfolioDetails }) => { return ( - + {portfolioDetails?.behanceRssLink && ( Behance @@ -26,12 +26,12 @@ const Topbar = ({ portfolioDetails }) => { )} - +

{portfolioDetails?.name}

- + {portfolioDetails?.socialLinks?.map((social) => (