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

feat(APP-3649): Implement 'Featured' tab on DAO Explorer #1407

Merged
merged 15 commits into from
Oct 29, 2024
Merged

feat(APP-3649): Implement 'Featured' tab on DAO Explorer #1407

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5c3b3bf
feat: implement Featured tab with dummy data
thekidnamedkd Oct 25, 2024
60d53d8
Update featured.json
thekidnamedkd Oct 25, 2024
9bc1679
feat: implement hook for fetching data dynamically from origin
thekidnamedkd Oct 25, 2024
6e9adb8
chore: add 'Create a DAO' button to explorer
thekidnamedkd Oct 25, 2024
3997ad9
feat: add fallback empty state logic for Featured tab
thekidnamedkd Oct 25, 2024
e807edc
chore: imrove 'Create a DAO' button for wallet connect
thekidnamedkd Oct 25, 2024
e911a6c
chore: remove normalizer, update endpoint, adjust interfaces
thekidnamedkd Oct 25, 2024
eb40d6c
chore: remove JSON from main feature branch
thekidnamedkd Oct 25, 2024
024c367
chore: self review cleanup
thekidnamedkd Oct 25, 2024
8a3b77b
chore: clean up button logic
thekidnamedkd Oct 25, 2024
538c1d3
chore: remove quick filters (tabs) from filter dialog
thekidnamedkd Oct 28, 2024
51a68d7
chore: continue PR convo resolutions -- mobile filters etc
thekidnamedkd Oct 28, 2024
f48ee76
chore: update filters responsive layout to design convo
thekidnamedkd Oct 29, 2024
2319dd9
chore: update filters responsive layout to design convo v2
thekidnamedkd Oct 29, 2024
d9edbb9
chore: classes cleanup
thekidnamedkd Oct 29, 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
3 changes: 2 additions & 1 deletion src/assets/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,8 @@
"linkURL": "https://aragon.org/education-portal"
},
"toggleFilter": {
"Favourites": "Following",
"favourites": "Following",
"featuredDAOs": "Featured",
"allDAOs": "All DAOs ",
"member": "Member"
},
Expand Down
36 changes: 16 additions & 20 deletions src/components/daoCard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {AvatarDao} from '@aragon/ods-old';
thekidnamedkd marked this conversation as resolved.
Show resolved Hide resolved
import {Icon, IconType} from '@aragon/ods';
import {AvatarIcon, Icon, IconType} from '@aragon/ods';
thekidnamedkd marked this conversation as resolved.
Show resolved Hide resolved
import React from 'react';
import {useTranslation} from 'react-i18next';
cgero-eth marked this conversation as resolved.
Show resolved Hide resolved
import styled from 'styled-components';
import useScreen from 'hooks/useScreen';
import {generatePath, useHref} from 'react-router-dom';
Expand All @@ -11,15 +10,18 @@ import {toDisplayEns} from 'utils/library';
import {Dashboard} from 'utils/paths';
import {IDao} from 'services/aragon-backend/domain/dao';

interface IDaoWithOverride extends IDao {
overrideUrl?: string;
}

export interface IDaoCardProps {
dao: IDao;
dao: IDaoWithOverride;
}

export const DaoCard = (props: IDaoCardProps) => {
const {dao} = props;
const {name, daoAddress, logo, ens, description, network, pluginName} = dao;
const {name, daoAddress, logo, ens, description, network, overrideUrl} = dao;

const {t} = useTranslation();
const {isDesktop} = useScreen();
const {avatar} = useResolveDaoAvatar(logo);

Expand All @@ -29,23 +31,18 @@ export const DaoCard = (props: IDaoCardProps) => {
});
const daoUrl = useHref(daoPage);

// TODO: This should be changed for new plugin types
const daoType =
pluginName === 'token-voting.plugin.dao.eth' ||
pluginName === 'token-voting-repo'
? t('explore.explorer.tokenBased')
: t('explore.explorer.walletBased');
thekidnamedkd marked this conversation as resolved.
Show resolved Hide resolved
const resolvedDaoUrl = overrideUrl ?? daoUrl;

return (
<Container href={daoUrl}>
<Container
href={resolvedDaoUrl}
target={overrideUrl != null ? '_blank' : undefined}
>
<DaoDataWrapper>
<HeaderContainer>
<AvatarDao daoName={name} src={logo && avatar} />
<div className="space-y-0.5 text-left xl:space-y-1">
<Title>{name}</Title>
<p className="font-semibold text-neutral-500 ft-text-sm">
{toDisplayEns(ens)}
</p>
</div>
</HeaderContainer>
<Description isDesktop={isDesktop}>{description}</Description>
Expand All @@ -58,10 +55,9 @@ export const DaoCard = (props: IDaoCardProps) => {
/>
<IconLabel>{CHAIN_METADATA[network].name}</IconLabel>
</IconWrapper>
<IconWrapper>
<Icon icon={IconType.APP_MEMBERS} className="text-neutral-600" />
<IconLabel>{daoType}</IconLabel>
</IconWrapper>
{overrideUrl != null && (
<AvatarIcon variant="primary" icon={IconType.LINK_EXTERNAL} />
)}
</DaoMetadataWrapper>
</Container>
);
Expand Down Expand Up @@ -109,7 +105,7 @@ const Description = styled.p.attrs({
`;

const DaoMetadataWrapper = styled.div.attrs({
className: 'flex flex-row space-x-6',
className: 'flex flex-row justify-between items-center',
})``;
const IconLabel = styled.p.attrs({
className: 'text-neutral-600 ft-text-sm',
Expand Down
Loading
Loading