Skip to content

Commit

Permalink
Merge pull request #2326 from decentdao/yes-roles
Browse files Browse the repository at this point in the history
Revert "Merge pull request #2324 from decentdao/no-roles"
  • Loading branch information
adamgall authored Aug 29, 2024
2 parents 1133b53 + 4ca89a8 commit 3204082
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions src/components/ui/page/Navigation/NavigationLinks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Question,
Scroll,
SquaresFour,
// UsersThree,
UsersThree,
} from '@phosphor-icons/react';
import { DAO_ROUTES } from '../../../../constants/routes';
import { URL_CHAT, URL_DOCS, URL_FAQ } from '../../../../constants/url';
Expand Down Expand Up @@ -97,14 +97,14 @@ function InternalLinks({ closeDrawer }: { closeDrawer?: () => void }) {
scope="internal"
closeDrawer={closeDrawer}
/>
{/* <NavigationLink
<NavigationLink
href={DAO_ROUTES.roles.relative(addressPrefix, daoAddress)}
labelKey="roles"
testId="navigation-rolesLink"
NavigationIcon={UsersThree}
scope="internal"
closeDrawer={closeDrawer}
/> */}
/>
<NavigationLink
href={DAO_ROUTES.hierarchy.relative(addressPrefix, daoAddress)}
labelKey="nodes"
Expand Down
56 changes: 28 additions & 28 deletions src/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import ProposalsPage from './pages/daos/[daoAddress]/proposals';
import ProposalDetailsPage from './pages/daos/[daoAddress]/proposals/[proposalId]';
import ProposalCreatePage from './pages/daos/[daoAddress]/proposals/new';
import SablierProposalCreatePage from './pages/daos/[daoAddress]/proposals/new/sablier';
// import Roles from './pages/daos/[daoAddress]/roles';
// import RoleDetails from './pages/daos/[daoAddress]/roles/details';
// import RolesEdit from './pages/daos/[daoAddress]/roles/edit';
// import RoleEditDetails from './pages/daos/[daoAddress]/roles/edit/details';
import Roles from './pages/daos/[daoAddress]/roles';
import RoleDetails from './pages/daos/[daoAddress]/roles/details';
import RolesEdit from './pages/daos/[daoAddress]/roles/edit';
import RoleEditDetails from './pages/daos/[daoAddress]/roles/edit/details';
import EditProposalSummary from './pages/daos/[daoAddress]/roles/edit/summary';
import Treasury from './pages/daos/[daoAddress]/treasury';
import HomePage from './pages/home/HomePage';
Expand Down Expand Up @@ -72,30 +72,30 @@ export const router = (addressPrefix: string) =>
path: DAO_ROUTES.hierarchy.path,
element: <HierarchyPage />,
},
// {
// path: DAO_ROUTES.roles.path,
// element: <Roles />,
// children: [
// {
// path: 'details',
// element: <RoleDetails />,
// },
// ],
// },
// {
// path: DAO_ROUTES.rolesEdit.path,
// element: <RolesEdit />,
// children: [
// {
// path: 'details',
// element: <RoleEditDetails />,
// },
// {
// path: 'summary',
// element: <EditProposalSummary />,
// },
// ],
// },
{
path: DAO_ROUTES.roles.path,
element: <Roles />,
children: [
{
path: 'details',
element: <RoleDetails />,
},
],
},
{
path: DAO_ROUTES.rolesEdit.path,
element: <RolesEdit />,
children: [
{
path: 'details',
element: <RoleEditDetails />,
},
{
path: 'summary',
element: <EditProposalSummary />,
},
],
},
{
path: 'new/*',
element: <SubDaoCreate />,
Expand Down

0 comments on commit 3204082

Please sign in to comment.