-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* user page initial commit, font changed, tabs & cards updated * upgrades on user page * user movements component * user page - voting and proposals list item updated * user transactions finished - pagination & responsiveness * clean up * votes component logic fixed * tabs updated and pagination added to all tabs * multiple ui fixes * clean up * fix padding * fix quorum values on summary * fix card paddings * initial commit * responsive header & readable date for history component * last UI changes * nft transfer component * removed thershold label since not needed * validation for downloading votes & label for when no votes on dialog * layout * selected filters logic * remove switch from dialogs, new modal for actions & new modal reorganization * proposal dialog * add constant * actions modal ready * clean up & css fix user tab * fix small css * top members component brought back * user tab - activity section new layout * activity logic * filter dialog layout & logic working * logic * filters for proposals & votes * logic improved * proposal tab filter dialog * Ipfs lite (#813) * csv votes download * fix node version * updated dependencies * fix initial filtering * implemented new design --------- Co-authored-by: fabiolalombardim <[email protected]> Co-authored-by: fabiolalombardim <[email protected]>
- Loading branch information
3 people
authored
May 25, 2024
1 parent
a277b29
commit c74d499
Showing
49 changed files
with
7,672 additions
and
5,253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/usr/bin/env sh | ||
| . "$(dirname -- "$0")/_/husky.sh" | ||
|
|
||
| yarn lint-staged | ||
| npx lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v16.15.1 | ||
| v18.20.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| { | ||
| "typescript.tsdk": "node_modules/typescript/lib", | ||
| "svg.preview.background": "black" | ||
| } | ||
| "svg.preview.background": "black", | ||
| "cSpell.words": [ | ||
| "offchain" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| import React, { useEffect, useState } from "react" | ||
| import { ResponsiveDialog } from "./ResponsiveDialog" | ||
| import { Grid, styled } from "@material-ui/core" | ||
| import { Typography } from "@mui/material" | ||
| import { Dropdown } from "./Dropdown" | ||
| import { ProposalStatus } from "services/services/dao/mappers/proposal/types" | ||
| import { SmallButton } from "modules/common/SmallButton" | ||
| import { Order, ProposalType } from "./FiltersUserDialog" | ||
| import { Filters } from "../pages/User/components/UserMovements" | ||
|
|
||
| interface Props { | ||
| open: boolean | ||
| handleClose: () => void | ||
| selectedTab: number | ||
| saveFilters: (filters: Filters) => void | ||
| } | ||
|
|
||
| const SectionTitle = styled(Typography)({ | ||
| fontSize: "18px !important", | ||
| fontWeight: 600 | ||
| }) | ||
|
|
||
| const Container = styled(Grid)({ | ||
| marginTop: 6, | ||
| gap: 24 | ||
| }) | ||
|
|
||
| const StatusButton = styled(Grid)(({ theme }) => ({ | ||
| "background": theme.palette.primary.main, | ||
| "padding": "8px 16px", | ||
| "borderRadius": 50, | ||
| "marginRight": 16, | ||
| "marginBottom": 16, | ||
| "cursor": "pointer", | ||
| "textTransform": "capitalize", | ||
| "&:hover": { | ||
| background: "rgba(129, 254, 183, .4)" | ||
| } | ||
| })) | ||
|
|
||
| interface StatusOption { | ||
| label: string | ||
| selected: boolean | ||
| } | ||
|
|
||
| export enum OffchainStatus { | ||
| ACTIVE = "active", | ||
| CLOSED = "closed", | ||
| ALL = "all" | ||
| } | ||
|
|
||
| export const FilterProposalsDialog: React.FC<Props> = ({ open, handleClose, selectedTab, saveFilters }) => { | ||
| const [filters, setFilters] = useState<StatusOption[]>([]) | ||
| const [status, setStatus] = useState<StatusOption[]>([]) | ||
| const [offchainStatus, setOffchainStatus] = useState<OffchainStatus>(OffchainStatus.ALL) | ||
| const proposalType = selectedTab === 0 ? ProposalType.ON_CHAIN : ProposalType.OFF_CHAIN | ||
| const [order, setOrder] = useState<Order>(Order.RECENT) | ||
|
|
||
| const isSelected = (item: StatusOption) => { | ||
| return filters.includes(item) ? true : false | ||
| } | ||
|
|
||
| const saveStatus = (status: StatusOption) => { | ||
| let updated: StatusOption[] = [] | ||
| if (filters.includes(status)) { | ||
| status.selected = false | ||
| updated = filters.filter(item => item.label !== status.label) | ||
| } else { | ||
| updated = filters.slice() | ||
| updated.push(status) | ||
| } | ||
| setFilters(updated) | ||
| } | ||
|
|
||
| const findStatus = () => { | ||
| const values = Object.values(ProposalStatus) | ||
| for (const item in values) { | ||
| const obj = { | ||
| label: values[item], | ||
| selected: false | ||
| } | ||
| setStatus(oldArray => [...oldArray, obj]) | ||
| } | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| setStatus([]) | ||
| findStatus() | ||
| }, []) | ||
|
|
||
| const saveOffchainStatus = (status: OffchainStatus) => { | ||
| if (offchainStatus === status) { | ||
| setOffchainStatus(OffchainStatus.ALL) | ||
| } else { | ||
| setOffchainStatus(status) | ||
| } | ||
| } | ||
|
|
||
| const showFilters = () => { | ||
| const filterObject: Filters = { | ||
| type: proposalType, | ||
| offchainStatus: offchainStatus, | ||
| onchainStatus: filters, | ||
| order: order | ||
| } | ||
| saveFilters(filterObject) | ||
| handleClose() | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <ResponsiveDialog open={open} onClose={handleClose} title={"Filter"} template="sm"> | ||
| {/* <Container container direction="column"> | ||
| <Grid item> | ||
| <SectionTitle>Sort By</SectionTitle> | ||
| </Grid> | ||
| <Grid item> | ||
| <Dropdown | ||
| options={[ | ||
| { name: "Newest to Oldest", value: "recent" }, | ||
| { name: "Most Popular to Least Popular", value: "popular" } | ||
| ]} | ||
| value={"recent"} | ||
| // onSelected={filterProposalByPopularity} | ||
| isFilter={true} | ||
| /> | ||
| </Grid> | ||
| </Container> */} | ||
| <Container container direction="column"> | ||
| <Grid item> | ||
| <SectionTitle>Proposal Status</SectionTitle> | ||
| </Grid> | ||
| {selectedTab === 0 ? ( | ||
| <Grid item container direction="row"> | ||
| {status.length > 0 && | ||
| status.map((item, index) => { | ||
| return ( | ||
| <StatusButton | ||
| item | ||
| key={`status-${index}`} | ||
| style={isSelected(item) ? { backgroundColor: "#fff", color: "#1c1f23" } : {}} | ||
| > | ||
| <Typography onClick={() => saveStatus(item)}>{item.label}</Typography> | ||
| </StatusButton> | ||
| ) | ||
| })} | ||
| </Grid> | ||
| ) : ( | ||
| <Grid item container direction="row"> | ||
| <StatusButton | ||
| item | ||
| onClick={() => saveOffchainStatus(OffchainStatus.ACTIVE)} | ||
| style={offchainStatus === OffchainStatus.ACTIVE ? { backgroundColor: "#fff", color: "#1c1f23" } : {}} | ||
| > | ||
| <Typography>Active</Typography> | ||
| </StatusButton> | ||
| <StatusButton | ||
| item | ||
| onClick={() => saveOffchainStatus(OffchainStatus.CLOSED)} | ||
| style={offchainStatus === OffchainStatus.CLOSED ? { backgroundColor: "#fff", color: "#1c1f23" } : {}} | ||
| > | ||
| <Typography>Closed</Typography> | ||
| </StatusButton> | ||
| </Grid> | ||
| )} | ||
| </Container> | ||
|
|
||
| <Container container direction="row" justifyContent="flex-end"> | ||
| <SmallButton color="secondary" variant="contained" onClick={showFilters}> | ||
| Apply | ||
| </SmallButton> | ||
| </Container> | ||
| </ResponsiveDialog> | ||
| </> | ||
| ) | ||
| } |
Oops, something went wrong.