Skip to content

Commit 37596a7

Browse files
pikonhapikonha
authored
Merge pull request #1543 from blockful/feat/platform-max-width
Feat/platform max width
2 parents 5569447 + 9f6ac1c commit 37596a7

106 files changed

Lines changed: 588 additions & 393 deletions

File tree

Some content is hidden

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

‎.cursor/mcp.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66
},
77
"playwright": {
88
"command": "npx",
9-
"args": [
10-
"@playwright/mcp@latest"
11-
]
9+
"args": ["@playwright/mcp@latest"]
10+
},
11+
"figma": {
12+
"url": "https://mcp.figma.com/mcp",
13+
"type": "http"
1214
},
1315
"sequential-thinking": {
1416
"command": "npx",
15-
"args": [
16-
"-y",
17-
"@modelcontextprotocol/server-sequential-thinking"
18-
]
17+
"args": ["-y", "@modelcontextprotocol/server-sequential-thinking"]
1918
}
2019
}
2120
}

‎apps/dashboard/app/[daoId]/(main)/attack-profitability/page.tsx‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,22 @@ export default async function AttackProfitabilityPage({
7373
}
7474

7575
return (
76-
<TheSectionLayout
77-
title={PAGES_CONSTANTS.attackProfitability.title}
78-
icon={<Crosshair2Icon className="section-layout-icon" />}
79-
description={PAGES_CONSTANTS.attackProfitability.description}
80-
riskLevel={
81-
<RiskLevelCard status={daoConstants.attackProfitability?.riskLevel} />
82-
}
83-
>
84-
<SubSectionsContainer>
85-
<AttackProfitabilitySection
86-
daoId={daoIdEnum}
87-
attackProfitability={daoConstants.attackProfitability}
88-
/>
89-
</SubSectionsContainer>
90-
</TheSectionLayout>
76+
<div>
77+
<TheSectionLayout
78+
title={PAGES_CONSTANTS.attackProfitability.title}
79+
icon={<Crosshair2Icon className="section-layout-icon" />}
80+
description={PAGES_CONSTANTS.attackProfitability.description}
81+
riskLevel={
82+
<RiskLevelCard status={daoConstants.attackProfitability?.riskLevel} />
83+
}
84+
>
85+
<SubSectionsContainer>
86+
<AttackProfitabilitySection
87+
daoId={daoIdEnum}
88+
attackProfitability={daoConstants.attackProfitability}
89+
/>
90+
</SubSectionsContainer>
91+
</TheSectionLayout>
92+
</div>
9193
);
9294
}

‎apps/dashboard/app/[daoId]/(main)/layout.tsx‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { ReactNode } from "react";
22
import { ALL_DAOS, DaoIdEnum } from "@/shared/types/daos";
33
import NotFound from "@/app/not-found";
4-
import { BaseHeaderLayoutSidebar } from "@/shared/components/";
54
import { HeaderMobile } from "@/widgets/HeaderMobile";
65
import { HeaderDAOSidebar, HeaderSidebar, StickyPageHeader } from "@/widgets";
76
import { Footer } from "@/shared/components/design-system/footer/Footer";
7+
// import { BaseHeaderLayoutSidebar } from "@/shared/components";
88

99
type DaoParams = {
1010
daoId: string;
@@ -26,17 +26,21 @@ export default async function DaoLayout({ children, params }: DaoLayoutProps) {
2626

2727
// For FULL, IN_ANALYSIS and ELECTION stages, render the layout with appropriate providers
2828
return (
29-
<div className="bg-surface-background dark flex h-screen overflow-hidden">
30-
<BaseHeaderLayoutSidebar>
31-
<HeaderSidebar />
32-
<HeaderDAOSidebar />
33-
</BaseHeaderLayoutSidebar>
34-
<main className="relative flex-1 overflow-auto lg:ml-[330px]">
35-
<div className="md:hidden">
36-
<StickyPageHeader />
29+
<div className="bg-surface-background dark relative mx-auto flex h-screen max-w-screen-2xl">
30+
<div className="active relative hidden h-screen lg:flex">
31+
<div className="h-full w-[68px] shrink-0 overflow-y-auto">
32+
<HeaderSidebar />
33+
</div>
34+
<div className="h-full shrink-0">
35+
<HeaderDAOSidebar />
36+
</div>
37+
</div>
38+
<main className="h-screen flex-1 overflow-auto">
39+
<div className="lg:hidden">
3740
<HeaderMobile />
41+
<StickyPageHeader />
3842
</div>
39-
<div className="flex min-h-screen w-full flex-col items-center">
43+
<div className="flex w-full flex-col items-center overflow-y-scroll lg:h-screen">
4044
<div className="w-full flex-1">{children}</div>
4145
<Footer />
4246
</div>

‎apps/dashboard/app/[daoId]/(main)/risk-analysis/page.tsx‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -99,31 +99,33 @@ export default async function RiskAnalysisPage({
9999
};
100100

101101
return (
102-
<TheSectionLayout
103-
title={PAGES_CONSTANTS.riskAnalysis.title}
104-
icon={<Gauge className="section-layout-icon" />}
105-
description={PAGES_CONSTANTS.riskAnalysis.description}
106-
riskLevel={<RiskLevelCard status={getHighestRiskLevel()} />}
107-
>
108-
<SubSectionsContainer>
109-
<SubSection
110-
subsectionTitle={PAGES_CONSTANTS.riskAnalysis.subTitle}
111-
subsectionDescription={PAGES_CONSTANTS.riskAnalysis.subDescription}
112-
dateRange=""
113-
>
114-
<RiskAnalysisSection daoId={daoIdEnum} />
115-
</SubSection>
116-
<DividerDefault isHorizontal />
117-
<SubSection
118-
subsectionTitle={PAGES_CONSTANTS.governanceImplementation.subTitle}
119-
subsectionDescription={
120-
PAGES_CONSTANTS.governanceImplementation.subDescription
121-
}
122-
dateRange=""
123-
>
124-
<GovernanceImplementationSection daoId={daoIdEnum} />
125-
</SubSection>
126-
</SubSectionsContainer>
127-
</TheSectionLayout>
102+
<div>
103+
<TheSectionLayout
104+
title={PAGES_CONSTANTS.riskAnalysis.title}
105+
icon={<Gauge className="section-layout-icon" />}
106+
description={PAGES_CONSTANTS.riskAnalysis.description}
107+
riskLevel={<RiskLevelCard status={getHighestRiskLevel()} />}
108+
>
109+
<SubSectionsContainer>
110+
<SubSection
111+
subsectionTitle={PAGES_CONSTANTS.riskAnalysis.subTitle}
112+
subsectionDescription={PAGES_CONSTANTS.riskAnalysis.subDescription}
113+
dateRange=""
114+
>
115+
<RiskAnalysisSection daoId={daoIdEnum} />
116+
</SubSection>
117+
<DividerDefault isHorizontal />
118+
<SubSection
119+
subsectionTitle={PAGES_CONSTANTS.governanceImplementation.subTitle}
120+
subsectionDescription={
121+
PAGES_CONSTANTS.governanceImplementation.subDescription
122+
}
123+
dateRange=""
124+
>
125+
<GovernanceImplementationSection daoId={daoIdEnum} />
126+
</SubSection>
127+
</SubSectionsContainer>
128+
</TheSectionLayout>
129+
</div>
128130
);
129131
}

‎apps/dashboard/app/[daoId]/(main)/token-distribution/page.tsx‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,16 @@ export default async function TokenDistributionPage({
7373
}
7474

7575
return (
76-
<TheSectionLayout
77-
title={PAGES_CONSTANTS.tokenDistribution.title}
78-
icon={<ArrowRightLeft className="section-layout-icon" />}
79-
description={PAGES_CONSTANTS.tokenDistribution.description}
80-
>
81-
<SubSectionsContainer>
82-
<TokenDistributionSection daoId={daoIdEnum} />
83-
</SubSectionsContainer>
84-
</TheSectionLayout>
76+
<div>
77+
<TheSectionLayout
78+
title={PAGES_CONSTANTS.tokenDistribution.title}
79+
icon={<ArrowRightLeft className="section-layout-icon" />}
80+
description={PAGES_CONSTANTS.tokenDistribution.description}
81+
>
82+
<SubSectionsContainer>
83+
<TokenDistributionSection daoId={daoIdEnum} />
84+
</SubSectionsContainer>
85+
</TheSectionLayout>
86+
</div>
8587
);
8688
}

‎apps/dashboard/app/[daoId]/(secondary)/governance/page.tsx‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { Metadata } from "next";
22
import { DaoIdEnum } from "@/shared/types/daos";
3-
import { BaseHeaderLayoutSidebar } from "@/shared/components/";
43

54
import { HeaderMobile } from "@/widgets/HeaderMobile";
65
import { HeaderDAOSidebar, HeaderSidebar, StickyPageHeader } from "@/widgets";
@@ -65,14 +64,18 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
6564
export default function DaoPage() {
6665
return (
6766
<div className="bg-surface-background dark flex h-screen overflow-hidden">
68-
<BaseHeaderLayoutSidebar>
69-
<HeaderSidebar />
70-
<HeaderDAOSidebar />
71-
</BaseHeaderLayoutSidebar>
72-
<main className="relative flex-1 overflow-auto lg:ml-[330px]">
73-
<div className="sm:hidden">
74-
<StickyPageHeader />
67+
<div className="active relative hidden h-screen lg:flex">
68+
<div className="h-full w-[68px] shrink-0 overflow-y-auto">
69+
<HeaderSidebar />
70+
</div>
71+
<div className="h-full shrink-0">
72+
<HeaderDAOSidebar />
73+
</div>
74+
</div>
75+
<main className="relative flex-1 overflow-auto">
76+
<div className="lg:hidden">
7577
<HeaderMobile />
78+
<StickyPageHeader />
7679
</div>
7780
<div className="flex min-h-screen w-full flex-col items-center">
7881
<div className="xl4k:max-w-7xl w-full flex-1">

‎apps/dashboard/app/[daoId]/(secondary)/governance/proposal/[proposalId]/loading.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { ProposalSectionSkeleton } from "@/features/governance/components/propos
33
export default function Loading() {
44
return (
55
<div className="bg-surface-background dark flex h-screen overflow-hidden">
6-
<main className="relative flex-1 overflow-auto pt-[57px] sm:ml-[70px] sm:pt-0">
6+
<main className="relative flex-1 overflow-auto pt-[57px] lg:pt-0">
77
<div className="flex min-h-screen w-full flex-col items-center">
8-
<div className="xl4k:max-w-7xl w-full flex-1">
8+
<div className="border-light-dark w-full max-w-screen-2xl flex-1 border">
99
<ProposalSectionSkeleton />
1010
</div>
1111
</div>

‎apps/dashboard/app/[daoId]/(secondary)/governance/proposal/[proposalId]/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ export async function generateMetadata(props: Props): Promise<Metadata> {
6161

6262
export default function ProposalPage() {
6363
return (
64-
<div className="bg-surface-background dark flex h-screen overflow-hidden">
64+
<div className="bg-surface-background border-light-dark dark flex h-screen max-w-screen-2xl overflow-hidden border">
6565
<BaseHeaderLayoutSidebar>
6666
<HeaderSidebar />
6767
</BaseHeaderLayoutSidebar>
68-
<main className="relative flex-1 overflow-auto pt-[57px] sm:ml-[70px] sm:pt-0">
69-
<div className="sm:hidden">
68+
<main className="relative flex-1 overflow-auto pt-[57px] lg:pt-0">
69+
<div className="lg:hidden">
7070
<HeaderMobile />
7171
</div>
7272
<div className="flex min-h-screen w-full flex-col items-center">

‎apps/dashboard/app/alerts/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export default function DonatePage() {
77
return (
88
<div className="bg-surface-background dark flex h-screen overflow-hidden">
99
<HeaderSidebar />
10-
<main className="flex-1 overflow-auto sm:ml-[72px]">
11-
<div className="sm:hidden">
10+
<main className="flex-1 overflow-auto">
11+
<div className="lg:hidden">
1212
<HeaderMobile overlayClassName="top-[57px]" />
1313
</div>
1414
<div className="flex min-h-screen w-full flex-col items-center">

‎apps/dashboard/app/contact/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ export default function ContactPage() {
7474
return (
7575
<div className="bg-surface-background dark flex h-screen">
7676
<HeaderSidebar />
77-
<main className="flex-1 overflow-auto sm:ml-[72px]">
78-
<div className="sm:hidden">
79-
<div className="h-[57px] w-full sm:hidden" />
77+
<main className="flex-1 overflow-auto">
78+
<div className="lg:hidden">
79+
<div className="h-[57px] w-full lg:hidden" />
8080
<HeaderMobile overlayClassName="top-[57px]" />
8181
</div>
8282
<div className="flex min-h-screen w-full flex-col items-center">

0 commit comments

Comments
 (0)