diff --git a/.babelrc b/.babelrc deleted file mode 100644 index fd184636e..000000000 --- a/.babelrc +++ /dev/null @@ -1,19 +0,0 @@ -{ - "presets": [ - "@babel/preset-typescript", - ["@babel/preset-env", { "module": false }] - ], - "plugins": [ - "@babel/plugin-proposal-class-properties", - "@babel/plugin-proposal-object-rest-spread", - [ - "@babel/plugin-transform-runtime", - { - "corejs": false, - "helpers": false, - "regenerator": true, - "useESModules": false - } - ] - ] -} diff --git a/.env.development b/.env.development new file mode 100644 index 000000000..edbab0563 --- /dev/null +++ b/.env.development @@ -0,0 +1,15 @@ +VITE_WEB_WALLET_VERSION=4.1.0 +VITE_NETWORK=mainnet +VITE_API_CONFIG=https://config.vite.net +VITE_SERVER=wss://node.vite.net/gvite/ws +VITE_PUSH_SERVER=wss://vitex.vite.net/websocket +VITE_DEX_SERVER=https://vitex.vite.net +VITE_CONNECT=wss://biforst.vite.net +VITE_REWARD_SERVER=https://vitex.vite.net +VITE_CROSSCHAIN_SERVER=https://crosschain.vite.net +VITE_GATEWAY=https://gateway.vite.net +VITE_ETH_SERVER=https://node.vite.net/eth/v3/caae2231051e46a1941f422df1fbcc94 +VITE_ETH_EXPLORER=https://ropsten.etherscan.io +VITE_CONTRACT_ADDRESS=0x1b793e49237758dbd8b752afc9eb4b329d5da016 +VITE_RECAPTCHA_TOKEN=6LdziZ0fAAAAADBzBnGli4Akjok0CoSJ388bRWtw +VITE_VIEW=https://mainnet.viteview.xyz diff --git a/.env.production b/.env.production new file mode 100644 index 000000000..edbab0563 --- /dev/null +++ b/.env.production @@ -0,0 +1,15 @@ +VITE_WEB_WALLET_VERSION=4.1.0 +VITE_NETWORK=mainnet +VITE_API_CONFIG=https://config.vite.net +VITE_SERVER=wss://node.vite.net/gvite/ws +VITE_PUSH_SERVER=wss://vitex.vite.net/websocket +VITE_DEX_SERVER=https://vitex.vite.net +VITE_CONNECT=wss://biforst.vite.net +VITE_REWARD_SERVER=https://vitex.vite.net +VITE_CROSSCHAIN_SERVER=https://crosschain.vite.net +VITE_GATEWAY=https://gateway.vite.net +VITE_ETH_SERVER=https://node.vite.net/eth/v3/caae2231051e46a1941f422df1fbcc94 +VITE_ETH_EXPLORER=https://ropsten.etherscan.io +VITE_CONTRACT_ADDRESS=0x1b793e49237758dbd8b752afc9eb4b329d5da016 +VITE_RECAPTCHA_TOKEN=6LdziZ0fAAAAADBzBnGli4Akjok0CoSJ388bRWtw +VITE_VIEW=https://mainnet.viteview.xyz diff --git a/.env.staging b/.env.staging new file mode 100644 index 000000000..af53a479c --- /dev/null +++ b/.env.staging @@ -0,0 +1,15 @@ +VITE_WEB_WALLET_VERSION=4.1.0 +VITE_NETWORK=testnet +VITE_API_CONFIG=https://config.vite.net +VITE_SERVER=wss://buidl.vite.net/gvite/ws +VITE_PUSH_SERVER=wss://buidl.vite.net/vitex/websocket +VITE_DEX_SERVER=https://buidl.vite.net/vitex +VITE_CONNECT=wss://biforst.vite.net +VITE_REWARD_SERVER=https://vitex.vite.net +VITE_CROSSCHAIN_SERVER=https://crosschain-test.vite.net +VITE_GATEWAY= +VITE_ETH_SERVER=https://ropsten.infura.io/http +VITE_ETH_EXPLORER=https://ropsten.etherscan.io +VITE_CONTRACT_ADDRESS=0x54b716345c14ba851f1b51dcc1491abee6ba8f44 +VITE_RECAPTCHA_TOKEN=6LdziZ0fAAAAADBzBnGli4Akjok0CoSJ388bRWtw +VITE_VIEW=https://budil.viteview.xyz diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 853ff3ace..000000000 --- a/.eslintignore +++ /dev/null @@ -1,11 +0,0 @@ -# /node_modules/* and /bower_components/* in the project root are ignored by default - -# Ignore built files except build/index.js -static/* -dist/* -distH5/* -distAPP/* -routes.js -charting_library.min.js -charting_library/* -staticPages/* \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index c3b79d5f0..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,148 +0,0 @@ -module.exports = { - "parser": "vue-eslint-parser", - "plugins": [ - 'typescript', - ], - "extends": [ - "eslint:recommended", - 'plugin:vue/essential' - ], - "env": { - "browser": true, - "commonjs": true, - "es6": true, - "node": true - }, - "parserOptions": { - "parser": "@typescript-eslint/parser", - "ecmaFeatures": { - "jsx": true - }, - "sourceType": "module" - }, - "globals": { - "TradingView": true, - "window": true, - "_hmt": true, - "viteWalletStorage": true, - "viteWalletI18n": true, - "DESKTOP": true, - "ipcRenderer": true, - "touchID": true, - "VITE_NODE_API": true - }, - "rules": { - "eqeqeq": "error", - "no-else-return": "error", - "no-labels": "error", - "no-return-assign": "error", - "no-multi-spaces": "error", - "no-param-reassign": "warn", - "indent": ["error", 4], - "linebreak-style": ["error", "unix"], - "quotes": ["error", "single"], - "semi": ["error", "always"], - "no-console": "off", - "no-useless-escape": "off", - "vue/html-indent": ["error", 4], - "no-debugger": "warn", - "array-bracket-spacing": ["error", "always", { - "singleValue": false, - "arraysInArrays": false - }], - "brace-style": "error", - "comma-dangle": ["error", "never"], - "comma-spacing": ["error", { - "before": false, - "after": true - }], - "comma-style": ["error", "last"], - "eol-last": ["error", "always"], - "func-call-spacing": ["error", "never"], - "function-paren-newline": ["error", "never"], - "key-spacing" : ["error", { - "beforeColon": false, - "afterColon": true, - "mode": "strict" - }], - "keyword-spacing": ["error", { - "before": true, - "after": true - }], - "lines-between-class-members": ["error", "always", { - "exceptAfterSingleLine": true - }], - "max-depth": ["error", 4], - "max-nested-callbacks": ["error", 3], - "max-statements-per-line": ["error", { - "max": 1 - }], - "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 3 }], - "no-lonely-if": "error", - "no-mixed-spaces-and-tabs": "error", - "no-multiple-empty-lines": "error", - "no-negated-condition": "error", - "no-tabs": "error", - "no-trailing-spaces": "error", - "no-unneeded-ternary": "error", - "no-whitespace-before-property": "error", - "nonblock-statement-body-position": ["error", "beside"], - "object-curly-newline": ["error", { - "multiline": true - }], - "object-curly-spacing": ["error", "always"], - "object-property-newline": ["error", { - "allowAllPropertiesOnSameLine": true - }], - "operator-linebreak": ["error", "before"], - "padded-blocks": ["error", "never"], - "padding-line-between-statements": ["error", - { "blankLine": "always", "prev": "block", "next": "*" }, - { "blankLine": "always", "prev": "directive", "next": "*" } - ], - "semi-style": ["error", "last"], - "space-before-blocks": "error", - "space-before-function-paren": ["error", { - "anonymous": "always", - "named": "never", - "asyncArrow": "always" - }], - "space-in-parens": ["error", "never"], - "space-infix-ops": "error", - "space-unary-ops": "error", - "spaced-comment": ["error", "always"], - "switch-colon-spacing": "error", - "template-tag-spacing": "error", - "arrow-body-style": ["error", "as-needed", { - "requireReturnForObjectLiteral": true - }], - "arrow-parens": ["error", "as-needed"], - "arrow-spacing": "error", - "constructor-super": "error", - "generator-star-spacing": ["error", { - "before": true, - "after": false - }], - "no-confusing-arrow": "warn", - "no-duplicate-imports": "error", - "no-useless-computed-key": "warn", - "no-useless-constructor": "warn", - "no-var": "error", - "no-useless-rename": "error", - "prefer-const": "warn", - "prefer-template": "error", - "rest-spread-spacing": ["error", "never"], - "yield-star-spacing": ["error", "before"], - "template-curly-spacing": ["error", "always"], - "@typescript-eslint/no-unused-vars": false, - "no-unused-vars": [1] - // "require-jsdoc": ["error", { - // "require": { - // "FunctionDeclaration": true, - // "MethodDefinition": true, - // "ClassDeclaration": true - // } - // }] - // "new-cap": ["error", { "capIsNew": true }] - } -}; \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 84ff03f21..4b0e712f1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,7 +27,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: ${{ github.event.inputs.branch }} @@ -36,27 +36,41 @@ jobs: id: nvm - name: Setup Node - uses: actions/setup-node@v2.1.2 + uses: actions/setup-node@v4 with: node-version: '${{ steps.nvm.outputs.NVMRC }}' - - - uses: bahmutov/npm-install@v1 + + - name: Cache node_modules + uses: actions/cache@v2 + with: + path: node_modules + key: ubuntu-node-v${{ steps.nvm.outputs.NVMRC }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package.json')) }} + + - name: Install Dependencies + if: steps.cache.outputs.cache-hit != 'true' + run: yarn # Runs a set of commands using the runners shell - name: Build run: | export DESKTOP_WALLET_VERSION=`curl -sL https://api.github.com/repos/vitelabs/vite-wallet/releases/latest | grep '"tag_name":' | cut -d'"' -f4` yarn run build:${{ github.event.inputs.environment }} + - name: Get Build Version if: ${{ github.event.inputs.environment == 'production' }} id: version run: echo "::set-output name=version::$(date +%Y%m%d%H%M)" + + - name: List dist + run: tree dist + - name: Log in to Docker Hub if: ${{ github.event.inputs.environment == 'production' }} uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Push to Docker Hub if: ${{ github.event.inputs.environment == 'production' }} uses: docker/build-push-action@v2 @@ -65,17 +79,16 @@ jobs: context: . file: Dockerfile tags: vitelabs/vite-web-wallet:${{ steps.version.outputs.version }},vitelabs/vite-web-wallet:latest - + - name: Deploy - uses: cloudflare/wrangler-action@1.3.0 + uses: cloudflare/wrangler-action@v3 with: apiToken: ${{ secrets.CF_API_TOKEN }} environment: ${{ github.event.inputs.environment }} - + - uses: Ilshidur/action-slack@2.0.2 env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} SLACK_AVATAR: repository with: args: 'Action called, Environment: ${{ github.event.inputs.environment }}, Branch: ${{ github.event.inputs.branch }}, Repository: {{ GITHUB_REPOSITORY }}' - diff --git a/.gitignore b/.gitignore index a7a228de8..5a089df40 100644 --- a/.gitignore +++ b/.gitignore @@ -3,13 +3,12 @@ node_modules dist distH5 distAPP -static !staticPages/**/static .eslintcache .idea .vscode +.wrangler viteJS -routes.js .netlify .yarnrc package-lock.json diff --git a/.nvmrc b/.nvmrc index af8df1f67..9a2a0e219 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v10 \ No newline at end of file +v20 diff --git a/build/config.gypi b/build/config.gypi deleted file mode 100644 index f99bc2c52..000000000 --- a/build/config.gypi +++ /dev/null @@ -1,69 +0,0 @@ -# Do not edit. File was generated by node-gyp's "configure" step -{ - "target_defaults": { - "cflags": [], - "default_configuration": "Release", - "defines": [], - "include_dirs": [], - "libraries": [] - }, - "variables": { - "asan": 0, - "build_v8_with_gn": "false", - "coverage": "false", - "debug_nghttp2": "false", - "force_dynamic_crt": 0, - "host_arch": "x64", - "icu_data_in": "../../deps/icu-small/source/data/in/icudt61l.dat", - "icu_endianness": "l", - "icu_gyp_path": "tools/icu/icu-generic.gyp", - "icu_locales": "en,root", - "icu_path": "deps/icu-small", - "icu_small": "true", - "icu_ver_major": "61", - "llvm_version": "0", - "node_byteorder": "little", - "node_debug_lib": "false", - "node_enable_d8": "false", - "node_enable_v8_vtunejit": "false", - "node_install_npm": "true", - "node_module_version": 64, - "node_no_browser_globals": "false", - "node_prefix": "/", - "node_release_urlbase": "https://nodejs.org/download/release/", - "node_shared": "false", - "node_shared_cares": "false", - "node_shared_http_parser": "false", - "node_shared_libuv": "false", - "node_shared_nghttp2": "false", - "node_shared_openssl": "false", - "node_shared_zlib": "false", - "node_tag": "", - "node_target_type": "executable", - "node_use_bundled_v8": "true", - "node_use_dtrace": "true", - "node_use_etw": "false", - "node_use_openssl": "true", - "node_use_perfctr": "false", - "node_use_v8_platform": "true", - "node_without_node_options": "false", - "openssl_fips": "", - "openssl_no_asm": 0, - "shlib_suffix": "64.dylib", - "target_arch": "x64", - "v8_enable_gdbjit": 0, - "v8_enable_i18n_support": 1, - "v8_enable_inspector": 1, - "v8_no_strict_aliasing": 1, - "v8_optimized_debug": 0, - "v8_promise_internal_field_count": 1, - "v8_random_seed": 0, - "v8_trace_maps": 0, - "v8_typed_array_max_size_in_heap": 0, - "v8_use_snapshot": "true", - "want_separate_host_toolset": 0, - "xcode_version": "7.0", - "nodedir": "/Users/sisi/.node-gyp/10.5.0", - "standalone_static_library": 1 - } -} diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 000000000..824a99d7e --- /dev/null +++ b/global.d.ts @@ -0,0 +1,84 @@ +import Vue from 'vue'; +import 'vite/client'; + +declare global { + interface Window { + VITE_NODE_API: string; + touchID: any; + } +} + +declare type bnStr = string +declare type tokenId = string +declare type tokenSymbol = string + +declare interface HDAccount { + id: string; + lang: string; + name: string; + address: string; + status: number; + addrList: Array<{ + address: string, + id: string, + idx: number + }> + addrNum: number + activeAccount + + constructor({ id, lang, name, activeAddr, keystore, addrNum, activeIdx }: { + id: string, + keystore: string, + lang?: string, + name?: string, + activeAddr: string, + addrNum?: number, + activeIdx?: number + }) + + save(); + saveAcc(); + activate(); + freeze(); + saveOnAcc(key: string, info: any) + getAccInfo() + lock() + setActiveAcc(index?: number, address?: string) + unlock(params: any) +} + +declare module '*.vue' { + export default Vue; +} + +declare module '*.png' +declare module '*.svg' + +type Network = { + name: string; + rpcUrl: string; + explorerUrl?: string; +}; + +type injectedScriptEvents = 'accountChange' | 'networkChange'; +type VitePassport = { + // These methods are relayed from contentScript.ts => injectedScript.ts + getConnectedAddress: () => Promise; + disconnectWallet: () => Promise; + getNetwork: () => Promise; + + // These methods are relayed from contentScript.ts => background.ts => popup => contentScript.ts => injectedScript.ts + connectWallet: () => Promise<{ domain: string }>; + writeAccountBlock: (type: string, params: object) => Promise<{ block: AccountBlockBlock }>; + + // `on` subscribes to `event` and returns an unsubscribe function + on: ( + event: injectedScriptEvents, + callback: (payload: { activeAddress?: string; activeNetwork: Network }) => void + ) => () => void; +}; +declare global { + interface Window { + vitePassport?: VitePassport; + } +} \ No newline at end of file diff --git a/index.html b/index.html index 4fee8adb1..81acd59ba 100644 --- a/index.html +++ b/index.html @@ -18,9 +18,10 @@ name="keywords" content="vite, vitex, crypto,dag,bitcoin,vitecoin,contract platform, vitex exchange" /> - + - <%= htmlWebpackPlugin.options.title %> + Vite Wallet + @@ -60,7 +61,6 @@
- +
{{ content }}
@@ -34,7 +34,7 @@ diff --git a/srcPC/components/confirm/confirmRow.scss b/srcPC/components/confirm/confirmRow.scss index 16025322a..50e9bc5a0 100644 --- a/srcPC/components/confirm/confirmRow.scss +++ b/srcPC/components/confirm/confirmRow.scss @@ -1,4 +1,4 @@ -@import "~assets/scss/vars.scss"; +@use "@assets/scss/theme.scss" as *; @mixin input_color() { [data-theme="0"] & { @@ -146,7 +146,7 @@ width: 14px; height: 14px; border-radius: 14px; - background: url('~assets/imgs/notice.svg'); + background: url("@assets/imgs/notice.svg"); background-size: 100% 100%; margin-bottom: -2px; } diff --git a/srcPC/components/confirm/moreTabConfirm.scss b/srcPC/components/confirm/moreTabConfirm.scss index c9158c151..52d55972f 100644 --- a/srcPC/components/confirm/moreTabConfirm.scss +++ b/srcPC/components/confirm/moreTabConfirm.scss @@ -1,4 +1,4 @@ -@import "~assets/scss/vars.scss"; +@use "@assets/scss/theme.scss" as *; @mixin self_bg_color_2() { [data-theme="0"] & { diff --git a/srcPC/components/dialog/changePowUrl.vue b/srcPC/components/dialog/changePowUrl.vue index 648cd7aad..b07418397 100644 --- a/srcPC/components/dialog/changePowUrl.vue +++ b/srcPC/components/dialog/changePowUrl.vue @@ -1,5 +1,5 @@ diff --git a/srcPC/components/table/mintTrade.scss b/srcPC/components/table/mintTrade.scss index 2606e310b..e373ccb4a 100644 --- a/srcPC/components/table/mintTrade.scss +++ b/srcPC/components/table/mintTrade.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .mint-trade-table { .__tb_head{ height: 41px; diff --git a/srcPC/components/table/mintage.scss b/srcPC/components/table/mintage.scss index 81300d4bb..086072f5d 100644 --- a/srcPC/components/table/mintage.scss +++ b/srcPC/components/table/mintage.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .mintage-table { overflow: auto; diff --git a/srcPC/components/table/proxyTb.scss b/srcPC/components/table/proxyTb.scss index 6fc2f1a48..b0e441c8e 100644 --- a/srcPC/components/table/proxyTb.scss +++ b/srcPC/components/table/proxyTb.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .proxy-table { flex: 1; diff --git a/srcPC/components/table/smallStakingList.scss b/srcPC/components/table/smallStakingList.scss index 2b07ff100..d8e534bc0 100644 --- a/srcPC/components/table/smallStakingList.scss +++ b/srcPC/components/table/smallStakingList.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .mining-small-staking-list-table { min-width: 0px; flex: 1; diff --git a/srcPC/components/table/tradeList.scss b/srcPC/components/table/tradeList.scss index cd028b48f..2f1482c81 100644 --- a/srcPC/components/table/tradeList.scss +++ b/srcPC/components/table/tradeList.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .trade-list-table { min-width: 0px; flex: 1; diff --git a/srcPC/components/table/tradeOrderHistory.scss b/srcPC/components/table/tradeOrderHistory.scss index 12a045adc..c6ed7cb04 100644 --- a/srcPC/components/table/tradeOrderHistory.scss +++ b/srcPC/components/table/tradeOrderHistory.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .order-tab .trade-history-table { @include rowWith { &:first-child { diff --git a/srcPC/components/table/txPairManage.scss b/srcPC/components/table/txPairManage.scss index 3f005bffd..f8e1c51da 100644 --- a/srcPC/components/table/txPairManage.scss +++ b/srcPC/components/table/txPairManage.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .tx-pair-manage-table { @include rowWith { width: 15%; diff --git a/srcPC/components/table/vipList.scss b/srcPC/components/table/vipList.scss index 615b33de5..2cca59863 100644 --- a/srcPC/components/table/vipList.scss +++ b/srcPC/components/table/vipList.scss @@ -1,3 +1,5 @@ +@use "@pc/assets/scss/table.scss" as *; + .vip-list-table { width: 100%; min-width: 0; diff --git a/srcPC/components/table/walletQuota.scss b/srcPC/components/table/walletQuota.scss index 2a25915b3..9e8cb9e1b 100644 --- a/srcPC/components/table/walletQuota.scss +++ b/srcPC/components/table/walletQuota.scss @@ -1,3 +1,5 @@ +@use "@assets/scss/theme.scss" as *; + .wallet-quota-table { .addr { min-width: 240px; diff --git a/srcPC/components/table/walletSBP.scss b/srcPC/components/table/walletSBP.scss index 8644ebb91..327df06bc 100644 --- a/srcPC/components/table/walletSBP.scss +++ b/srcPC/components/table/walletSBP.scss @@ -1,3 +1,5 @@ +@use "@assets/scss/theme.scss" as *; + .wallet-sbp-table { .__tb_row.__tb_content_row.unuse { color: #ced1d5; diff --git a/srcPC/components/table/walletVote.scss b/srcPC/components/table/walletVote.scss index 8ac3a6ec1..17bf8d952 100644 --- a/srcPC/components/table/walletVote.scss +++ b/srcPC/components/table/walletVote.scss @@ -15,7 +15,7 @@ &.tipsicon { position: relative; display: inline-block; - background: url(~assets/imgs/hover_help.svg); + background: url(@assets/imgs/hover_help.svg); overflow: visible; width: 16px; height: 16px; diff --git a/srcPC/components/tabs/sbp.scss b/srcPC/components/tabs/sbp.scss index 7a0cb590b..c9ab1959e 100644 --- a/srcPC/components/tabs/sbp.scss +++ b/srcPC/components/tabs/sbp.scss @@ -1,3 +1,5 @@ +@use "@assets/scss/theme.scss" as *; + .tabs.sbp-edit-tabs { border-radius: 4px; .tabs__header { diff --git a/srcPC/components/tabs/tabs.vue b/srcPC/components/tabs/tabs.vue index 21815e7d1..1f4af00d9 100644 --- a/srcPC/components/tabs/tabs.vue +++ b/srcPC/components/tabs/tabs.vue @@ -32,5 +32,5 @@ export default { diff --git a/srcPC/components/testNotice.vue b/srcPC/components/testNotice.vue index 969d2f8c5..209060a9f 100644 --- a/srcPC/components/testNotice.vue +++ b/srcPC/components/testNotice.vue @@ -13,13 +13,13 @@ diff --git a/srcPC/pages/setting/gate.vue b/srcPC/pages/setting/gate.vue index 2b360fd5c..774cebe6d 100644 --- a/srcPC/pages/setting/gate.vue +++ b/srcPC/pages/setting/gate.vue @@ -19,7 +19,7 @@ diff --git a/srcPC/pages/setting/index.vue b/srcPC/pages/setting/index.vue index 2e346b681..bf9a6ccbe 100644 --- a/srcPC/pages/setting/index.vue +++ b/srcPC/pages/setting/index.vue @@ -30,17 +30,17 @@ diff --git a/srcPC/pages/setting/mnemonic.vue b/srcPC/pages/setting/mnemonic.vue index 26a32721c..18196faa5 100644 --- a/srcPC/pages/setting/mnemonic.vue +++ b/srcPC/pages/setting/mnemonic.vue @@ -13,8 +13,8 @@ diff --git a/srcPC/pages/start/create/index.vue b/srcPC/pages/start/create/index.vue index 97363f363..bb6700142 100644 --- a/srcPC/pages/start/create/index.vue +++ b/srcPC/pages/start/create/index.vue @@ -21,7 +21,7 @@
- {{ $t('startCreate.goLogin') }} + {{ $t('startCreate.goLogin') }} {{ $t('startCreate.goDex') }}
@@ -29,12 +29,12 @@ diff --git a/srcPC/pages/start/start.scss b/srcPC/pages/start/start.scss index 00b070594..320268de3 100644 --- a/srcPC/pages/start/start.scss +++ b/srcPC/pages/start/start.scss @@ -1,4 +1,4 @@ -@import "~assets/scss/vars.scss"; +@use "@assets/scss/theme.scss" as *; .__title { @include font-family-bold(); @@ -34,12 +34,14 @@ } .__btn_input { - background: #fff; - border-radius: 2px; + border-radius: 5px; + border: 1px solid #ccc; overflow: hidden; text-align: left; @include font-family-normal(); padding: 0 16px; + height: 40px; + line-height: 40px; input { width: 100%; height: 100%; @@ -80,4 +82,70 @@ .__btn_list .__btn { width: 48%; } +} + +.btn { + display: inline-flex; + justify-content: center; + align-items: center; + box-sizing: border-box; + border: 1px solid #fff; + border-radius: 12px; + height: 75px; + padding: 22px 40px; + @include font-family-normal(); + color: #fff; + font-size: 24px; + line-height: 1.5; + white-space: nowrap; + text-align: center; + &.active { + background: #fff; + color: #000; + box-shadow: 4px 4px 6px 0px rgba(0, 0, 0, 0.5); + } +} + +.box { + display: grid; + align-content: space-between; + height: 450px; +} + +.box-content { + position: relative; + width: 400px; + .box-title { + font-size: 32px; + font-weight: 300; + line-height: 1.5; + width: 420px; + margin-bottom: 12px; + } +} + +.box-footer { + display: grid; + grid-template-columns: 440px 1fr; + align-items: end; + column-gap: 40px; + p { + margin: 0; + font-size: 20px; + } + + a { + color: #00BEFF; + font-size: 20px; + } + + .btn { + box-shadow: none; + } + + .actions { + display: flex; + column-gap: 60px; + margin: 0 auto; + } } \ No newline at end of file diff --git a/srcPC/pages/trade/center/center.scss b/srcPC/pages/trade/center/center.scss index 676bff64a..522bb4359 100644 --- a/srcPC/pages/trade/center/center.scss +++ b/srcPC/pages/trade/center/center.scss @@ -1,4 +1,4 @@ -@import "~assets/scss/vars.scss"; +@use "@assets/scss/theme.scss" as *; @mixin center_color { [data-theme="0"] & { @@ -102,7 +102,7 @@ $up-font-color: $green; padding: 0; @include background_common_img_suffix('favorite-tab', 'svg', 'png'); &.active { - background: url('~assets/imgs/trade/favorite-active.svg') no-repeat center; + background: url("@assets/imgs/trade/favorite-active.svg") no-repeat center; } } } @@ -200,7 +200,7 @@ $up-font-color: $green; margin: 4px 0; @include background_common_img_suffix('favorite', 'svg', 'png'); &.active { - background: url('~assets/imgs/trade/favorite-active.svg') no-repeat center left; + background: url("@assets/imgs/trade/favorite-active.svg") no-repeat center left; } } .describe { diff --git a/srcPC/pages/trade/center/depth/depth.vue b/srcPC/pages/trade/center/depth/depth.vue index de1970fe1..60b80dd63 100644 --- a/srcPC/pages/trade/center/depth/depth.vue +++ b/srcPC/pages/trade/center/depth/depth.vue @@ -65,10 +65,10 @@ diff --git a/srcPC/pages/trade/center/market/txPairList.vue b/srcPC/pages/trade/center/market/txPairList.vue index 320f295fe..d65bc15c5 100644 --- a/srcPC/pages/trade/center/market/txPairList.vue +++ b/srcPC/pages/trade/center/market/txPairList.vue @@ -110,7 +110,7 @@ {{ txPair.closePrice @@ -152,17 +152,17 @@ diff --git a/srcPC/pages/trade/mining/invite/inviteTrade.vue b/srcPC/pages/trade/mining/invite/inviteTrade.vue index ea819f75a..a42789313 100644 --- a/srcPC/pages/trade/mining/invite/inviteTrade.vue +++ b/srcPC/pages/trade/mining/invite/inviteTrade.vue @@ -21,11 +21,11 @@ diff --git a/srcPC/pages/trade/mining/order.vue b/srcPC/pages/trade/mining/order.vue index 4f335b28a..de023c7d8 100644 --- a/srcPC/pages/trade/mining/order.vue +++ b/srcPC/pages/trade/mining/order.vue @@ -37,12 +37,12 @@ diff --git a/srcPC/pages/trade/openOrders/index.vue b/srcPC/pages/trade/openOrders/index.vue index 457d5768e..82189c909 100644 --- a/srcPC/pages/trade/openOrders/index.vue +++ b/srcPC/pages/trade/openOrders/index.vue @@ -11,10 +11,10 @@ diff --git a/srcPC/pages/trade/vip/vipConfirm.vue b/srcPC/pages/trade/vip/vipConfirm.vue index 51defb404..23bee9197 100644 --- a/srcPC/pages/trade/vip/vipConfirm.vue +++ b/srcPC/pages/trade/vip/vipConfirm.vue @@ -30,10 +30,10 @@ diff --git a/srcPC/pages/wallet/conversion/index.vue b/srcPC/pages/wallet/conversion/index.vue deleted file mode 100644 index 4ec1893e7..000000000 --- a/srcPC/pages/wallet/conversion/index.vue +++ /dev/null @@ -1,283 +0,0 @@ - - - - - diff --git a/srcPC/pages/wallet/conversion/token.vue b/srcPC/pages/wallet/conversion/token.vue deleted file mode 100644 index 6d2b832b0..000000000 --- a/srcPC/pages/wallet/conversion/token.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - diff --git a/srcPC/pages/wallet/conversion/transaction.vue b/srcPC/pages/wallet/conversion/transaction.vue deleted file mode 100644 index f873cf580..000000000 --- a/srcPC/pages/wallet/conversion/transaction.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - - diff --git a/srcPC/pages/wallet/form.scss b/srcPC/pages/wallet/form.scss index dc479728b..d94931390 100644 --- a/srcPC/pages/wallet/form.scss +++ b/srcPC/pages/wallet/form.scss @@ -1,3 +1,5 @@ +@use "@assets/scss/theme.scss" as *; + .__form_border { border-radius: 2px; @include bg_color_2(); diff --git a/srcPC/pages/wallet/fullNode/addQuotaForNode.vue b/srcPC/pages/wallet/fullNode/addQuotaForNode.vue index 1b0150fd7..343eeb92f 100644 --- a/srcPC/pages/wallet/fullNode/addQuotaForNode.vue +++ b/srcPC/pages/wallet/fullNode/addQuotaForNode.vue @@ -34,14 +34,14 @@