Skip to content

Commit d2da2a1

Browse files
Arzoid29Arzoid29
authored
Merge pull request #18 from mctekk/feat/MR-20
Feat/mr 20
2 parents 8c2a52f + 052692e commit d2da2a1

File tree

53 files changed

+6251
-90
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+6251
-90
lines changed

‎public/images/SA__World Map.svg‎

Lines changed: 2123 additions & 0 deletions
Loading

‎src/app/about-us/page.tsx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from "react";
2+
import Header from "@/components/organism/header";
3+
import { Footer } from "@/components/organism/sections/footer";
4+
import { AboutUsHero } from "@/components/organism/sections/about-us/about-us-hero";
5+
import { AboutUsOurTeam } from "@/components/organism/sections/about-us/our-team";
6+
import { AboutUsTeam } from "@/components/organism/sections/about-us/team-members";
7+
import { GA } from "@/components/atoms/analitiycs";
8+
import { aboutUsData } from "@/model/api/about-us/data";
9+
import { ourTeamData } from "@/model/api/our-team/data";
10+
import { aboutTeamData } from "@/model/api/about-us-team/data";
11+
export default function page() {
12+
return (
13+
<>
14+
<Header></Header>
15+
<GA/>
16+
<AboutUsHero data={aboutUsData}></AboutUsHero>
17+
<AboutUsOurTeam data={ourTeamData}></AboutUsOurTeam>
18+
<AboutUsTeam data={aboutTeamData}></AboutUsTeam>
19+
<Footer kind="dark"></Footer>
20+
</>
21+
);
22+
}

‎src/app/globals.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,11 @@ body {
9191
left: 0;
9292
background: linear-gradient(to right, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%);
9393
}
94+
95+
.d {
96+
@apply fill-[#ffffff]
97+
}
98+
.inline-svg svg {
99+
display: inline;
100+
vertical-align: text-bottom;
101+
}

‎src/app/pricing/page.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"use client";
2+
import { GA } from "@/components/atoms/analitiycs";
23
import { Footer } from "@/components/organism/sections/footer";
34
import { PricingComparison } from "@/components/organism/sections/princing/comparison";
45
import { PricingHero } from "@/components/organism/sections/princing/princing-hero";
@@ -11,7 +12,8 @@ export default function page() {
1112
const handleIsFull = () => setIsFull(!isFull);
1213
return (
1314
<div>
14-
<PricingHero/>
15+
<PricingHero></PricingHero>
16+
<GA/>
1517
<PricingPlans isClicked={isFull} onClick={handleIsFull}></PricingPlans>
1618
{isFull && <PricingComparison />}
1719
<PricingQuestions id="Q&A"></PricingQuestions>

‎src/app/privacy-policy/page.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Footer } from "@/components/organism/sections/footer";
2+
import Header from "@/components/organism/header";
3+
import { GA } from "@/components/atoms/analitiycs";
4+
import Info from "@/components/organism/sections/privacy-policy/info";
5+
6+
function PrivacyPolicy() {
7+
return (
8+
<>
9+
<GA />
10+
<Header/>
11+
<Info/>
12+
<Footer kind="dark" />
13+
</>
14+
);
15+
}
16+
17+
export default PrivacyPolicy;

‎src/app/terms-of-service/page.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import React from "react";
2+
import Header from "@/components/organism/header";
3+
import { Footer } from "@/components/organism/sections/footer";
4+
import Terms from "@/components/organism/sections/terms-of-service/terms";
5+
6+
function TermsAndService() {
7+
return (
8+
<div >
9+
<Header/>
10+
<Terms/>
11+
<Footer kind="dark" />
12+
</div>
13+
);
14+
}
15+
16+
export default TermsAndService;

‎src/app/why-sales-assist/page.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ import { WhySalesAssistCompletingSalesIsPainless } from "@/components/organism/s
1313
import { Footer } from "@/components/organism/sections/footer";
1414
import { dataPainless } from "@/model/api/sales-painless/data";
1515
import { dataSlide } from "@/model/api/simplify-sales";
16+
import { GA } from "@/components/atoms/analitiycs";
1617

1718

1819
export default function page() {
1920
return (
2021
<main>
2122
<Header></Header>
23+
<GA/>
2224
<WhySalesAssistHero data={dataHero}/>
2325
<Benefits data={dataBenefits}/>
2426
<HowItWorks data={howData}/>

‎src/components/atoms/analitiycs/index.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import Script from 'next/script';
2+
3+
4+
export function GA () {
5+
return (
6+
<>
7+
<Script src='https://www.googletagmanager.com/gtag/js?id=G-YXW1Y5B8CM' strategy="afterInteractive"></Script>
8+
<Script id="google-analytics" strategy="afterInteractive">
9+
{`
10+
window.dataLayer = window.dataLayer || [];
11+
function gtag(){dataLayer.push(arguments);}
12+
gtag('js', new Date());
13+
14+
gtag('config', 'G-YXW1Y5B8CM');
15+
`}
16+
</Script>
17+
</>
18+
)
19+
}

‎src/components/atoms/animations/world-map/index.tsx‎

Lines changed: 2705 additions & 0 deletions
Large diffs are not rendered by default.

‎src/components/atoms/benefits-triangle/index.tsx‎

Lines changed: 45 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,55 @@
1-
import React from 'react'
2-
import { DashedAnimation } from '../animations/animatedTriangle'
3-
import { IconBox } from '../icon-box'
4-
import { useProgressWithInView } from '@/model/interactions/use-progress-in-view'
1+
import React from "react";
2+
import { DashedAnimation } from "../animations/animatedTriangle";
3+
import { IconBox } from "../icon-box";
4+
import { useProgressWithInView } from "@/model/interactions/use-progress-in-view";
55

6-
type Props = {}
6+
type Props = {};
77

88
export default function BenefitsTriangle({}: Props) {
9-
const {
10-
isActive,
11-
clickOnIcon,
12-
currentStatus,
13-
progressLeft,
14-
15-
} = useProgressWithInView();
9+
const { isActive, currentStatus, progressLeft, } =
10+
useProgressWithInView();
1611
return (
1712
<div className="md:w-1/2 w-full md:h-full pt-12 relative flex items-center justify-center">
18-
<div className="flex-col gap-6 md:gap-0 items-center justify-center flex max-w-sm relative w-full">
19-
<DashedAnimation active={currentStatus.current} />
20-
<div className="flex items-center h-fit w-full justify-center md:px-16 md:justify-start">
21-
<IconBox
22-
text="Business"
23-
icon="/images/Business_Icon.svg"
24-
isActive={isActive(0)}
25-
onClick={clickOnIcon(0, 1)}
26-
progress={progressLeft}
27-
/>
28-
</div>
13+
<div className="flex-col gap-6 md:gap-0 items-center justify-center flex max-w-sm relative w-full">
14+
<DashedAnimation active={currentStatus.current} />
15+
<div className="flex items-center h-fit w-full justify-center md:px-16 md:justify-start cursor-not-allowed">
16+
<IconBox
17+
text="Business"
18+
className="cursor-default"
19+
icon="/images/Business_Icon.svg"
20+
isActive={isActive(0)}
21+
progress={progressLeft}
22+
/>
23+
</div>
2924

30-
<div className="flex items-center h-fit w-full justify-between px-12 md:justify-end">
31-
<IconBox
32-
text="Salespeople"
33-
icon="/images/SA_Sales_Icon.svg"
34-
isActive={isActive(1)}
35-
onClick={clickOnIcon(1, 168)}
36-
className="order-2 md:order-1"
37-
progress={progressLeft}
38-
/>
25+
<div className="flex items-center h-fit w-full justify-between px-12 md:justify-end">
26+
<IconBox
27+
text="Salespeople"
28+
icon="/images/SA_Sales_Icon.svg"
29+
isActive={isActive(1)}
30+
className="order-2 md:order-1 cursor-default"
31+
progress={progressLeft}
32+
/>
3933

40-
<IconBox
41-
text="Customer"
42-
icon="/images/SA_Customer_Icon.svg"
43-
className="md:hidden "
44-
isActive={isActive(2)}
45-
onClick={clickOnIcon(2, 373)}
46-
progress={progressLeft}
47-
/>
48-
</div>
34+
<IconBox
35+
text="Customer"
36+
icon="/images/SA_Customer_Icon.svg"
37+
className="md:hidden cursor-default"
38+
isActive={isActive(2)}
39+
progress={progressLeft}
40+
/>
41+
</div>
4942

50-
<div className="w-full flex items-center ">
51-
<IconBox
52-
text="Customer"
53-
icon="/images/SA_Customer_Icon.svg"
54-
className="hidden md:flex md:flex-col"
55-
isActive={isActive(2)}
56-
onClick={clickOnIcon(2, 373)}
57-
progress={progressLeft}
58-
/>
43+
<div className="w-full flex items-center ">
44+
<IconBox
45+
text="Customer"
46+
icon="/images/SA_Customer_Icon.svg"
47+
className="hidden md:flex md:flex-col cursor-default"
48+
isActive={isActive(2)}
49+
progress={progressLeft}
50+
/>
51+
</div>
5952
</div>
6053
</div>
61-
</div>
62-
)
63-
}
54+
);
55+
}

0 commit comments

Comments
 (0)