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

feat: traderxyz #6120

Closed
wants to merge 53 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
f72018f
feat(traderxyz): plugin init
vaimeo Apr 15, 2022
755ac99
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 16, 2022
bca3b05
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 18, 2022
526eb40
feat(traderxyz): working-code-without-lint
vaimeo Apr 18, 2022
369744f
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 18, 2022
f1e35d3
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 19, 2022
a1cd883
feat(traderxyz): code lint
vaimeo Apr 19, 2022
efb22bd
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 19, 2022
0861a09
feat(traderxyz): code lint verified
vaimeo Apr 19, 2022
d6f12cd
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 20, 2022
25cdebd
feat(traderxyz): latest application board added
vaimeo Apr 20, 2022
4d79988
feat(traderxyz): tsconfig update
vaimeo Apr 20, 2022
de92647
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 20, 2022
bc061e4
feat(traderxyz): console.log remove pnpm-lock fix
vaimeo Apr 20, 2022
401d07d
feat(traderxyz): spell-check fix
vaimeo Apr 20, 2022
b2a25c8
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 20, 2022
41f6633
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 22, 2022
67940aa
feat(traderxyz): bounty review fix
vaimeo Apr 22, 2022
cc814e7
feat(traderxyz): bounty review and merge conflict fix
vaimeo Apr 24, 2022
5cda82a
feat(traderxyz): bounty review and merge conflict fix
vaimeo Apr 24, 2022
4015bff
Merge pull request #2 from vaimeo/DimensionDev-develop
vaimeo Apr 24, 2022
38ada71
feat(traderxyz): dashboard removed
vaimeo Apr 24, 2022
71611e6
Merge branch 'develop' of github.com:vaimeo/Maskbook into develop
vaimeo Apr 24, 2022
7a18c19
feat(traderxyz): review fixes
vaimeo Apr 24, 2022
4a3e260
feat(traderxyz): merge conflict fix
vaimeo Apr 25, 2022
eb6937c
Merge branch 'DimensionDev-develop' into develop
vaimeo Apr 25, 2022
4d587eb
feat(traderxyz): merge conflict fix
vaimeo Apr 25, 2022
eec796c
Merge pull request #4 from vaimeo/DimensionDev-develop
vaimeo Apr 25, 2022
325b883
feat(traderxyz): review chanegs fix 3
vaimeo Apr 25, 2022
2e15056
feat(traderxyz): review chanegs fix 4
vaimeo Apr 25, 2022
6ceb288
Merge pull request #5 from DimensionDev/develop
vaimeo Apr 26, 2022
b754908
Merge branch 'develop' of https://github.com/DimensionDev/Maskbook in…
vaimeo Apr 26, 2022
089f10d
Merge pull request #6 from vaimeo/DimensionDev-develop
vaimeo Apr 26, 2022
3f87aaf
Merge pull request #8 from DimensionDev/develop
vaimeo Apr 26, 2022
fea28da
Merge branch 'develop' of https://github.com/DimensionDev/Maskbook in…
vaimeo Apr 26, 2022
a05949b
Merge branch 'develop' of github.com:vaimeo/Maskbook into develop
vaimeo Apr 26, 2022
ed92e49
Merge pull request #9 from DimensionDev/develop
vaimeo Apr 26, 2022
1c81612
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 27, 2022
04e4879
Merge branch 'DimensionDev:develop' into develop
vaimeo Apr 28, 2022
cc76e8d
Merge branch 'develop' of https://github.com/vaimeo/Maskbook into dev…
vaimeo May 1, 2022
c77fc10
feat(traderxyz): rebase from dev latest
vaimeo May 1, 2022
900c309
feat(traderxyz): review fix
vaimeo May 1, 2022
062f20b
feat(traderxyz): review fix gulp-ci
vaimeo May 1, 2022
5450fcf
feat(traderxyz): review fix filename
vaimeo May 1, 2022
a3151e5
feat(traderxyz): review fix cspell and package react version
vaimeo May 2, 2022
f9b5883
chore: merge main
Jack-Works May 11, 2022
6c15269
Merge remote-tracking branch 'upstream/develop' into develop
vaimeo May 14, 2022
f7bc251
git commit -m 'feat(traderxyz): review fix'
vaimeo May 14, 2022
1797e25
feat(traderxyz): review fix 2
vaimeo May 14, 2022
518cbea
Merge branch 'DimensionDev:develop' into develop
vaimeo May 15, 2022
bd73f75
feat(traderxyz): review fix 3
vaimeo May 15, 2022
b05d42e
feat(traderxyz): review fix 3 update
vaimeo May 15, 2022
14e6afa
feat(traderxyz): review fix 3 update
vaimeo May 15, 2022
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
12 changes: 12 additions & 0 deletions .i18n-codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,18 @@
"trans": "Translate",
"sourceMap": "inline"
}
},
{
"input": "./packages/plugins/Traderxyz/src/locales/en-US.json",
"output": "./packages/plugins/Traderxyz/src/locales/i18n_generated",
"parser": "i18next",
"generator": {
"type": "i18next/react-hooks",
"hooks": "useI18N",
"namespace": "io.mask.traderxyz",
"trans": "Translate",
"sourceMap": "inline"
}
}
]
}
5 changes: 5 additions & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"newsfeed",
"nftrss",
"nftscan",
"nftswap",
"nums",
"openswap",
"openx",
Expand Down Expand Up @@ -179,6 +180,7 @@
"tokenid",
"topbar",
"traderjoe",
"traderxyz",
"transak",
"trisolaris",
"twimg",
Expand Down Expand Up @@ -257,6 +259,7 @@
"ifrandom",
"iife",
"inpage",
"itemavatar",
"koda",
"kodav",
"lngs",
Expand All @@ -267,6 +270,7 @@
"metaplex",
"metaswap",
"nftred",
"nftswap",
"nftx",
"nonfungiblefriends",
"northcutt",
Expand All @@ -292,6 +296,7 @@
"tinycolor",
"tipable",
"traderjoexyz",
"traderxyz",
"treeshake",
"txes",
"txreceipt",
Expand Down
1 change: 1 addition & 0 deletions packages/mask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@masknet/plugin-infra": "workspace:*",
"@masknet/plugin-rss3": "workspace:*",
"@masknet/plugin-solana": "workspace:*",
"@masknet/plugin-traderxyz": "workspace:*",
"@masknet/plugin-wallet": "workspace:*",
"@masknet/public-api": "workspace:*",
"@masknet/sdk": "workspace:*",
Expand Down
1 change: 1 addition & 0 deletions packages/mask/src/plugin-infra/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import '@masknet/plugin-solana'
import '@masknet/plugin-cyberconnect'
import '@masknet/plugin-go-plus-security'
import '@masknet/plugin-cross-chain-bridge'
import '@masknet/plugin-traderxyz'
import '../plugins/Wallet'
import '../plugins/EVM'
import '../plugins/RedPacket'
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-infra/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@ export enum PluginId {
CyberConnect = 'me.cyberconnect.app',
GoPlusSecurity = 'io.gopluslabs.security',
CrossChainBridge = 'io.mask.cross-chain-bridge',
Traderxyz = 'io.mask.traderxyz',
// @masknet/scripts: insert-here
}
/**
Expand Down
43 changes: 43 additions & 0 deletions packages/plugins/Traderxyz/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Traderyx Plugin

Buy and Sell NFT through social media platform in few clicks faster and chaper.

## Features

- [x] Create orders (Sell NFT)
- [x] Post orders (View NFT)
- [x] Fulfill orders (Buy NFT)

## Pull requests

- <https://github.com/DimensionDev/Maskbook/pull/6120>

## Referenced resources

NFRSWAP SDK: <https://github.com/trader-xyz/nft-swap-sdk>

## Screenshots

### Order compose

#### Step 1 (Select the NFT)

<img width="596" alt="image" src="https://user-images.githubusercontent.com/3579069/168494971-0c878c77-12e3-42f2-9fd3-6e696003405b.png">

#### Step 2 (Select the Receiving Currency)

<img width="594" alt="image" src="https://user-images.githubusercontent.com/3579069/168495010-acbda807-c8ea-401c-90d7-702c6b2833ac.png">

#### Step 3 (Review and post)

<img width="598" alt="image" src="https://user-images.githubusercontent.com/3579069/168495083-36697533-9fdd-43f2-875b-e90d2532d861.png">

### POST preview

#### Twitter preview

<img width="608" alt="image" src="https://user-images.githubusercontent.com/3579069/164236493-02b8ff12-f311-4392-899a-9563dbc8da4e.png">

## Authors

- [@vaimeo](https://github.com/vaimeo)
31 changes: 31 additions & 0 deletions packages/plugins/Traderxyz/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "@masknet/plugin-traderxyz",
"private": true,
"exports": {
".": {
"webpack": "./src/index.ts",
"default": "./dist/index.js"
}
},
"types": "./dist/index.d.ts",
"dependencies": {
"@ethersproject/providers": "5.6.4",
"@masknet/icons": "workspace:*",
"@masknet/plugin-infra": "workspace:*",
"@masknet/plugin-wallet": "workspace:*",
"@masknet/shared": "workspace:*",
"@masknet/shared-base": "workspace:*",
"@masknet/shared-base-ui": "workspace:*",
"@masknet/theme": "workspace:*",
"@masknet/typed-message": "workspace:*",
"@masknet/web3-providers": "workspace:*",
"@masknet/web3-shared-base": "workspace:*",
"@masknet/web3-shared-evm": "workspace:*",
"@traderxyz/nft-swap-sdk": "^0.22.1",
"bignumber.js": "^9.0.2",
"react-use": "^17.3.2",
"urlcat": "^2.0.4",
"use-subscription": "^1.7.0",
"web3": "1.7.3"
}
}
Loading