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

fix(APP-3649): Add filters/sort, reorganize layout of buttons #1415

Merged
merged 5 commits into from
Nov 6, 2024
Merged

fix(APP-3649): Add filters/sort, reorganize layout of buttons #1415

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
072b9d1
chore: add filters/sort, reorganize layout of buttons
thekidnamedkd Nov 6, 2024
2377773
chore: update CTA align
thekidnamedkd Nov 6, 2024
80b54fc
chore: fix filters count sizing on button
thekidnamedkd Nov 6, 2024
c47eda3
chore: center + single spinner
thekidnamedkd Nov 6, 2024
b1e2d47
chore: clean up spinner further
thekidnamedkd Nov 6, 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
197 changes: 104 additions & 93 deletions src/containers/daoExplorer/daoExplorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
import {Toggle, ToggleGroup} from '@aragon/ods';
import {useFeaturedDaos} from 'hooks/useFeaturedDaos';
import classNames from 'classnames';
import {useScreen} from '@aragon/ods-old';

const followedDaoToDao = (dao: NavigationDao): IDao => ({
creatorAddress: '' as Address,
Expand All @@ -42,6 +43,8 @@ export const DaoExplorer = () => {
const {t} = useTranslation();
const {isConnected, address, methods} = useWallet();

const {isMobile} = useScreen();

const [showAdvancedFilters, setShowAdvancedFilters] = useState(false);
const [activeDropdown, setActiveDropdown] = useState(false);
const [filters, dispatch] = useReducer(daoFiltersReducer, DEFAULT_FILTERS);
Expand Down Expand Up @@ -151,7 +154,7 @@ export const DaoExplorer = () => {
});
};

const showSortFilter = filters.quickFilter !== 'featuredDaos' && isConnected;
const showSortFilter = filters.quickFilter === 'allDaos';

const filterGroupClassName = classNames('flex justify-between w-full', {
'flex flex-col gap-y-3 md:flex-row md:justify-between': isConnected,
Expand All @@ -166,10 +169,10 @@ export const DaoExplorer = () => {
'flex w-full justify-center md:w-fit': isConnected,
});

const buttonGroupContainerClassName = classNames('shrink-0', {
const buttonGroupContainerClassName = classNames('flex gap-x-3 justify-end', {
'flex md:w-fit': !isConnected && filters.quickFilter === 'featuredDaos',
'flex gap-x-3 w-full md:w-fit justify-between':
isConnected && filters.quickFilter !== 'featuredDaos',
isConnected && filters.quickFilter === 'allDaos',
});

/*************************************************
Expand Down Expand Up @@ -212,81 +215,90 @@ export const DaoExplorer = () => {
size="md"
iconLeft={IconType.FILTER}
onClick={() => setShowAdvancedFilters(true)}
className="!min-w-fit"
>
{filtersCount}
</Button>
{filters.quickFilter !== 'following' && (
<Dropdown.Container
align="end"
open={activeDropdown}
onOpenChange={e => {
setActiveDropdown(e);
}}
customTrigger={
<Button
variant={activeDropdown ? 'secondary' : 'tertiary'}
size="md"
iconLeft={IconType.SORT_DESC}
/>

<Dropdown.Container
align="end"
open={activeDropdown}
onOpenChange={e => {
setActiveDropdown(e);
}}
customTrigger={
<Button
variant={activeDropdown ? 'secondary' : 'tertiary'}
size="md"
iconLeft={IconType.SORT_DESC}
/>
}
>
<Dropdown.Item
icon={
filters.order === 'tvl' ? IconType.CHECKMARK : undefined
}
selected={filters.order === 'tvl'}
onClick={() => toggleOrderby('tvl')}
>
<Dropdown.Item
icon={
filters.order === 'tvl' ? IconType.CHECKMARK : undefined
}
selected={filters.order === 'tvl'}
onClick={() => toggleOrderby('tvl')}
>
{t('explore.sortBy.largestTreasury')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'proposals'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'proposals'}
onClick={() => toggleOrderby('proposals')}
>
{t('explore.sortBy.mostProposals')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'members'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'members'}
onClick={() => toggleOrderby('members')}
>
{t('explore.sortBy.largestCommunity')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'createdAt'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'createdAt'}
onClick={() => toggleOrderby('createdAt')}
>
{t('explore.sortBy.recentlyCreated')}
</Dropdown.Item>
</Dropdown.Container>
)}
{t('explore.sortBy.largestTreasury')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'proposals'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'proposals'}
onClick={() => toggleOrderby('proposals')}
>
{t('explore.sortBy.mostProposals')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'members'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'members'}
onClick={() => toggleOrderby('members')}
>
{t('explore.sortBy.largestCommunity')}
</Dropdown.Item>
<Dropdown.Item
icon={
filters.order === 'createdAt'
? IconType.CHECKMARK
: undefined
}
iconPosition="right"
selected={filters.order === 'createdAt'}
onClick={() => toggleOrderby('createdAt')}
>
{t('explore.sortBy.recentlyCreated')}
</Dropdown.Item>
</Dropdown.Container>
</div>
)}
<Button
size="md"
href="/#/create"
onClick={handleWalletButtonClick}
className="w-fit"
>
{t('cta.create.actionLabel')}
</Button>
{isMobile && !isConnected && filters.quickFilter === 'allDaos' ? (
<Button
size="md"
href="/#/create"
onClick={handleWalletButtonClick}
iconLeft={IconType.PLUS}
/>
) : (
<Button
size="md"
href="/#/create"
onClick={handleWalletButtonClick}
className="shrink-0"
>
{t('cta.create.actionLabel')}
</Button>
)}
</div>
</div>
{noDaosFound || noFeaturedDaosFound ? (
Expand All @@ -302,29 +314,28 @@ export const DaoExplorer = () => {
}}
/>
) : (
<CardsWrapper>
{filters.quickFilter === 'featuredDaos' ? (
<>
{featuredDaoList?.map(
(dao: IDao, index: React.Key | null | undefined) => (
<DaoCard key={index} dao={dao} />
)
)}
{isLoadingFeaturedDaos && (
<Spinner size="xl" variant="primary" />
)}
</>
) : (
<>
{filteredDaoList?.map(
(dao: IDao, index: React.Key | null | undefined) => (
<DaoCard key={index} dao={dao} />
)
)}
{isLoading && <Spinner size="xl" variant="primary" />}
</>
<>
{((filters.quickFilter !== 'featuredDaos' && isLoading) ||
(filters.quickFilter === 'featuredDaos' &&
isLoadingFeaturedDaos)) && (
<div className="flex h-40 w-full grow items-center justify-center md:h-72">
<Spinner size="xl" variant="primary" />
</div>
)}
</CardsWrapper>
<CardsWrapper>
{filters.quickFilter === 'featuredDaos'
? featuredDaoList?.map(
(dao: IDao, index: React.Key | null | undefined) => (
<DaoCard key={index} dao={dao} />
)
)
: filteredDaoList?.map(
(dao: IDao, index: React.Key | null | undefined) => (
<DaoCard key={index} dao={dao} />
)
)}
</CardsWrapper>
</>
)}
</MainContainer>
{totalDaos != null &&
Expand Down
Loading