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

[TM-1425] edit style text monitored sec barChart #753

Merged
merged 5 commits into from
Dec 17, 2024
Merged

[TM-1425] edit style text monitored sec barChart #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7de91fd
[TM-1425] text style dropdown monitored indicator
dottyy Dec 16, 2024
ed25bed
[TM-1425] text style dropdown monitored indicator
dottyy Dec 16, 2024
48fd44e
[TM-1425] Merge branch 'staging' of https://github.com/wri/wri-terram…
dottyy Dec 17, 2024
bb46696
[TM-1425] text style dropdown monitored indicator and text in barChar
dottyy Dec 17, 2024
db80bcb
[TM-1425] Merge branch 'staging' of https://github.com/wri/wri-terram…
dottyy Dec 17, 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
15 changes: 6 additions & 9 deletions src/admin/components/ResourceTabs/MonitoredTab/components/DataCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const TABLE_COLUMNS_HECTARES_STRATEGY: ColumnDef<RowData>[] = [
enableSorting: false,
cell: props => (
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-grey-720 hover:text-primary" />
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-darkCustom-300 hover:text-primary" />
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -209,7 +209,7 @@ const TABLE_COLUMNS_HECTARES_ECO_REGION: ColumnDef<RowData>[] = [
enableSorting: false,
cell: props => (
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-grey-720 hover:text-primary" />
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-darkCustom-300 hover:text-primary" />
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -251,7 +251,7 @@ const TABLE_COLUMNS_HECTARES_LAND_USE: ColumnDef<RowData>[] = [
enableSorting: false,
cell: props => (
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-grey-720 hover:text-primary" />
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-darkCustom-300 hover:text-primary" />
</div>
),
meta: { style: { width: "5%" } }
Expand Down Expand Up @@ -549,7 +549,7 @@ const DataCard = ({
enableSorting: false,
cell: props => (
<div className="flex w-full cursor-pointer items-center justify-end rounded p-1 hover:text-primary">
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-grey-720 hover:text-primary" />
<Icon name={IconNames.EDIT_PA} className="h-4 w-4 text-darkCustom-300 hover:text-primary" />
</div>
),
meta: { style: { top: `${topHeaderFirstTable}`, borderRadius: "0" } }
Expand Down Expand Up @@ -646,7 +646,7 @@ const DataCard = ({
<When condition={tabActive === 1}>
<div className="relative z-auto flex w-full gap-8 px-6 pb-6 pt-2">
<Dropdown
containerClassName={classNames("absolute left-full -translate-x-full pr-6 z-[1]", {
containerClassName={classNames("absolute left-full -translate-x-full pr-6 z-[1] !h-8", {
hidden: selected.includes("6")
})}
optionsClassName="!w-max right-0"
Expand All @@ -656,10 +656,7 @@ const DataCard = ({
onChange={option => setSelectedPolygonUuid(option[0])}
/>
<div className="sticky top-[77px] flex h-[calc(100vh-320px)] w-1/4 min-w-[25%] flex-col gap-3">
<Text
variant={"text-14-semibold"}
className="w-fit border-b-2 border-neutral-450 pb-1.5 text-blueCustom-900"
>
<Text variant={"text-14-semibold"} className="w-fit text-blueCustom-900">
Indicator Description
</Text>
<div className="flex min-h-0 flex-col gap-3 overflow-auto pr-1">
Expand Down
3 changes: 2 additions & 1 deletion src/admin/components/ResourceTabs/MonitoredTab/components/MonitoredCharts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const RestorationMetrics = ({
className="w-full place-content-center pl-8"
tooltip={TOTAL_HECTARES_UNDER_RESTORATION_TOOLTIP}
showTreesRestoredGraph={false}
classNameBody="!mt-1.5"
/>
<SimpleBarChart data={strategiesData} />
</div>
Expand Down Expand Up @@ -134,7 +135,7 @@ const MonitoredCharts = ({
case "5":
return (
<ChartContainer isLoading={isLoadingIndicator} hasNoData={!landUseData?.graphicTargetLandUseTypes?.length}>
<div className="w-full pt-12">
<div className="w-full pt-[38px]">
<GraphicIconDashboard data={landUseData.graphicTargetLandUseTypes} maxValue={totalHectaresRestoredGoal} />
</div>
</ChartContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/admin/components/ResourceTabs/MonitoredTab/components/TreesLossBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const TreeLossBarChart = ({ data, className = "" }: TreeLossBarChartProps) => {
};

return (
<div className={`h-[500px] w-full p-4 ${className}`}>
<div className={`h-[500px] w-full p-4 ${className} pt-2.5`}>
<h2 className="text-12 mb-1 pl-10">Tree Loss Retrospective (ha)</h2>
<h3 className="text-14-semibold mb-4 pl-10">2015-2024</h3>
<ResponsiveContainer width="100%" height="100%">
Expand Down
2 changes: 1 addition & 1 deletion src/components/elements/Inputs/Dropdown/DropdownVariant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const VARIANT_DROPDOWN_FILTER: DropdownVariant = {
};

export const VARIANT_DROPDOWN_SIMPLE: DropdownVariant = {
className: "gap-2 text-black border-b-2 border-black py-0 px-1 rounded-none h-fit !items-baseline !h-8",
className: "gap-2 text-black border-b-2 border-black py-0 px-1 rounded-none h-fit pb-2.5 !h-8",
iconClassName: "w-3 h-[9px] fill-trasparent",
iconName: IconNames.CHEVRON_DOWN_DASH,
iconNameClear: IconNames.CLEAR,
Expand Down
Loading