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.

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

Merged Staging into Develop - Multiple UI changes #697

Merged
merged 51 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
cc55132
new ui changes- explorer dao list
fabiolalombardim Sep 16, 2023
ff763e8
Merge pull request #677 from dOrgTech/develop
Man-Jain Sep 30, 2023
8cc6f8f
Fix lite proposal status in proposal list page (#680)
Man-Jain Oct 1, 2023
5407569
Merge branch 'develop' into new-ui
fabiolalombardim Oct 1, 2023
2bba30f
label added
fabiolalombardim Oct 1, 2023
f05f627
Fix button text for no voting weight in create proposal and proposal …
Man-Jain Oct 4, 2023
c1392ed
Fix Vote weight bug for lite communities, explorer sorting, new propo…
Man-Jain Oct 15, 2023
ed235ce
pagination working using react-paginate
fabiolalombardim Oct 17, 2023
d8d8ae0
footer finished
fabiolalombardim Oct 17, 2023
5d391f7
Merge branch 'develop' into footer
fabiolalombardim Oct 20, 2023
39d610d
footer
fabiolalombardim Oct 20, 2023
8149d8a
Merge branch 'develop' into bug-657
fabiolalombardim Oct 21, 2023
1da188f
Merge pull request #681 from dOrgTech/bug-657
fabiolalombardim Oct 21, 2023
b1be6e8
Merge branch 'staging' into footer
fabiolalombardim Oct 21, 2023
8c17689
fix documentation button spacing
fabiolalombardim Oct 21, 2023
49eb4c1
fix documentation button spacing pixels
fabiolalombardim Oct 21, 2023
3a0b7b0
Merge pull request #696 from dOrgTech/footer
fabiolalombardim Oct 21, 2023
75e3b30
merge staging
fabiolalombardim Oct 21, 2023
dc8dd26
home tab upgrades - dao stats
fabiolalombardim Oct 21, 2023
17aa0b0
Fix proposal off-chain
Man-Jain Oct 23, 2023
dd770b2
Merge branch 'master' into bug-patch-off-chain
Man-Jain Oct 23, 2023
78b82b8
Merge branch 'master' of github.com:dOrgTech/homebase-app into bug-pa…
Man-Jain Oct 23, 2023
002bfab
Merge branch 'bug-patch-off-chain' of github.com:dOrgTech/homebase-ap…
Man-Jain Oct 23, 2023
b9a1e99
Merge pull request #700 from dOrgTech/bug-patch-off-chain
Man-Jain Oct 23, 2023
2ae8ab7
Merge branch 'master' into fix-favicon
fabiolalombardim Oct 24, 2023
e78718b
Merge pull request #698 from dOrgTech/fix-favicon
Man-Jain Oct 24, 2023
d73c4f0
top addresses component
fabiolalombardim Oct 24, 2023
03e3124
home tab finished
fabiolalombardim Oct 27, 2023
08739ec
fix link
fabiolalombardim Oct 27, 2023
2a771c7
buttons behaving correctly
fabiolalombardim Nov 6, 2023
5b710b6
link on votes label
fabiolalombardim Nov 6, 2023
35b4a71
fix link (#708)
fabiolalombardim Nov 6, 2023
441fe63
create new poll landing new UI - votes still missing
fabiolalombardim Nov 6, 2023
ccc5c89
Merge pull request #714 from dOrgTech/fix-poll-options
fabiolalombardim Nov 7, 2023
9ff16a4
poll list upgrade & responsive added
fabiolalombardim Nov 7, 2023
6ef8e81
Merge branch 'master' into staging
fabiolalombardim Nov 7, 2023
3ebb0b3
Merge branch 'master' into develop
fabiolalombardim Nov 12, 2023
658e17c
modal widen with new style
fabiolalombardim Nov 12, 2023
5200be0
modal open on small devices
fabiolalombardim Nov 12, 2023
41b3092
link to terms added
fabiolalombardim Nov 12, 2023
4b23298
Merge pull request #716 from dOrgTech/bug-703
Man-Jain Nov 16, 2023
b1cc68f
Merge pull request #715 from dOrgTech/bug-711
Man-Jain Nov 16, 2023
fed0053
deeplink fixed
fabiolalombardim Nov 18, 2023
d0ad21e
markup added to LITE descriptions
fabiolalombardim Nov 18, 2023
3f2b85b
Merge pull request #720 from dOrgTech/bug-704
fabiolalombardim Nov 24, 2023
0938a65
Merge pull request #719 from dOrgTech/bug-707
fabiolalombardim Nov 24, 2023
5f02720
fix merge master
fabiolalombardim Nov 24, 2023
a533b27
new cards wip
fabiolalombardim Nov 24, 2023
84fda53
new cards
fabiolalombardim Nov 25, 2023
2823191
Merge branch 'master' into develop
fabiolalombardim Nov 25, 2023
6785736
Merge branch 'develop' into staging
fabiolalombardim Nov 25, 2023
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
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
"@airgap/beacon-sdk": "^4.0.10",
"@craco/craco": "^7.1.0",
"@date-io/dayjs": "1.x",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@hookform/resolvers": "^2.8.1",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.57",
"@microsoft/signalr": "^5.0.9",
"@mui/material": "^5.10.6",
"@mui/icons-material": "^5.14.14",
"@mui/material": "^5.14.14",
"@mui/x-date-pickers": "^5.0.2",
"@taquito/beacon-wallet": "^17.3.1",
"@taquito/signer": "^17.3.1",
Expand All @@ -50,11 +51,13 @@
"graphql": "^15.5.1",
"graphql-request": "^3.4.0",
"hex-to-rgba": "^2.0.1",
"html-react-parser": "^5.0.6",
"https-browserify": "^1.0.0",
"jsonschema": "^1.4.0",
"launchdarkly-react-client-sdk": "2.27.0",
"mixpanel-browser": "^2.42.0",
"notistack": "^1.0.3",
"numbro": "^2.4.0",
"os-browserify": "^0.3.0",
"prism-themes": "^1.9.0",
"prismjs": "^1.28.0",
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Tezos dApp for creating and interacting with DAOs using BaseDAO framework",
"icons": [
{
"src": "favicon.svg",
"src": "favicon.png",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/svg+xml"
}
Expand Down
9 changes: 3 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Landing } from "modules/home/Landing"
import { WarningFooter } from "modules/common/WarningFooter"
import { ActionSheetProvider } from "modules/explorer/context/ActionSheets"
import { legacyTheme } from "theme/legacy"
import { Footer } from "modules/common/Footer"
import { ExplorerFooter } from "modules/common/Footer"
import { FAQ } from "modules/home/FAQ"
import { EnvKey, HUMANITEZ_DAO, getEnv } from "services/config"
import { DAOCreatorRouter } from "modules/creator/router"
Expand Down Expand Up @@ -134,15 +134,12 @@ const App: React.FC = () => {
/>
</>
) : null}
<Footer></Footer>
<ExplorerFooter></ExplorerFooter>
</Route>
<Route path="/faq">
<FAQ />
</Route>
<Route path="/">
<Landing />
</Route>
<Redirect to="/" />
<Redirect to="/explorer" />
</Switch>
</Router>
</Box>
Expand Down
3 changes: 3 additions & 0 deletions src/assets/img/copy_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/img/my-daos-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/img/my-daos-selected-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/img/tabs-icon-selected.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/img/tabs-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/img/tz_circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/logos/footer_discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/logos/footer_documentation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading