Merge pull request #317 from AElfProject/feature/refactor-2.0.0-Block…

…chain

feat: block detail jump

.env.development

@@ -1,6 +1,6 @@
 NEXT_PUBLIC_NETWORK_TYPE = 'TESTNET'
 NEXT_PUBLIC_CHAIN_ID = 'AELF'
 NEXT_PUBLIC_SYMBOL = 'ELF'
-NEXT_PUBLIC_API_URL = http://localhost:4000
+NEXT_PUBLIC_API_URL = https://aelfscan.io
 NEXT_PUBLIC_REMOTE_URL = http://localhost:3001
-NEXT_PUBLIC_CMS_URL = http://192.168.66.62:3200
+NEXT_PUBLIC_CMS_URL = https://explorer-cms.prod.aelf.dev

.env.test

@@ -3,4 +3,4 @@ NEXT_PUBLIC_CHAIN_ID = 'AELF'
 NEXT_PUBLIC_SYMBOL = 'ELF'
 NEXT_PUBLIC_API_URL = https://aelfscan.io
 NEXT_PUBLIC_REMOTE_URL = http://localhost:3001
-NEXT_PUBLIC_CMS_URL = http://192.168.66.62:3200
+NEXT_PUBLIC_CMS_URL = https://explorer-cms.prod.aelf.dev

src/_api/list.ts

@@ -9,7 +9,6 @@ import { RequestWithParams } from './server';
 
 const BASE_API = '/api'; // server local
 const SERVER_BASE_API = `${process.env.NEXT_PUBLIC_API_URL}/api`; // server
-
 const Block_API_List = {
   getBlockList: `${BASE_API}/app/blockchain/blocks`,
   getLatestBlocksList: `${BASE_API}/app/blockchain/latestBlocks`,

src/_api/server.ts

@@ -36,14 +36,18 @@ async function service(url: string, options: RequestWithParams) {
     }
   }
 
+  console.log(url, 'url-----------');
+
   try {
     const response = await fetch(url, options);
+
     if (response.ok) {
       return await response.json();
     } else {
       console.log(response.status);
     }
   } catch (error) {
+    console.log(error, 'r');
     // TODO: need to recover
     // return Promise.reject(error);
   }

src/app/[chain]/block/[hash]/_components/baseinfo.tsx

@@ -29,10 +29,10 @@ export default function BaseInfo({ data }) {
     (type: JumpTypes) => {
       switch (type) {
         case JumpTypes.Prev:
-          router.push(`/block/${data.preBlockHeight}`);
+          router.push(`/${data.chainId}/block/${data.preBlockHeight}`);
           break;
         case JumpTypes.Next:
-          router.push(`/block/${data.nextBlockHeight}`);
+          router.push(`/${data.chainId}/block/${data.nextBlockHeight}`);
       }
     },
     [data, router],

src/app/[chain]/block/[hash]/_components/detail.tsx

@@ -25,7 +25,6 @@ import { useAppSelector } from '@_store';
 import { useParams } from 'next/navigation';
 
 export default function Detail({ SSRData }) {
-  console.log(SSRData, 'SSRData');
   const { isMobile } = useMobileAll();
   const [detailData] = useState<IBlocksDetailData>(SSRData);
   const [showMore, setShowMore] = useState<boolean>(false);

src/app/[chain]/block/[hash]/page.tsx

@@ -10,5 +10,6 @@ import Detail from './_components/detail';
 import { TChainID } from '@_api/type';
 export default async function Block({ params }: { params: { hash: string; chain: TChainID } }) {
   const data = await fetchServerBlocksDetail({ blockHeight: Number(params.hash), chainId: params.chain });
+  console.log(data, 'data');
   return <Detail SSRData={data} />;
 }

src/app/[chain]/blocks/columnConfig.tsx

@@ -61,7 +61,9 @@ export default function getColumns({ timeFormat, handleTimeChange, chianId }): C
           <Link
             className="block text-xs leading-5 text-link"
             title={`${addressFormat(address, chianId)}`}
-            href={`${chianId}/address/${addressFormat(address, chianId)}`}>
+            href=""
+            // href={`${chianId}/address/${addressFormat(address, chianId)}`}
+          >
             {record.producerName ? record.producerName : `${addressFormat(hiddenAddress(address, 4, 4), chianId)}`}
           </Link>
           <Copy value={addressFormat(address, chianId)} />