Merge pull request #174 from AElfProject/feature/url-change

Feature/url change

Author: hzz780

.eslintrc

@@ -10,12 +10,15 @@
         "extensions": [".js", ".jsx"]
       }
     ],
+    "no-unused-vars": 1,
     "react/prop-types": 0,
     "react/no-redundant-should-component-update": 0,
     "no-underscore-dangle": 0,
     "no-param-reassign": 0,
     "import/imports-first": ["error", "absolute-first"],
-    "import/newline-after-import": "error"
+    "import/newline-after-import": "error",
+    "react/jsx-props-no-spreading": 0,
+    "jsx-a11y/anchor-is-valid": 0
   },
   "globals": {
     "window": true,
@@ -25,5 +28,16 @@
     "FileReader": true,
     "Blob": true,
     "navigator": true
+  },
+  "settings": {
+    "import/resolver": {
+      "alias": {
+        "map": [
+          ["@", "./src/"],
+          ["@utils", "./src/utils"],
+          ["@actions", "./src/redux/actions"]
+        ]
+      }
+    }
   }
 }

package.json

@@ -32,6 +32,7 @@
     "apisauce": "^0.16.0",
     "axios": "^0.19.0",
     "bignumber.js": "^9.0.2",
+    "chalk": "^2.4.2",
     "classnames": "^2.2.6",
     "clsx": "^1.2.1",
     "copy-to-clipboard": "^3.2.0",
@@ -42,6 +43,8 @@
     "echarts": "4.5.0",
     "echarts-for-react": "^2.0.14",
     "eslint-config-prettier": "6.7.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "file-saver": "^2.0.2",
     "i18next": "^19.0.0",
@@ -112,7 +115,6 @@
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-loader": "^3.0.2",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.16.0",
     "eslint-plugin-react-hooks": "^4.6.0",

scripts/verify-commit-msg.js

@@ -0,0 +1,28 @@
+const chalk = require("chalk");
+
+const msgPath = process.env.HUSKY_GIT_PARAMS;
+const msg = require("fs").readFileSync(msgPath, "utf-8").trim();
+
+const commitRE =
+  /^(revert: )?(feat|security|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types|build)(\(.+\))?: .{1,50}/;
+
+if (!commitRE.test(msg)) {
+  console.log();
+  console.error(
+    `  ${chalk.bgRed.white(" ERROR ")} ${chalk.red(
+      `invalid commit message format.`
+    )}\n\n${chalk.red(
+      `  Proper commit message format is required for automated changelog generation. Examples:\n\n`
+    )}    ${chalk.green(`feat(wallet): add getContractAddress`)}\n` +
+      `    ${chalk.green(
+        `fix(contract): handle contract conflict (close #28)`
+      )}\n\n${chalk.red(
+        `  See .github/COMMIT_CONVENTION.md for more details.\n`
+      )}${chalk.red(
+        `  You can also use ${chalk.cyan(
+          `npm run commit`
+        )} to interactively generate a commit message.\n`
+      )}`
+  );
+  process.exit(1);
+}

src/api/url.js

@@ -7,5 +7,6 @@ export const VIEWER_GET_FILE = "/viewer/getFile"
 export const VIEWER_EVENT_LIST = "/viewer/eventList"
 export const VIEWER_GET_ALL_TOKENS = "/viewer/getAllTokens"
 export const VIEWER_TOKEN_TX_LIST = "/viewer/tokenTxList"
+export const VIEWER_TOKEN_ALL_TX_LIST = "/viewer/all/tokenTxList"
 
 export const TOKEN_PRICE = "/token/price"

src/assets/less/components.less

@@ -119,13 +119,13 @@
 }
 
 .ant-tag.unconfirmed {
-  width: 96px !important;
+  padding: 2px 8px 2px 18px !important;
   height: 24px !important;
   font-size: 12px !important;
   padding: 2px 8px 2px 18px !important;
   color: @sunset-orange !important;
   background: url("../../assets/images/bg_unconfirmed.png") no-repeat !important;
-  background-size: 96px 24px !important;
+  background-size: 179px 24px !important;
 }
 .ant-tag.confirmations {
   padding: 2px 8px 2px 18px !important;
@@ -176,7 +176,9 @@
     padding: 9px 16px;
     color: @scorpion;
   }
-  .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled) {
+  .ant-select-dropdown-menu-item:hover:not(
+      .ant-select-dropdown-menu-item-disabled
+    ) {
     background: #f6f7fa;
   }
   .ant-select-dropdown-menu-item-selected {
@@ -192,4 +194,4 @@
 
 .ant-select-item {
   color: @scorpion;
-}
+}

src/components/AddressLink/index.jsx

@@ -4,18 +4,15 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
-import config from "../../common/config";
+import addressFormat from "../../utils/addressFormat";
 
 const AddressLink = (props) => {
-  const { address, suffix } = props;
-
+  const { address: prefixAddress, suffix, hash } = props;
+  const address = addressFormat(prefixAddress) + (hash ?? "");
   return (
     <>
-      <Link
-        to={`/address/${address}`}
-        title={`ELF_${address}_${config.viewer.chainId}`}
-      >
-        {`ELF_${address}_${config.viewer.chainId}`}
+      <Link to={`/address/${address}`} title={`${address}`}>
+        {`${address}`}
       </Link>
       {suffix}
     </>