Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ changes.

### Added

- Add budget discussion paths in the wrapper

### Fixed

### Changed
Expand Down
36 changes: 27 additions & 9 deletions govtool/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import { useCallback, useEffect } from "react";
import { Route, Routes, useNavigate } from "react-router-dom";

import { Modal, ScrollToTop } from "@atoms";
import { PATHS, PDF_PATHS, OUTCOMES_PATHS, USER_PATHS } from "@consts";
import {
PATHS,
PDF_PATHS,
OUTCOMES_PATHS,
USER_PATHS,
BUDGET_DISCUSSION_PATHS,
} from "@consts";
import { useCardano, useFeatureFlag, useModal } from "@context";
import { useWalletConnectionListener } from "@hooks";
import {
Expand Down Expand Up @@ -102,10 +108,16 @@ export default () => {
element={<GovernanceActionDetails />}
/>
{isProposalDiscussionForumEnabled && !isEnabled && (
<Route
path={`${PDF_PATHS.proposalDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
<>
<Route
path={`${PDF_PATHS.proposalDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
<Route
path={`${BUDGET_DISCUSSION_PATHS.budgetDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
</>
)}
{isGovernanceOutcomesPillarEnabled && !isEnabled && (
<>
Expand All @@ -122,10 +134,16 @@ export default () => {
<Route element={<Dashboard />}>
<Route path={PATHS.dashboard} element={<DashboardHome />} />
{isProposalDiscussionForumEnabled && (
<Route
path={`${PDF_PATHS.proposalDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
<>
<Route
path={`${PDF_PATHS.proposalDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
<Route
path={`${BUDGET_DISCUSSION_PATHS.budgetDiscussion}/*`}
element={<ProposalDiscussionPillar />}
/>
</>
)}
{isGovernanceOutcomesPillarEnabled && (
<>
Expand Down
9 changes: 9 additions & 0 deletions govtool/frontend/src/consts/navItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
PATHS,
PDF_PATHS,
OUTCOMES_PATHS,
BUDGET_DISCUSSION_PATHS,
// TODO: This will be uncommented when the page has been bootstrapped in the outcomes Pillar
// USER_PATHS
} from "./paths";
Expand Down Expand Up @@ -73,6 +74,14 @@ export const CONNECTED_NAV_ITEMS = [
icon: ICONS.dRepDirectoryIcon,
newTabLink: null,
},
{
dataTestId: "budget-discussion-link",
label: i18n.t("budgetDiscussion.title"),
navTo: BUDGET_DISCUSSION_PATHS.budgetDiscussion,
activeIcon: ICONS.dRepDirectoryActiveIcon,
icon: ICONS.dRepDirectoryIcon,
newTabLink: null,
},
{
dataTestId: "governance-actions-link",
label: i18n.t("govActions.title"),
Expand Down
10 changes: 10 additions & 0 deletions govtool/frontend/src/consts/paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ export const PDF_PATHS = {
proposalDiscussionPropose: "/proposal_discussion/propose",
};

export const BUDGET_DISCUSSION_PATHS = {
budgetDiscussion: "/budget_discussion",
budgetDiscussionProposal: "/budget_discussion/:id",
budgetDiscussionPropose: "/budget_discussion/propose",
budgetDiscussionAction: "/budget_discussion/:proposalId",
budgetDiscussionCategory: "/budget_discussion/category/:category",
budgetDiscussionCategoryAction:
"/budget_discussion/category/:category/:proposalId",
};

export const USER_PATHS = {
governanceActionsVotedByMe: "/my/votes_and_favorites",
};
Expand Down
3 changes: 3 additions & 0 deletions govtool/frontend/src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,9 @@
"title": "Proposals",
"proposeAGovernanceAction": "Propose a Governance Action"
},
"budgetDiscussion": {
"title": "Budget Discussion"
},
"govActions": {
"about": "About",
"abstract": "Abstract",
Expand Down