Skip to content

Commit

Permalink
Release - Develop to Master (#872) [v2024-12-04]
Browse files Browse the repository at this point in the history
* Fixed the typo

* clean up & css fix user tab

* user page initial commit, font changed, tabs & cards updated

* user movements component

* user transactions finished - pagination & responsiveness

* clean up

* votes component logic fixed

* tabs updated and pagination added to all tabs

* multiple ui fixes

* last UI changes

* validation for downloading votes & label for when no votes on dialog

* top members component brought back

* Ipfs lite (#813)

* csv votes download

* fix node version

* updated dependencies

* new ui implemented

* user tab - activity section new layout

* activity logic

* filter dialog layout & logic working

* filters for proposals & votes

* rpc node updated & loading for casting vote

* Treasury filters (#845)

* desktop update

* responsive tables

* no items + scroll on other tabs

* searchbar

* transactions filters working

* search bar & filter dialog for token tab

* filters & xtz added to list of holdings

* nft filters & responsive dialogs

* Update FilterNFTDialog.tsx

---------

Co-authored-by: Manank Patni <[email protected]>

* Votes grouping (#832)

* voting grouping & dependencies upgraded

* stylings add to tooltip

* mobile css

* pagination & css fix

* votes grouping in csv file

* requested changes

* decimals for isXTZ

* fix

* fix

* Arbitrary Contract Interaction (ACI) (#836)

* frontend with mocks

* initial integration

* API working

* ACI Form with various entrypoints

* Update  node version

* Fix for API in ACI

* WIP - ACI Implementation Debugging

* WIP - ACI Interaction (Pseudocode working)

* Error handling + Params now being passed into generated lambda

* Changes for adding ACI Executor and simplified UI components

* Removed Cycle Ignore Option

* Fixed prettier issues

* Added ACI Contract within the form  & fixed the "Submit" button.

* Improved Components for ConfigProposalForm

* Removed unused imports

* Modal Improvements

* Renamed simple lambda 3 to ACI_Executor

* Fixed Other UI Issues

---------

Co-authored-by: Ashutosh Kumar <[email protected]>
Co-authored-by: Ashutosh Kumar <[email protected]>

* Removed bun lock file

* Build Issues Fixed

* Fixed Build Issue

---------

Co-authored-by: fabiolalombardim <[email protected]>
Co-authored-by: fabiolalombardim <[email protected]>
Co-authored-by: Manank Patni <[email protected]>
  • Loading branch information
4 people authored Dec 3, 2024
1 parent 62c64ba commit e76d39a
Show file tree
Hide file tree
Showing 64 changed files with 4,644 additions and 664 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following dependencies are required to run homebase-app:

| Dependency | Version |
| ---------- | ------------------- |
| Node | `v16.16.0` or above |
| Node | `v18.20.0` or above |
| Yarn | `v1.22.*` or above |

# Third Party Services
Expand Down
Binary file removed bun.lockb
Binary file not shown.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@types/valid-url": "^1.0.4",
"@wagmi/core": "2.13.4",
"assert": "^2.0.0",
"assert-never": "^1.2.1",
"bignumber.js": "^9.0.1",
"blockies-ts": "^1.0.0",
"caniuse-lite": "",
Expand Down Expand Up @@ -95,8 +96,8 @@
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@types/jest": "^29.5.12",
"@types/node": "^14.14.35",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.2",
"@types/react": "^17.0.44",
"@types/react-dom": "^18.2.25",
"@types/react-html-parser": "^2.0.2",
"@types/react-router-dom": "^5.1.6",
"@types/yup": "^0.29.11",
Expand Down
28 changes: 28 additions & 0 deletions src/components/ui/Button.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { styled, Button as MaterialButton } from "@material-ui/core"

export const Button = styled(MaterialButton)(({ theme }) => ({
"fontSize": "14px",
"justifyItems": "center",
"color": "#000",
"boxShadow": "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
"transition": ".15s ease-in",
"background": theme.palette.secondary.main,
"textTransform": "none",
"borderRadius": 4,
"padding": "8px 15px",
"marginRight": "8px",

"&$disabled": {
boxShadow: "none"
},

"&:hover": {
boxShadow: "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
backgroundColor: "#62eda5 !important",
transition: ".15s ease-in"
},

["@media (max-width:1030px)"]: {
fontSize: "14px"
}
}))
20 changes: 20 additions & 0 deletions src/components/ui/ConfigProposalForm.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Grid, Typography, styled, CircularProgress } from "@material-ui/core"
import { CheckOutlined } from "@material-ui/icons"

const StyledRow = styled(Grid)({
marginTop: 30
})

const LoadingContainer = styled(Grid)({
minHeight: 651
})

const LoadingStateLabel = styled(Typography)({
marginTop: 40
})

const CheckIcon = styled(CheckOutlined)({
fontSize: 169
})

export { StyledRow, LoadingContainer, LoadingStateLabel, CheckIcon }
18 changes: 18 additions & 0 deletions src/components/ui/Table.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { styled, Grid, Theme } from "@material-ui/core"

export const ContentContainer = styled(Grid)(({ theme }) => ({
borderRadius: 8,
background: "#24282D"
}))

export const TableHeader = styled(Grid)(({ theme }: { theme: Theme }) => ({
padding: "16px 46px",
minHeight: 34,
[theme.breakpoints.down("sm")]: {
gap: 10
}
}))

export const TableContainer = styled(ContentContainer)({
width: "100%"
})
15 changes: 15 additions & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const AppConfig = {
env: process.env.REACT_APP_ENV,
CONST: {
ARBITRARY_CONTRACT_INTERACTION: "arbitrary_contract_interaction"
},
ACI: {
EXECUTOR_FUNCTION_NAME: "aci_executor",
EXECUTOR_LAMBDA: {
code: `(Left (Left (Pair (Pair { UNPAIR; UNPAIR; SWAP; UNPACK (pair (lambda %code (pair (pair (map %handler_storage string bytes) (bytes %packed_argument)) (pair %proposal_info (address %from) (nat %frozen_token) (bytes %proposal_metadata))) (pair (pair (option %guardian address) (map %handler_storage string bytes)) (list %operations operation))) (bytes %packed_argument)); ASSERT_SOME; UNPAIR; DIP{ SWAP; PAIR; PAIR}; SWAP; EXEC} {DROP; UNIT}) "aci_executor")))`,
type: `(or (or (pair %add_handler (pair (lambda %code (pair (pair (map %handler_storage string bytes) (bytes %packed_argument)) (pair %proposal_info (address %from) (nat %frozen_token) (bytes %proposal_metadata))) (pair (pair (option %guardian address) (map %handler_storage string bytes)) (list %operations operation))) (lambda %handler_check (pair bytes (map string bytes)) unit)) (string %name)) (pair %execute_handler (string %handler_name) (bytes %packed_argument))) (string %remove_handler))`
}
}
}

export default AppConfig
26 changes: 26 additions & 0 deletions src/models/Contract.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
export interface ArbitraryContract {
counter: number
name: string
type: string
children: ContractChild[]
}

interface ContractChild {
counter: number
name: string
type: string
children: ParametersList[]
placeholder: string
validate: any
initValue: string
}

interface ParametersList {
counter: number
name: string
type: string
children: ParametersList[]
placeholder: string
validate: any
initValue: string
}
24 changes: 24 additions & 0 deletions src/modules/common/SmallButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,27 @@ export const SmallButton = styled(Button)({
transition: ".15s ease-in"
}
})

export const SmallButtonDialog = styled(Button)({
"justifyItems": "center",
"fontSize": "16px",
"boxShadow": "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
"transition": ".15s ease-out",
"textTransform": "capitalize",
"borderRadius": 8,
"backgroundColor": "#81feb7 !important",
"color": "#1c1f23",
"padding": "8px 16px",

"&$disabled": {
boxShadow: "none",
backgroundColor: "#474E55 !important",
border: "none"
},

"&:hover": {
boxShadow: "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
backgroundColor: "#62eda5 !important",
transition: ".15s ease-in"
}
})
14 changes: 14 additions & 0 deletions src/modules/common/StyledSendButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { styled } from "@material-ui/core"
import { MainButton } from "./MainButton"

const StyledSendButton = styled(MainButton)(({ theme }) => ({
"width": 101,
"color": "#1C1F23",
"&$disabled": {
opacity: 0.5,
boxShadow: "none",
cursor: "not-allowed"
}
}))

export { StyledSendButton }
14 changes: 1 addition & 13 deletions src/modules/explorer/components/AllProposalsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,8 @@ import { ProposalItem } from "modules/explorer/pages/User"
import React, { useCallback, useEffect, useState } from "react"
import { Link } from "react-router-dom"
import { Proposal, ProposalStatus } from "services/services/dao/mappers/proposal/types"
import { ContentContainer } from "./ContentContainer"
import { ProposalFilter } from "./ProposalsFilter"

const TableContainer = styled(ContentContainer)({
width: "100%"
})

const TableHeader = styled(Grid)(({ theme }: { theme: Theme }) => ({
padding: "16px 46px",
minHeight: 34,
[theme.breakpoints.down("sm")]: {
gap: 10
}
}))
import { TableContainer, TableHeader } from "components/ui/Table"

const ProposalsFooter = styled(Grid)({
padding: "16px 46px",
Expand Down
Loading

0 comments on commit e76d39a

Please sign in to comment.