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.

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

[TM-1375] Dashboard: 'About Us' Web Design Shell #632

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
54d82bc
[TM-1375] add layout in homepage dashboard
dottyy Oct 23, 2024
7e8d3cc
[TM-1375] edit name and add sec
dottyy Oct 23, 2024
5a696d1
TM-1375 add video and highlight section
diego-morales-flores-1996 Oct 23, 2024
6865068
[TM-1375] add About the platform information
dottyy Oct 23, 2024
9963e27
[TM-1375] add link in [email protected]
dottyy Oct 23, 2024
8d47ba3
TM-1375 change font size
diego-morales-flores-1996 Oct 23, 2024
fd29301
Merge branch 'TM-1375-dashboard-home-page-web-design-shell' of https:…
diego-morales-flores-1996 Oct 23, 2024
03cb49d
TM-1375 change padding
diego-morales-flores-1996 Oct 23, 2024
730406b
TM-1375 add fade in
diego-morales-flores-1996 Oct 23, 2024
c3e6bde
[TM-1375] edit image in usign platform
dottyy Oct 23, 2024
ef177c1
[TM-1375] edit rounded in video
dottyy Oct 23, 2024
3f475a5
TM-1375 add fede in
diego-morales-flores-1996 Oct 23, 2024
e1b2147
Merge branch 'TM-1375-dashboard-home-page-web-design-shell' of https:…
diego-morales-flores-1996 Oct 23, 2024
f5cbb78
TM-1375 update about us page design
diego-morales-flores-1996 Nov 7, 2024
8ef1a2d
[TM-1375] add carousel in About-us
dottyy Nov 7, 2024
9a21bba
[TM-1375] edit style carousel in About us
dottyy Nov 7, 2024
2965e85
[TM-1375] add button OpenDashboard
dottyy Nov 7, 2024
3a7148a
[TM-1375] change option in sidebar
dottyy Nov 7, 2024
0ca8a52
[TM-1375]edit style in header about us and add gap in text
dottyy Nov 7, 2024
2c5d6d5
[TM-1375] change text color
dottyy Nov 7, 2024
103ff7e
TM-1375 add animation on scroll
diego-morales-flores-1996 Nov 7, 2024
f105f1c
Merge branch 'TM-1375-dashboard-home-page-web-design-shell' of https:…
diego-morales-flores-1996 Nov 7, 2024
6d6980c
TM-1375 update test
diego-morales-flores-1996 Nov 7, 2024
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
Binary file added public/images/about-us-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/about-us-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/about-us-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/about-us-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/about-us-header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/tree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/usign-platform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/icons/orange-dots.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/pre-filtered-page.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/request-account.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/visit-dashboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/components/elements/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export interface IButtonProps extends Omit<HTMLProps<HTMLElement>, "as"> {
| "white-toggle"
| "white-border"
| "orange"
| "about-us"
| "transparent-toggle"
| "white-button-map";
fullWidth?: boolean;
Expand Down Expand Up @@ -158,6 +159,11 @@ const Button: FC<IButtonProps> = props => {
container: "h-fit rounded-lg bg-white px-4 py-2 shadow hover:bg-neutral-200",
span: "flex items-center gap-2"
};
case "about-us":
return {
container: "h-fit rounded-lg bg-green-200 px-5 py-[18px] hover:bg-green-60 text-white",
span: "flex items-center text-16-bold"
};
default:
return { container: "", span: "" };
}
Expand Down
37 changes: 29 additions & 8 deletions src/components/elements/Tabs/Secondary/SecondaryTabs.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import { Tab as HTab } from "@headlessui/react";
import classNames from "classnames";
import { useRouter } from "next/router";
import { DetailedHTMLProps, Fragment, HTMLAttributes, ReactElement } from "react";
import { DetailedHTMLProps, Fragment, HTMLAttributes, ReactElement, useEffect } from "react";

import Text from "@/components/elements/Text/Text";
import List from "@/components/extensive/List/List";
import { Framework, useFrameworkContext } from "@/context/framework.provider";

import { SecundaryTabsVariants, VARIANT_TABS_PRIMARY } from "./SecuandaryTabsVariants";

export interface SecondaryTabsProps extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
tabItems: TabItem[];
containerClassName?: string;
setSelectedIndex?: (index: number) => void;
variant?: SecundaryTabsVariants;
selectedIndex?: number;
}

export interface TabItem {
Expand All @@ -25,7 +30,15 @@ export interface TabItem {
hide?: Framework[];
}

const SecondaryTabs = ({ tabItems: _tabItems, className, containerClassName, ...divProps }: SecondaryTabsProps) => {
const SecondaryTabs = ({
tabItems: _tabItems,
className,
containerClassName,
setSelectedIndex,
selectedIndex,
variant = VARIANT_TABS_PRIMARY,
...divProps
}: SecondaryTabsProps) => {
const router = useRouter();
const { framework } = useFrameworkContext();
const tabItems = _tabItems.filter(item => {
Expand All @@ -50,33 +63,41 @@ const SecondaryTabs = ({ tabItems: _tabItems, className, containerClassName, ...
router.query.tab = key;
router.push(router, undefined, { shallow: true });
}
setSelectedIndex && setSelectedIndex(index);
};

useEffect(() => {
if (selectedIndex !== undefined) {
onTabChange(selectedIndex);
}
}, [selectedIndex]);

return (
<HTab.Group selectedIndex={_defaultIndex} onChange={onTabChange}>
<HTab.List {...divProps} className={classNames(className, "h-max w-full border-b-2 border-neutral-200 bg-white")}>
<HTab.List {...divProps} className={classNames(className, "h-max w-full", variant.classNameContentList)}>
<List
as="div"
className={classNames(
containerClassName,
tabItems.length <= 5 ? "justify-between lg:justify-start lg:gap-30" : "justify-between",
"m-auto flex h-full items-center"
"flex h-full items-center",
variant.listClassName
)}
itemAs={Fragment}
items={tabItems}
render={item => (
<HTab as={Fragment}>
{({ selected }) => (
<button
className={classNames("mb-[-2px] h-full border-b-[3px] px-4 py-4 outline-none", {
"border-primary": selected,
className={classNames("mb-[-2px] h-full outline-none", variant.itemTabClassName, {
[variant.selectedTabClassName || "border-primary"]: selected,
"border-transparent": !selected
})}
disabled={item.disabled}
>
<Text
variant={selected ? "text-16-bold" : "text-16-light"}
className={classNames("whitespace-nowrap", "text-black")}
variant={selected ? variant.textVariantSelected : variant.textVariantNotSelected}
className={classNames("whitespace-nowrap")}
>
{item.title}
</Text>
Expand Down
28 changes: 28 additions & 0 deletions src/components/elements/Tabs/Secondary/SecuandaryTabsVariants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { TextVariants } from "@/types/common";

export interface SecundaryTabsVariants {
classNameContentList?: string;
listClassName?: string;
itemTabClassName?: string;
selectedTabClassName?: string;
textVariantSelected: TextVariants;
textVariantNotSelected: TextVariants;
}

export const VARIANT_TABS_PRIMARY: SecundaryTabsVariants = {
classNameContentList: "border-b-2 border-neutral-200 bg-white",
listClassName: "m-auto",
itemTabClassName: " px-4 py-4 border-b-[3px] text-black",
selectedTabClassName: "border-primary",
textVariantSelected: "text-16-bold",
textVariantNotSelected: "text-16-light"
};

export const VARIANT_TABS_ABOUT_US: SecundaryTabsVariants = {
classNameContentList: "border-b-2 border-neutral-200 bg-white",
listClassName: "grid grid-cols-5 gap-4",
itemTabClassName: " px-2 py-5 text-center border-b-4 text-neutral-700",
selectedTabClassName: "border-black !text-black",
textVariantSelected: "text-18",
textVariantNotSelected: "text-18"
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ exports[`Storyshots Components/Elements/Tabs Secondary 1`] = `
role="tablist"
>
<div
className="justify-between lg:justify-start lg:gap-30 m-auto flex h-full items-center"
className="justify-between lg:justify-start lg:gap-30 flex h-full items-center m-auto"
>
<button
aria-selected={true}
className="mb-[-2px] h-full border-b-[3px] px-4 py-4 outline-none border-primary"
className="mb-[-2px] h-full outline-none px-4 py-4 border-b-[3px] text-black border-primary"
data-headlessui-state="selected"
id="headlessui-tabs-tab-:r35:"
onClick={[Function]}
Expand All @@ -24,15 +24,15 @@ exports[`Storyshots Components/Elements/Tabs Secondary 1`] = `
tabIndex={0}
>
<p
className="whitespace-nowrap text-black text-16-bold"
className="whitespace-nowrap text-16-bold"
data-testid="txt"
>
Overview
</p>
</button>
<button
aria-selected={false}
className="mb-[-2px] h-full border-b-[3px] px-4 py-4 outline-none border-transparent"
className="mb-[-2px] h-full outline-none px-4 py-4 border-b-[3px] text-black border-transparent"
data-headlessui-state=""
id="headlessui-tabs-tab-:r36:"
onClick={[Function]}
Expand All @@ -42,15 +42,15 @@ exports[`Storyshots Components/Elements/Tabs Secondary 1`] = `
tabIndex={-1}
>
<p
className="whitespace-nowrap text-black text-16-light"
className="whitespace-nowrap text-16-light"
data-testid="txt"
>
Environmental Impact
</p>
</button>
<button
aria-selected={false}
className="mb-[-2px] h-full border-b-[3px] px-4 py-4 outline-none border-transparent"
className="mb-[-2px] h-full outline-none px-4 py-4 border-b-[3px] text-black border-transparent"
data-headlessui-state=""
id="headlessui-tabs-tab-:r37:"
onClick={[Function]}
Expand All @@ -60,7 +60,7 @@ exports[`Storyshots Components/Elements/Tabs Secondary 1`] = `
tabIndex={-1}
>
<p
className="whitespace-nowrap text-black text-16-light"
className="whitespace-nowrap text-16-light"
data-testid="txt"
>
Social Impact
Expand Down
4 changes: 3 additions & 1 deletion src/components/extensive/Carousel/Carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export interface CarouselProps<T> extends SwiperProps {
setSelectedImage?: (index: number) => void;
buttonsOutside?: boolean;
smallSwiperButtons?: boolean;
numberSlidesPerView?: number | "auto";
}

export type CarouselBreakPoints = {
Expand All @@ -43,6 +44,7 @@ const Carousel = <T extends Record<any, any>>({
selectedImage,
setSelectedImage,
buttonsOutside = false,
numberSlidesPerView,
smallSwiperButtons,
...swiperProps
}: CarouselProps<T>) => {
Expand Down Expand Up @@ -87,7 +89,7 @@ const Carousel = <T extends Record<any, any>>({
className={classNames(swiperClassName, "flex-1")}
modules={[Navigation, Pagination]}
spaceBetween={smallSwiperButtons ? 8 : 25}
slidesPerView={3}
slidesPerView={numberSlidesPerView || 3}
navigation={{ nextEl: ".swiper-button-next", prevEl: ".swiper-button-prev" }}
pagination={{
clickable: true,
Expand Down
6 changes: 5 additions & 1 deletion src/components/extensive/Icon/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ export enum IconNames {
EDIT_PA = "edit-pa",
PIN = "pin",
LINK_AIRTABLE = "link-aritable",
IC_USER = "ic-user"
IC_USER = "ic-user",
REQUEST_ACCOUNT = "request-account",
PRE_FILTERED_PAGE = "pre-filtered-page",
VISIT_DASHBOARD = "visit-dashboard",
ORANGE_DOTS = "orange-dots"
}

export interface IconProps {
Expand Down
2 changes: 2 additions & 0 deletions src/components/generic/Layout/DashboardLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const DashboardLayout = (props: PropsWithChildren<DashboardLayoutProps>) => {
const isProjectInsightsPage = router.pathname.includes("dashboard/project-insights");
const isProjectListPage = router.pathname === "/dashboard/project-list";
const isProjectPage = router.pathname === "dashboard/project";
const isHomepage = router.pathname === "/dashboard/about-us";
const childrenWithProps = props.children ? cloneElement(props.children as ReactElement, { selectedCountry }) : null;

return (
Expand All @@ -72,6 +73,7 @@ const DashboardLayout = (props: PropsWithChildren<DashboardLayoutProps>) => {
isProjectInsightsPage={isProjectInsightsPage}
isProjectListPage={isProjectListPage}
isProjectPage={isProjectPage}
isHomepage={isHomepage}
dashboardCountries={dashboardCountries.data}
defaultSelectedCountry={selectedCountry}
setSelectedCountry={setSelectedCountry}
Expand Down
3 changes: 2 additions & 1 deletion src/components/generic/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ const Sidebar = () => {
"text-white":
router.asPath.includes("/dashboard") &&
!router.asPath.includes("/dashboard/project-list") &&
!router.asPath.includes("/dashboard/project-insights")
!router.asPath.includes("/dashboard/project-insights") &&
!router.asPath.includes("/dashboard/about-us")
})}
href="/dashboard"
>
Expand Down
Loading