Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added new svgs; updated Nav #638

Merged
merged 1 commit into from
Nov 24, 2024
Merged

added new svgs; updated Nav #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions public/images/shape-animation/dog-tag.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 12 additions & 6 deletions src/assets/svgs/shape-2.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 18 additions & 5 deletions src/containers/blog/layout-01/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,20 @@ type TProps = TSection & {
};
};

const BlogArea = ({ data: { section_title, motto, blogs }, space, bg, titleSize }: TProps) => {
const BlogArea = ({
data: { section_title, motto, blogs },
space,
bg,
titleSize,
}: TProps) => {
const { trans1, trans2 } = useUI();

return (
<Section className="blog-area tw-relative tw-overflow-hidden" space={space} bg={bg}>
<Section
className="blog-area tw-relative tw-overflow-hidden"
space={space}
bg={bg}
>
<div className="tw-absolute tw-inset-0 tw-flex jtw-justify-center tw-items-center">
<img
src="/images/bg/shape-03.png"
Expand Down Expand Up @@ -110,9 +119,13 @@ const BlogArea = ({ data: { section_title, motto, blogs }, space, bg, titleSize
y: trans1().y,
}}
>
<span className="tw-block -tw-indent-[99999px] tw-border-desert tw-rounded-full tw-border-[7px] tw-w-[60px] tw-h-[60px] md:tw-border-[12px] md:tw-w-[90px] md:tw-h-[90px]">
shape 3
</span>
<img
src="/images/shape-animation/dog-tag.svg"
alt="shape"
loading="lazy"
width={178}
height={178}
/>
</motion.div>
<motion.div
className="tw-absolute tw-z-1 tw-top-[220px] tw-left-[260px]"
Expand Down
33 changes: 25 additions & 8 deletions src/containers/contact-info/layout-01/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
<span className="tw-text-lg tw-text-heading tw-leading-none tw-font-medium tw-mb-2.5">
{section_title?.subtitle}
</span>
<h2 className="tw-leading-none tw-mb-10">{section_title.title}</h2>
<h2 className="tw-leading-none tw-mb-10">
{section_title.title}
</h2>
</>
)}
{items?.map((item) => (
Expand All @@ -43,7 +45,9 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
"tw-text-[32px] tw-text-primary tw-absolute tw-left-0 tw-top-0"
)}
/>
<h3 className="tw-text-lg tw-mb-3.8">{item.title}</h3>
<h3 className="tw-text-lg tw-mb-3.8">
{item.title}
</h3>
{item.texts?.map((text) => (
<p
key={text.id}
Expand Down Expand Up @@ -81,7 +85,10 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
}}
>
<span data-depth="3">
<img src="/images/shape-animation/about-shape-1.png" alt="" />
<img
src="/images/shape-animation/about-shape-1.png"
alt=""
/>
</span>
</motion.div>

Expand All @@ -92,7 +99,10 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
y: trans2().y,
}}
>
<img src="/images/shape-animation/about-shape-1.png" alt="" />
<img
src="/images/shape-animation/about-shape-1.png"
alt=""
/>
</motion.div>
<motion.div
className="tw-absolute tw-top-[255px] tw-left-2 sm:tw-top-[355px] sm:-tw-left-2 tw-z-20"
Expand All @@ -101,9 +111,13 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
y: trans1().y,
}}
>
<span className="tw-block -tw-indent-[99999px] tw-border-[6px] tw-border-desert tw-rounded-full tw-w-[42px] tw-h-[42px] md:tw-w-[62px] md:tw-h-[62px] md:tw-border-8">
shape 3
</span>
<img
src="/images/shape-animation/dog-tag.svg"
alt="shape"
loading="lazy"
width={178}
height={178}
/>
</motion.div>
<motion.div
className="tw-absolute -tw-z-1 tw-w-[100px] tw-bottom-3.8 tw-right-5 sm:tw-w-[100px] sm:tw-bottom-[55px] sm:tw-right-[45px] md:tw-w-auto"
Expand All @@ -121,7 +135,10 @@ const ContactInfo = ({ data: { section_title, items, images } }: TProps) => {
y: trans1().y,
}}
>
<img src="/images/shape-animation/nwesletter-shape-2.png" alt="" />
<img
src="/images/shape-animation/nwesletter-shape-2.png"
alt=""
/>
</motion.div>
</motion.div>
</div>
Expand Down
45 changes: 36 additions & 9 deletions src/containers/hero/layout-02/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import clsx from "clsx";
import Button from "@ui/button";
import MottoText from "@ui/motto-text";
import { useUI } from "@contexts/ui-context";
import { HeadingType, TextType, ButtonType, ImageType, MottoType } from "@utils/types";
import {
HeadingType,
TextType,
ButtonType,
ImageType,
MottoType,
} from "@utils/types";
import { scrollUpVariants } from "@utils/variants";

type TProps = {
Expand All @@ -16,7 +22,9 @@ type TProps = {
};
};

const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps) => {
const HeroArea = ({
data: { headings, texts, buttons, motto, images },
}: TProps) => {
const { trans1, trans2 } = useUI();
return (
<div className="hero-area tw-pt-[65px]">
Expand Down Expand Up @@ -48,7 +56,13 @@ const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps)
{content}
</Button>
))}
{motto && <MottoText {...motto} size="md" className="tw-mt-[25px]" />}
{motto && (
<MottoText
{...motto}
size="md"
className="tw-mt-[25px]"
/>
)}
</motion.div>

<div className="tw-relative tw-z-10">
Expand Down Expand Up @@ -78,7 +92,10 @@ const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps)
}}
>
<span data-depth="3">
<img src="/images/shape-animation/about-shape-1.png" alt="" />
<img
src="/images/shape-animation/about-shape-1.png"
alt=""
/>
</span>
</motion.div>

Expand All @@ -89,7 +106,10 @@ const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps)
y: trans2().y,
}}
>
<img src="/images/shape-animation/about-shape-1.png" alt="" />
<img
src="/images/shape-animation/about-shape-1.png"
alt=""
/>
</motion.div>
<motion.div
className="tw-absolute tw-top-[255px] tw-left-2 sm:tw-top-[355px] sm:-tw-left-2 tw-z-20"
Expand All @@ -98,9 +118,13 @@ const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps)
y: trans1().y,
}}
>
<span className="tw-block -tw-indent-[99999px] tw-border-[6px] tw-border-desert tw-rounded-full tw-w-[42px] tw-h-[42px] md:tw-w-[62px] md:tw-h-[62px] md:tw-border-8">
shape 3
</span>
<img
src="/images/shape-animation/dog-tag.svg"
alt="shape"
loading="lazy"
width={178}
height={178}
/>
</motion.div>
<motion.div
className="tw-absolute -tw-z-1 tw-w-[100px] tw-bottom-3.8 tw-right-5 sm:tw-w-[100px] sm:tw-bottom-[55px] sm:tw-right-[45px] md:tw-w-auto"
Expand All @@ -118,7 +142,10 @@ const HeroArea = ({ data: { headings, texts, buttons, motto, images } }: TProps)
y: trans1().y,
}}
>
<img src="/images/shape-animation/nwesletter-shape-2.png" alt="" />
<img
src="/images/shape-animation/nwesletter-shape-2.png"
alt=""
/>
</motion.div>
</div>
</div>
Expand Down
28 changes: 22 additions & 6 deletions src/containers/team/layout-01/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ type TProps = TSection & {
};
};

const TeamArea = ({ data: { section_title, buttons }, space, bg, titleSize }: TProps) => {
const TeamArea = ({
data: { section_title, buttons },
space,
bg,
titleSize,
}: TProps) => {
const { trans1, trans2 } = useUI();
return (
<Section className="team-area" space={space} bg={bg}>
Expand Down Expand Up @@ -62,9 +67,13 @@ const TeamArea = ({ data: { section_title, buttons }, space, bg, titleSize }: TP
y: trans1().y,
}}
>
<span className="tw-block -tw-indent-[99999px] tw-border-desert tw-rounded-full tw-border-[6px] tw-w-[45px] tw-h-[45px] md:tw-border-8 md:tw-w-15 md:tw-h-15">
shape 3
</span>
<img
src="/images/shape-animation/dog-tag.svg"
alt="shape"
loading="lazy"
width={178}
height={178}
/>
</motion.div>
<motion.div
className="tw-absolute -tw-z-1 tw-left-1/2 -tw-bottom-5 tw-w-[120px] lg:-tw-bottom-[70px] lg:tw-w-auto"
Expand All @@ -88,7 +97,10 @@ const TeamArea = ({ data: { section_title, buttons }, space, bg, titleSize }: TP
y: trans1().y,
}}
>
<img src="/images/shape-animation/cta-shape-01.png" alt="" />
<img
src="/images/shape-animation/cta-shape-01.png"
alt=""
/>
</motion.div>
</motion.div>
<motion.div
Expand All @@ -99,7 +111,11 @@ const TeamArea = ({ data: { section_title, buttons }, space, bg, titleSize }: TP
variants={scrollUpVariants}
>
{section_title && (
<SectionTitle {...section_title} align="left" titleSize={titleSize} />
<SectionTitle
{...section_title}
align="left"
titleSize={titleSize}
/>
)}
{buttons?.map(({ id, content, ...rest }) => (
<Button key={id} className="tw-mt-1" {...rest}>
Expand Down
Loading
Loading