8000 Release 0.15.0 by colbr · Pull Request #554 · zer0-os/zNS-dapp · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
2b5c514
DAO Container
akshatmittal Mar 9, 2022
81f9f20
Individual Items
akshatmittal Mar 9, 2022
2ba0906
feat: create static UI elements (#425)
colbr Mar 18, 2022
a422ac8
Merge branch 'develop' into ft/zdao
colbr Mar 18, 2022
35c37eb
feat(loading-indicator): handle left and bottom position
colbr Mar 18, 2022
8fc21a3
feat: shrink main container
colbr Mar 27, 2022
c21f674
feat(side-bar): zUI sidebar
colbr Mar 27, 2022
4cb6d06
feat(header): partly implement zUI header
colbr Mar 27, 2022
abb1213
fix(staking-container): remove top margin
colbr Mar 27, 2022
90a01cf
feat: improvements to container
colbr Mar 27, 2022
42961df
feat(info-panel): hide nav links when nav visible
colbr Mar 27, 2022
726e965
WIP
akshatmittal Mar 27, 2022
9652ccd
More updates
akshatmittal Mar 28, 2022
2a6bf80
feat(zna-link): use browser position rather than current domain
colbr Mar 28, 2022
66be96b
feat(zdao-sdk): finish zDAO-SDK implementation
colbr Mar 28, 2022
d7095d3
feat(zdao): new SDK version
colbr Mar 29, 2022
b50c900
feat(zdao): handle ERC721
colbr Mar 29, 2022
a301de4
feat(assets-table): handle default asset
colbr Mar 29, 2022
ba19fb2
fix(assets-table): adjust default logo logic
colbr Mar 29, 2022
862f68a
feat(dao-page): widget size, default asset, millify
colbr Mar 29, 2022
11c99be
feat(assets-table): remove click handling + hover
colbr Mar 29, 2022
dff2ae7
fix(zdao): fixed cursor
colbr Mar 29, 2022
644c529
fix(dao-page): proper h1 margin
colbr Mar 29, 2022
3935b00
feat(generic-table): implement search parameters
colbr Mar 29, 2022
83278b4
feat(assets-table): make searchable by token ticker
colbr Mar 29, 2022
2efa3f2
feat(artwork): allow for subtext which does not append 'wilder.'
colbr Mar 29, 2022
0846395
feat(generic-table): add empty message, adjust loading UI
colbr Mar 29, 2022
9c2b2e7
feat(zdao): add test DAOs for mainnet
colbr Mar 29, 2022
1cee909
feat(use-redirect): add hook for redirecting
colbr Mar 29, 2022
f401be0
refactor(zdao): tighten up zdao logic
colbr Mar 29, 2022
fae4afd
WIP pre-ZNS Bar
akshatmittal Mar 29, 2022
ddebdda
w/ ZNA Bar
akshatmittal Mar 29, 2022
0a51020
NFT View
akshatmittal Mar 29, 2022
3620716
feat(zdao): add first breakpoints and DAO table card
colbr Mar 29, 2022
10560b2
fix(total-provider): prevent duplicate total items
colbr Mar 29, 2022
a45cb90
feat(assets-table): handle ERC721 metadata
colbr Mar 30, 2022
e43ecde
feat(transactions): correct decimal formatting for token amount
colbr Mar 30, 2022
265bc9c
refactor(assets-table): better handling of assets
colbr Mar 30, 2022
41d17c9
Icon without glow
akshatmittal Mar 30, 2022
3ed4019
WIP
akshatmittal Mar 31, 2022
ca7b069
Merge branch 'develop' into feat/colbr/zui-iteration
colbr Apr 1, 2022
0e1400a
Merge branch 'feat/colbr/zdao-sdk-integration' into feat/app-restructure
colbr Apr 1, 2022
bc333be
fix: fix non-100% width
colbr Apr 1, 2022
bc8995c
Merge remote-tracking branch 'origin/feat/reskin' into feat/app-restr…
colbr Apr 1, 2022
77d6571
feat(side-bar): match zUI design
colbr Apr 1, 2022
ad39aa6
feat(generic-table): remove default padding
colbr Apr 1, 2022
d8d0b92
fix(zns): fix centering
colbr Apr 1, 2022
9689815
chore: fix (most) linter warnings
colbr Apr 1, 2022
e248459
feat(header): add background colour
colbr Apr 1, 2022
6f8416b
refactor: improve global styling
colbr Apr 3, 2022
6db3e98
Merge branch 'develop' into feat/app-restructure
colbr Apr 3, 2022
57cd89c
fix: handle minor bugs from merge
colbr Apr 3, 2022
4bc873e
feat(nav): re-order nav links
colbr Apr 3, 2022
eff30d2
style: change shadows to primary color
colbr Apr 3, 2022
dcd1712
style(side-bar): adjust nav styling
colbr Apr 3, 2022
63db41f
feat(side-bar): clicking sidebar icon should take you to root
colbr Apr 3, 2022
d97d0f8
WIP
akshatmittal Apr 3, 2022
de5c2fd
Merge branch 'feat/app-restructure' of github.com:zer0-os/zNS-dapp in…
akshatmittal Apr 3, 2022
77f92cd
Price Popover, Slide Up Animation, Links popover position, misc
akshatmittal Apr 3, 2022
2d31cca
feat: Handle NFT View actions (#470)
colbr Apr 4, 2022
8954fd1
Merge remote-tracking branch 'origin/develop' into feat/app-restructure
colbr Apr 4, 2022
6b6c9d5
style(preview): restyle preview per Figma (#471)
colbr Apr 4, 2022
4975e73
feat: Tooltip adjustments (#472)
colbr Apr 4, 2022
91e4c86
feat(side-bar): center align logo on smaller breakpoint
colbr Apr 4, 2022
8ee9756
feat(profile): new profile page (#473)
colbr Apr 4, 2022
dd03af8
test(bid-table): adjust tests for new functionality
colbr Apr 4, 2022
57eb835
Misc changes + shuffle
akshatmittal Apr 6, 2022
bdc1a95
Merge remote-tracking branch 'origin/develop' into chore/app-restruct…
colbr Apr 7, 2022
058212a
Merge pull request #489 from zer0-os/chore/app-restructure-merge
colbr Apr 7, 2022
a3c9c12
Merge pull request #491 from zer0-os/master
akshatmittal Apr 7, 2022
df534ad
hotfix: Filter Bids in Bid List when used can Accept Bids - Display a…
domw30 Apr 8, 2022
e776533
feat: Improvements to NFT View (#474)
domw30 Apr 11, 2022
d0b7e62
fix: remove view bids option when no bids (#495)
domw30 Apr 11, 2022
3915e13
Update package-lock.json to support windows
joonchoi0918 Apr 12, 2022
d4b5300
Fix eslint warning
joonchoi0918 Apr 12, 2022
6d34e17
Remove browser console log
joonchoi0918 Apr 12, 2022
d70de26
Fix incorrect switch usages and remove console logs
joonchoi0918 Apr 8000 12, 2022
8813ba6
Merge pull request #501 from zer0-os/fix/joonchoi/eslint-console-logs
joonchoi0918 Apr 14, 2022
12d7f27
Fix NFT no-bids section
eric-zero-dev Apr 14, 2022
4f30dfe
Merge pull request #513 from zer0-os/fix/ericlow/nft-no-bids-section
eric-zero-dev Apr 14, 2022
92a6b3d
chore: master -> develop (#515)
colbr Apr 15, 2022
1f4f43d
feat: responsive Ui - page container - side bar - header (#498)
domw30 Apr 16, 2022
9ac5ded
chore: switch to zDAO-SDK from NPM rather than git (#518)
colbr Apr 17, 2022
07fcc6d
test: Increase coverage (#516)
colbr Apr 17, 2022
a1e3b5d
feat: Domain table grid card image aspect ratios (#521)
colbr Apr 18, 2022
06d8f22
feat: Adjust button glows (#517)
colbr Apr 18, 2022
c91c5be
feat: implement updated breakpoints & update action container style (…
domw30 Apr 19, 2022
560e101
feat: Improved profile address (#522)
colbr Apr 20, 2022
a669c5c
fix: prevent user bidding on own domains - disable onClick (#528)
domw30 Apr 20, 2022
b922ad4
feat: Mobile flows (#529)
colbr Apr 21, 2022
630c909
Check and Update Responsiveness UI (#530)
domw30 Apr 21, 2022
6159f27
fix: some assets not using Cloudinary (#542)
colbr May 1, 2022
81f966f
fix: Metadata link in NFT View routing is broken (#543)
domw30 May 1, 2022
9e87611
chore: add intellij configs to gitignore (#544)
colbr May 2, 2022
72f88ea
fix: reskin iteration (#532)
domw30 May 2, 2022
5166ee4
fix(use-assets): asset totals not summing properly (#545)
colbr May 2, 2022
6e478c4
fix(profile): profile re-rendering on hover (#546)
colbr May 2, 2022
c9fea78
chore: Merge Master -> Develop in prep for release 0.15.0 (reskin) (#…
domw30 May 2, 2022
5f4fbbd
fix: add wilder to search results (#549)
domw30 May 2, 2022
e0bc7d4
fix: update hover colour for DAO, Staking and Deposit tables (#550)
domw30 May 3, 2022
c5238e9
fix(nft-media): more reliable image loading (#548)
colbr May 3, 2022
24399da
fix(current-domain): subdomain loading halting metadata loading (#552)
colbr May 3, 2022
4baae48
fix: Fix broken edit buy now button and modal header (#551)
domw30 May 3, 2022
79495ab
fix(preview): disable lightbox on Preview images
colbr May 3, 2022
a9ec7a9
fix(preview): format images properly
colbr May 3, 2022
539f379
fix(nft-media): reset all state on prop change
colbr May 3, 2022
1228bdf
fix: Generic Table infinite scroll not working on large monitors (#534)
joonchoi0918 May 4, 2022
d22c7a0
Fix: 0.15.0 (Reskin) Bundle of Bugs/Updates (#553)
domw30 May 4, 2022
a39901e
Quick fix of parsing domain metadata (#555)
eric-zero-dev May 4, 2022
9bb6abe
Merge branch 'master' into master->dev-merge
colbr May 4, 2022
cdfcebe
Merge pull request #556 from zer0-os/master->dev-merge
colbr May 4, 2022
fe0d104
Merge remote-tracking branch 'origin/develop' into master->dev
colbr May 4, 2022
f2be6c7
Merge pull request #557 from zer0-os/master->dev
colbr May 4, 2022
1d7b7b5
chore: increment version number
colbr May 4, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
8000
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ meta.json
.env
.eslintcache
.vscode
.idea

npm-debug.log*
yarn-debug.log*
Expand Down
43 changes: 26 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zns-dapp",
"version": "0.14.18",
"version": "0.15.0",
"private": true,
"dependencies": {
"@apollo/client": "^3.3.13",
Expand Down Expand Up @@ -37,8 +37,8 @@
"@web3-react/trezor-connector": "^6.1.9",
"@web3-react/walletconnect-connector": "6.2.4",
"@web3-react/walletlink-connector": "^6.1.9",
"@zero-tech/zdao-sdk": "0.0.6",
"@zero-tech/zauction-sdk": "0.0.60",
"@zero-tech/zdao-sdk": "0.0.6",
"@zero-tech/zfi-sdk": "0.1.16",
"@zero-tech/zns-sdk": "^0.1.32",
"@zero-tech/zsale-sdk": "0.0.19",
Expand Down
102 changes: 32 additions & 70 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,76 +1,38 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1 user-scalable=no"
/>
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Decentralized NFT Market and Artist Guild"
/>
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
<meta name="fortmatic-site-verification" content="fdtdkNpVYri6vfLG" />
<link
rel="apple-touch-icon"
sizes="180x180"
href="%PUBLIC_URL%/apple-touch-icon.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="%PUBLIC_URL%/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="%PUBLIC_URL%/favicon-16x16.png"
/>
<link rel="manifest" href="%PUBLIC_URL%/site.webmanifest" />
<link
rel="mask-icon"
href="%PUBLIC_URL%/safari-pinned-tab.svg"
color="#5bbad5"
/>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;700&display=swap"
rel="stylesheet"
/>
<title>Wilder World</title>

<script
src="https://parrotfish.wilderworld.com/script.js"
data-spa="hash"
data-site="ZZNCORJZ"
defer
></script>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Decentralized NFT Market and Artist Guild" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
<meta name="fortmatic-site-verification" content="fdtdkNpVYri6vfLG" />
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png" />
<link rel="manifest" href="%PUBLIC_URL%/site.webmanifest" />
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;700&display=swap" rel="stylesheet" />
<title>Wilder World</title>

<style>
body {
background-color: #0b041a;
}
</style>
</head>
<script src="https://parrotfish.wilderworld.com/script.js" data-spa="hash" data-site="ZZNCORJZ" defer></script>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="#mainContainer">
<div id="breakpointMessage" style="display: none">
<span
>To explore Wilder World, please use a browser with a larger viewport.
Mobile experience coming soon.</span
>
</div>
<div id="overlay"></div>
<div id="root"></div>
<div id="backgroundImage"></div>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="#mainContainer">
<div id="breakpointMessage" style="display: none">
<span>To explore Wilder World, please use a browser with a larger viewport.
Mobile experience coming soon.</span>
</div>
</body>
</html>
<div id="overlay"></div>
<div id="root"></div>
<div id="backgroundImage"></div>
</div>
</body>

</html>
20 changes: 2 additions & 18 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,8 @@ import CurrentDomainProvider from 'lib/providers/CurrentDomainProvider';
import MvpVersionProvider from 'lib/providers/MvpVersionProvider';
import { ROUTES } from 'constants/routes';

//- Asset Imports
import backgroundImage from 'assets/background.jpg';

//- Page Imports
import { ZNS, Staking } from 'pages';
import { ZNS, Staking, Profile } from 'pages';
import PageContainer from 'containers/PageContainer';
import DAO from 'pages/DAO/DAO';
import { ZnsSdkProvider } from 'lib/providers/ZnsSdkProvider';
Expand All @@ -49,20 +46,6 @@ function App() {
'display: block; border: 3px solid #52cbff; border-radius: 7px; padding: 10px; margin: 8px;',
);

// Programatically load the background image
const loadImg = new Image();
loadImg.src = backgroundImage;
if (loadImg.complete) {
document.body.style.backgroundImage = `url(${backgroundImage})`;
} else {
loadImg. => {
const bg = document.getElementById('backgroundImage')?.style;
if (!bg) return;
bg.backgroundImage = `url(${backgroundImage})`;
bg.opacity = '1';
};
}

return (
<ConnectedRouter history={history}>
<BrowserRouter>
Expand All @@ -72,6 +55,7 @@ function App() {
<Route path={ROUTES.MARKET} component={ZNS} />
<Route path={ROUTES.STAKING} component={Staking} />
<Route path={ROUTES.ZDAO} component={DAO} />
<Route path={ROUTES.PROFILE} component={Profile} />
<Route exact path="/">
<Redirect to="/market" />
</Route>
Expand Down
28 changes: 6 additions & 22 deletions src/assets/WWLogo_SVG.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/assets/arrow-back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/assets/arrow-forward.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/chevron-back.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/chevron-forward.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/default_dao.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/external-link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/header-search-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/icon_dao.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/icon_market.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/icon_staking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/more-vertical.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: 5 additions & 2 deletions src/assets/user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/user_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
0