From a9a4747dd01df65d07f4da0bb99cdf3c35a76b12 Mon Sep 17 00:00:00 2001 From: AdelinaMoroaca Date: Sun, 2 Feb 2025 23:22:50 +0200 Subject: [PATCH 1/3] Scaling components for layout --- src/components/Logo.jsx | 14 ++++++++++++++ src/components/Navigation.jsx | 11 +++++++++++ 2 files changed, 25 insertions(+) create mode 100644 src/components/Logo.jsx create mode 100644 src/components/Navigation.jsx diff --git a/src/components/Logo.jsx b/src/components/Logo.jsx new file mode 100644 index 00000000..e2ac4367 --- /dev/null +++ b/src/components/Logo.jsx @@ -0,0 +1,14 @@ +import logo from "../assets/svg/logo.svg"; + +const LOGO_TYPE_CLASSES = { + primary: '', + secondary: '' +} + +const Logo = ({className, logoType}) => { + return ( + logo + ); +}; + +export default Logo; \ No newline at end of file diff --git a/src/components/Navigation.jsx b/src/components/Navigation.jsx new file mode 100644 index 00000000..1c682cb4 --- /dev/null +++ b/src/components/Navigation.jsx @@ -0,0 +1,11 @@ +import Logo from "./Logo"; + +const Navigation = () => { + return ( +
+ +
+ ); +}; + +export default Navigation; \ No newline at end of file From 101978143b8e3576200ad7d4baef3a42f612878f Mon Sep 17 00:00:00 2001 From: AdelinaMoroaca Date: Wed, 5 Feb 2025 00:19:05 +0200 Subject: [PATCH 2/3] Scaling navigation component for policy pages --- src/components/Logo.jsx | 2 +- src/components/Navigation.jsx | 13 ++++++++++--- src/pages/Landing.jsx | 2 ++ src/pages/Privacy.jsx | 2 ++ src/pages/TermsOfUse.jsx | 18 +++++++++++++++--- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/components/Logo.jsx b/src/components/Logo.jsx index e2ac4367..c40c1464 100644 --- a/src/components/Logo.jsx +++ b/src/components/Logo.jsx @@ -5,7 +5,7 @@ const LOGO_TYPE_CLASSES = { secondary: '' } -const Logo = ({className, logoType}) => { +const Logo = ({children, className, logoType, ...otherProps}) => { return ( logo ); diff --git a/src/components/Navigation.jsx b/src/components/Navigation.jsx index 1c682cb4..8e4d5b2c 100644 --- a/src/components/Navigation.jsx +++ b/src/components/Navigation.jsx @@ -1,9 +1,16 @@ import Logo from "./Logo"; -const Navigation = () => { +const NAV_TYPE_CLASSES = { + green: 'fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(4,138,129,0.2)_19%,_rgba(40,83,107,1)_100%)]', + orange: 'fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(243,120,29,0.5)_77%,_rgba(255,106,106,0.5)_100%)]', +} + +const Navigation = ({ children, className, navType, ...otherProps}) => { return ( -
- +
+ {/* className="w-[80%] md:w-[80%] border-b border-border_grey"> */} + + {children}
); }; diff --git a/src/pages/Landing.jsx b/src/pages/Landing.jsx index b63cbe4f..ccd11d5c 100644 --- a/src/pages/Landing.jsx +++ b/src/pages/Landing.jsx @@ -2,6 +2,7 @@ import { useState, useEffect } from "react"; import { getNumberOfJobs } from "../utils/fetchData"; // images import logo from "../assets/svg/logo.svg"; +// import Navigation from "../components/Navigation"; import dungi from "../assets/svg/dungi.svg"; // racheta import racheta from "../assets/svg/racheta.svg"; @@ -60,6 +61,7 @@ const Landing = () => { +
diff --git a/src/pages/Privacy.jsx b/src/pages/Privacy.jsx index f5c4a9d7..57d07881 100644 --- a/src/pages/Privacy.jsx +++ b/src/pages/Privacy.jsx @@ -1,6 +1,7 @@ import React, { useEffect } from "react"; import HomeLink from "../components/CustomLinks"; import Layout from "../components/Layout"; +import Navigation from "../components/Navigation"; const Privacy = () => { useEffect(() => { @@ -9,6 +10,7 @@ const Privacy = () => { return ( +
diff --git a/src/pages/TermsOfUse.jsx b/src/pages/TermsOfUse.jsx index bf084928..2b7b7c43 100644 --- a/src/pages/TermsOfUse.jsx +++ b/src/pages/TermsOfUse.jsx @@ -1,6 +1,7 @@ import React, { useEffect } from "react"; import HomeLink from "../components/CustomLinks"; import Layout from "../components/Layout"; +import Navigation from "../components/Navigation"; const TermsOfUse = () => { useEffect(() => { @@ -9,12 +10,23 @@ const TermsOfUse = () => { return ( +
-

+ // className="font-PoppinsRegular w-full flex items-center justify-center flex-wrap flex-col py-16 md:py-24 lg:py-32 leading-[110%] bg-[radial-gradient(circle,_rgba(4,138,129,1)_19%,_rgba(40,83,107,1)_100%)]"> + className="font-PoppinsRegular w-full flex justify-center flex-wrap flex-col py-16 md:py-24 lg:py-32 leading-[110%] bg-[radial-gradient(circle,_rgba(4,138,129,1)_19%,_rgba(40,83,107,1)_100%)]"> + + {/* */} +
+ +

+ Condiții de utilizare +

+
+ + {/*

Condiții de utilizare -

+

*/}
From e2ba4ef8d1eb780f14fda0aa71790262e26f35f0 Mon Sep 17 00:00:00 2001 From: AdelinaMoroaca Date: Thu, 6 Feb 2025 22:47:34 +0200 Subject: [PATCH 3/3] Small updates --- src/assets/svg/logo-white.svg | 22 ++++++++++++++++++++++ src/assets/svg/scroll-up-orange.svg | 23 +++++++++++++++++++++++ src/components/Logo.jsx | 12 +++++++++--- src/components/Navigation.jsx | 12 ++++++------ src/pages/Landing.jsx | 3 ++- src/pages/Privacy.jsx | 29 +++++++++++++++++++++++++++-- tailwind.config.js | 3 +++ 7 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 src/assets/svg/logo-white.svg create mode 100644 src/assets/svg/scroll-up-orange.svg diff --git a/src/assets/svg/logo-white.svg b/src/assets/svg/logo-white.svg new file mode 100644 index 00000000..b899ecfd --- /dev/null +++ b/src/assets/svg/logo-white.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/svg/scroll-up-orange.svg b/src/assets/svg/scroll-up-orange.svg new file mode 100644 index 00000000..a3f7486f --- /dev/null +++ b/src/assets/svg/scroll-up-orange.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Logo.jsx b/src/components/Logo.jsx index c40c1464..aefe84af 100644 --- a/src/components/Logo.jsx +++ b/src/components/Logo.jsx @@ -1,13 +1,19 @@ -import logo from "../assets/svg/logo.svg"; +// import logo from "../assets/svg/logo.svg"; +import logoWhite from "../assets/svg/logo-white.svg"; const LOGO_TYPE_CLASSES = { primary: '', - secondary: '' + logoWhite: 'pl-5 md:pl-20 lg:pl-50 xl:pl-60 2xl:pl-40' } const Logo = ({children, className, logoType, ...otherProps}) => { return ( - logo + <> + {/* logo */} + logo + + + ); }; diff --git a/src/components/Navigation.jsx b/src/components/Navigation.jsx index 8e4d5b2c..072d5f3d 100644 --- a/src/components/Navigation.jsx +++ b/src/components/Navigation.jsx @@ -1,15 +1,15 @@ import Logo from "./Logo"; const NAV_TYPE_CLASSES = { - green: 'fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(4,138,129,0.2)_19%,_rgba(40,83,107,1)_100%)]', - orange: 'fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(243,120,29,0.5)_77%,_rgba(255,106,106,0.5)_100%)]', -} + green: 'border-b border-border_grey pt-5 fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(4,138,129,0.2)_19%,_rgba(40,83,107,1)_100%)] backdrop-blur-custom', + orange: 'border-b border-border_grey pt-5 fixed top-0 w-full z-50 bg-[radial-gradient(circle,_rgba(243,120,29,0.5)_77%,_rgba(255,106,106,0.5)_100%)] backdrop-blur-custom', +}; -const Navigation = ({ children, className, navType, ...otherProps}) => { +const Navigation = ({ children, className, navType }) => { return ( -
+
{/* className="w-[80%] md:w-[80%] border-b border-border_grey"> */} - + {children}
); diff --git a/src/pages/Landing.jsx b/src/pages/Landing.jsx index ccd11d5c..232b211e 100644 --- a/src/pages/Landing.jsx +++ b/src/pages/Landing.jsx @@ -2,7 +2,8 @@ import { useState, useEffect } from "react"; import { getNumberOfJobs } from "../utils/fetchData"; // images import logo from "../assets/svg/logo.svg"; -// import Navigation from "../components/Navigation"; +// import Navigat +// ion from "../components/Navigation"; import dungi from "../assets/svg/dungi.svg"; // racheta import racheta from "../assets/svg/racheta.svg"; diff --git a/src/pages/Privacy.jsx b/src/pages/Privacy.jsx index 57d07881..5603ccfd 100644 --- a/src/pages/Privacy.jsx +++ b/src/pages/Privacy.jsx @@ -1,20 +1,37 @@ -import React, { useEffect } from "react"; +import React, { useEffect, useState } from "react"; import HomeLink from "../components/CustomLinks"; import Layout from "../components/Layout"; import Navigation from "../components/Navigation"; +import Button from "../components/Button"; +import scrollUpOrange from "../assets/svg/scroll-up-orange.svg"; const Privacy = () => { + const [isVisible, setIsVisible] = useState(false); + useEffect(() => { window.scrollTo(0, 0); }, []); + useEffect(() => { + const checkScrollHeight = () => { + setIsVisible(window.scrollY > 500); + }; + window.addEventListener("scroll", checkScrollHeight); + + return () => window.removeEventListener("scroll", checkScrollHeight); + }, []); + + function handleScrollToTop() { + window.scrollTo({ top: 0, behavior: "smooth" }); + } + return (
-

+

Confidențialitate

@@ -255,6 +272,14 @@ const Privacy = () => {
+ + ); }; diff --git a/tailwind.config.js b/tailwind.config.js index aec274c3..e4528655 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -32,6 +32,9 @@ module.exports = { hover_card_shadow: "0px 1px 2px 0px #0000004d", button_shadow: "0px 5px 5px 0px #00000040 inset", checbox_shadow: "0px 4px 14px 0px #0000001a;" + }, + backdropBlur: { + custom: "8.9px" } } },