diff --git a/server.ts b/server.ts index 70d2a4a..ef6f543 100644 --- a/server.ts +++ b/server.ts @@ -32,7 +32,7 @@ import { Request, Response, NextFunction } from "express"; import bodyParser from "body-parser"; //import { logger } from "./server/utils"; import swaggerJSDoc from "swagger-jsdoc"; -import { errorMiddleware } from "./server/middlewares"; +import { errorMiddleware, redisMiddleware } from "./server/middlewares"; import { getRepository, In, @@ -121,7 +121,7 @@ controllers.forEach(controller => { // Example Express Rest API endpoints import request from 'request-promise'; -app.get("/api", async (req, res) => { +app.get("/api", redisMiddleware('60'), async (req, res) => { try { let option = req.query.q; let blockDetails = await latestBlockDetails(); @@ -129,7 +129,9 @@ try { { let result; //500 if(option == "circulating") - result= blockDetails.coin_existence; + result= blockDetails.coin_existence * 100000000; + else if(option == "reward") + result= blockDetails.currentReward * 100000000; else if(option == "getblockcount") result= blockDetails.block_height; else if(option == "getdifficulty-randomx") @@ -139,7 +141,7 @@ try { else if(option == "getdifficulty-progpow") result = Number(blockDetails.TotalDifficultyProgpow); else if(option == "totalcoins") - result = 21000000; + result = 21000000 * 100000000; else if(option == "getblockhash") { let height = req.query.height; @@ -235,7 +237,7 @@ try { else { //let result= 5; - //window.redirect('/'); + res.redirect('/api-index'); } } @@ -318,9 +320,8 @@ console.log(__dirname); console.log(`Node Express server listening on http://localhost:${PORT}`); }); - cron.schedule('* * * * * *', () => { + cron.schedule('*/30 * * * * *', () => { universalGetLatestBlockDetails('Testnet'); - universalGetLatestBlockDetails('Floonet'); }); var interval; const io = require("socket.io").listen(server); diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts index 1b7f4ec..57aae6e 100644 --- a/server/controllers/BlockchainBlock.ts +++ b/server/controllers/BlockchainBlock.ts @@ -63,7 +63,7 @@ export class BlockchainBlockController { if (fee == 0) { return this.epic(0); } else if (fee < 1000) { - return (fee * 1000000) / 1000000000; + return fee / 1000000; } else { return this.milliEpic(parseFloat(fee) / 1000); } @@ -73,7 +73,7 @@ export class BlockchainBlockController { if (fee == 0) { return this.epic(0); } else if (fee < 1000) { - return (fee * 1000) / 1000000000; + return fee / 1000; } else { return this.epic(parseFloat(fee) / 1000); } @@ -1012,6 +1012,7 @@ export class BlockchainBlockController { // MaxPages, PageSize, }: BlockchainBlockPaginationDto = request.query; + if (parseInt(CurrentPage) == NaN) { next(new IntegerValidationException('CurrentPage')); } else if (parseInt(PageSize) == NaN) { @@ -1053,6 +1054,7 @@ export class BlockchainBlockController { 'blockchain_block.TotalDifficultyProgpow', 'blockchain_block.TotalDifficultyRandomx', 'blockchain_block.previous_id', + 'EXTRACT(EPOCH FROM (blockchain_block.timestamp - LAG(blockchain_block.timestamp) OVER (ORDER BY blockchain_block.timestamp))) as timetaken', 'blockchain_block.total_difficulty_cuckaroo - LAG(blockchain_block.total_difficulty_cuckaroo) OVER (ORDER BY blockchain_block.total_difficulty_cuckaroo) AS target_difficulty_cuckaroo', 'blockchain_block.total_difficulty_cuckatoo - LAG(blockchain_block.total_difficulty_cuckatoo) OVER (ORDER BY blockchain_block.total_difficulty_cuckatoo) AS target_difficulty_cuckatoo', 'blockchain_block.total_difficulty_progpow - LAG(blockchain_block.total_difficulty_progpow) OVER (ORDER BY blockchain_block.total_difficulty_progpow) AS target_difficulty_progpow', @@ -1075,14 +1077,14 @@ export class BlockchainBlockController { .leftJoin('blockchain_block.BlockchainKernels', 'blockchain_kernel') .leftJoin('blockchain_block.BlockchainOutputs', 'blockchain_output') .skip(PaginationReponseData.startIndex) - .take(PaginationReponseData.pageSize) + .take(PaginationReponseData.pageSize+1) .orderBy('blockchain_block.Timestamp', 'DESC') .groupBy('blockchain_block.Hash') .getRawAndEntities(); - //console.log(BlockchainBlockPaginationQuery.raw); let BlockchainBlockResult = BlockchainBlockPaginationQuery.raw; + BlockchainBlockResult.splice(-1,1); let lastElemt = BlockchainBlockResult[BlockchainBlockResult.length - 1]; const BlockchainPreviousBlockFetchQuery = await getConnection(Global.network).getRepository( @@ -1201,7 +1203,7 @@ export class BlockchainBlockController { var timeIntervalQry = "timestamp at time zone '" + process.env.TIME_ZONE + - "' > current_date - interval '1 day'"; + "' > current_date - interval '1 week'"; } const BlockQuery = await getConnection(Global.network) .query( diff --git a/server/global.ts b/server/global.ts index a1014f2..d148ebf 100644 --- a/server/global.ts +++ b/server/global.ts @@ -1,7 +1,7 @@ import * as redis from 'redis'; var REDIS_URL = process.env.REDIS_URL; export namespace Global { - export var network: string = 'Floonet'; + export var network: string = 'Testnet'; // connect to Redis export var client = redis.createClient(REDIS_URL); -} \ No newline at end of file +} diff --git a/server/i18n/de.json b/server/i18n/de.json index 581a87f..cc9bc2c 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -14,6 +14,7 @@ "avg-block-interval" : "Durchschnittliches Sperrintervall", "home": { "HEADER_TEXT": "Sie befinden sich in Beta", + "TIMETAKEN": "Genomen tijd (sec)", "COUNTDOWN": "Mainnet-Countdown", "EXPLORE_IT": "Entdecke", "VIEWALL": "Alle Diagramme anzeigen", @@ -83,5 +84,35 @@ "ADDR" : "Adr", "DIRECTION" : "Richtung", "SPENT" : "Verbraucht" + }, + "api-view": { + "query-api" : "Abfrage-API", + "query-api-line1" : "Die aufzurufende API-Funktion wird über den Parameter q angegeben.", + "query-api-line2" : "Zum Beispiel können Sie die Gesamtmünzen des epischen Bargeldes mit fragen ", + "circulating" : "Gibt die Anzahl der umlaufenden Münzen zurück", + "getblockcount":"Gibt die aktuelle Blockhöhe als reine Textzeichenfolge zurück", + "getdifficulty-randomx" : "Gibt die RandomX-Schwierigkeit als reine Textzeichenfolge zurück", + "getdifficulty-progpow" : "Gibt die Schwierigkeit ProgPow als reine Textzeichenfolge zurück", + "getdifficulty-cuckoo" : "returns the Cuckoo difficulty as a plain text string", + "totalcoins" : "Gibt die Cuckoo-Schwierigkeit als reine Textzeichenfolge zurück", + "Block-Queries": "Abfragen blockieren", + "real-time-simple-query" : "Einfache Echtzeitabfragen", + "block-query-text" : "Block-APIs berücksichtigen nur Blöcke in der 'Haupt'-Kette (wie in der Explorer-Brieftasche festgelegt).", + "getblockhash" : "Nimmt einen Höhenparameter und gibt den entsprechenden Block-Hash zurück", + "getblockheight" : "Nimmt einen Hash-Parameter und gibt die entsprechende Blockhöhe zurück.", + "getblocktime" : "Nimmt einen Höhenparameter und gibt die unixtime des Blocks zurück.", + "takes":"nimmt ein", + "Note" : "Hinweis", + "reward" : "Gibt die aktuelle Blockbelohnung zurück" + }, + "commit-id-view": { + "output-commit":"Output Commit", + "created-at-block":"Erstellt am Block", + "created-at":"Hergestellt in", + "output-type" : "Ausgabetyp", + "proof" : "Beweis", + "proof-hash" : "Beweis-Hash", + "merkle-proof" : "Merkle Beweis", + "mmr-index" : "MMR Index" } } diff --git a/server/i18n/en.json b/server/i18n/en.json index c5c53b6..8e13f88 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -1,6 +1,6 @@ { "difficulty" : "Difficulty", - "transactions-over-time" : "Transactions over time", + "transactions-over-time" : "Transactions over Time", "blocks-by-algorithm" : "Blocks by Algorithm", "blocks" : "Blocks", "transaction-fees" : "Average Transaction Fee", @@ -15,6 +15,7 @@ "home": { "HEADER_TEXT": "You are on Beta", "COUNTDOWN": "Mainnet Countdown", + "TIMETAKEN": "Time Taken (sec)", "EXPLORE_IT": "Explore", "VIEWALL": "View All Charts", "BLOCKCHAIN_HEIGHT": "Blockchain Height", @@ -42,7 +43,7 @@ "MINUTE" : "minute", "TOTAL_DIFFICULTY" : "Total Difficulty", "TARGET_DIFFICULTY" : "Target Difficulty", - "TRANSACTIONS_BY_TIME" : "Transactions over time", + "TRANSACTIONS_BY_TIME" : "Transactions over Time", "BLOCKS" : "Blocks", "BLOCKSINTERVAL" : "Block Interval", "SUPPLY_GROWTH_HOVER" : "Current Block Reward", @@ -61,7 +62,7 @@ "DAYS" : "days", "MONTHS" : "months", "WEEK" : "week", - "SEARCH_TEXT" : "Search by hash, or block height or output commit id", + "SEARCH_TEXT" : "Search by hash, or block height or output commit ID", "BLOCK_REWARD" : "Block Reward", "NOT_FOUND" : "Page Not Found", "NOT_FOUND1" : "Page you are looking for is not found", @@ -83,5 +84,35 @@ "ADDR" : "Addr", "DIRECTION" : "Direction", "SPENT" : "Spent" + }, + "api-view": { + "query-api" : "Query API", + "query-api-line1" : "The API function to call is specified through the q parameter.", + "query-api-line2" : "For instance you can ask the totalcoins of epic cash with ", + "circulating" : "returns the number of circulating coins", + "getblockcount":"returns the current block height as a plain text string", + "getdifficulty-randomx" : "returns the RandomX difficulty as a plain text string", + "getdifficulty-progpow" : "returns the ProgPow difficulty as a plain text string", + "getdifficulty-cuckoo" : "returns the Cuckoo difficulty as a plain text string", + "totalcoins" : "returns the outstanding number of coins", + "Block-Queries": "Block Queries", + "real-time-simple-query" : "Real-Time Simple Queries", + "block-query-text" : "Block APIs only consider blocks in the 'main' chain (as determined by the explorer wallet).", + "getblockhash" : " parameter and returns corresponding block hash.", + "getblockheight" : " parameter and returns corresponding block height.", + "getblocktime" : " parameter and returns unixtime of the block.", + "takes" : "takes a", + "Note" : "Note", + "reward" : "returns current block reward" + }, + "commit-id-view": { + "output-commit":"Output Commit", + "created-at-block":"Created at block", + "created-at":"Created At", + "output-type" : "Output Type", + "proof" : "Proof", + "proof-hash" : "Proof hash", + "merkle-proof" : "Merkle Proof", + "mmr-index" : "MMR Index" } } diff --git a/server/socket/block.ts b/server/socket/block.ts index 5e7f31a..dc808a9 100644 --- a/server/socket/block.ts +++ b/server/socket/block.ts @@ -316,6 +316,7 @@ export async function universalGetLatestBlockDetails(current_network) { 'blockchain_block.TotalDifficultyProgpow', 'blockchain_block.TotalDifficultyRandomx', 'blockchain_block.previous_id', + 'EXTRACT(EPOCH FROM (blockchain_block.timestamp - LAG(blockchain_block.timestamp) OVER (ORDER BY blockchain_block.timestamp))) as timetaken', 'blockchain_block.total_difficulty_cuckaroo - LAG(blockchain_block.total_difficulty_cuckaroo) OVER (ORDER BY blockchain_block.total_difficulty_cuckaroo) AS target_difficulty_cuckaroo', 'blockchain_block.total_difficulty_cuckatoo - LAG(blockchain_block.total_difficulty_cuckatoo) OVER (ORDER BY blockchain_block.total_difficulty_cuckatoo) AS target_difficulty_cuckatoo', 'blockchain_block.total_difficulty_progpow - LAG(blockchain_block.total_difficulty_progpow) OVER (ORDER BY blockchain_block.total_difficulty_progpow) AS target_difficulty_progpow', diff --git a/server/utils/common.ts b/server/utils/common.ts index 7120389..16cd5e4 100644 --- a/server/utils/common.ts +++ b/server/utils/common.ts @@ -324,13 +324,23 @@ async function Details (height) { async function GetBlocktime(height){ if(height){ + // const BlockchainLatestBlockQuery3 = await getConnection(Global.network) + // .query( + // "SELECT coalesce(max(bb.alter), 0) as alter FROM (SELECT EXTRACT(EPOCH FROM (timestamp - LAG(timestamp) OVER (ORDER BY timestamp))) AS alter FROM blockchain_block where height="+height+" OR height="+(height-1)+") as bb", + // ) + // .catch(err_msg => { + // return(err_msg); + // }); + const BlockchainLatestBlockQuery3 = await getConnection(Global.network) .query( - "SELECT coalesce(max(bb.alter), 0) as alter FROM (SELECT EXTRACT(EPOCH FROM (timestamp - LAG(timestamp) OVER (ORDER BY timestamp))) AS alter FROM blockchain_block where height="+height+" OR height="+(height-1)+") as bb", + "SELECT extract(epoch from timestamp at time zone '" +process.env.TIME_ZONE+ "') AS alter FROM blockchain_block where height="+height, ) .catch(err_msg => { return(err_msg); }); + + return BlockchainLatestBlockQuery3; } } diff --git a/src/app/shared/components/footer/footer.component.html b/src/app/shared/components/footer/footer.component.html index aee28de..da2cf45 100644 --- a/src/app/shared/components/footer/footer.component.html +++ b/src/app/shared/components/footer/footer.component.html @@ -27,7 +27,7 @@
- API + API
diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index aa79d48..1ab663d 100755 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -1,11 +1,11 @@
Epic Cash - API + API You are viewing - - + @@ -48,9 +48,9 @@ -->
  • Epic Cash - API + API You are viewing - diff --git a/src/app/shared/components/siteheader/siteheader.component.html b/src/app/shared/components/siteheader/siteheader.component.html index 43bd87f..33d2b92 100644 --- a/src/app/shared/components/siteheader/siteheader.component.html +++ b/src/app/shared/components/siteheader/siteheader.component.html @@ -16,7 +16,7 @@
    You are viewing - @@ -75,7 +75,7 @@
    You are viewing - diff --git a/src/app/view/api-view/api-view.component.html b/src/app/view/api-view/api-view.component.html index 634a719..f6c6a86 100644 --- a/src/app/view/api-view/api-view.component.html +++ b/src/app/view/api-view/api-view.component.html @@ -1,29 +1,35 @@
    -
    -

    Query API

    +
    +

    {{'api-view.query-api' | translate}}

    -

    - The API function to call is specified through the q parameter.
    - For instance you can ask the totalcoins of epic cash with "https://explorer.epic.tech/api?q=totalcoins". +

    + {{'api-view.query-api-line1' | translate}} q parameter.
    + {{'api-view.query-api-line2' | translate}} "https://explorer.epic.tech/api?q=totalcoins".

    -

    Real-Time Simple Queries

    -
      -
    • circulating: returns the number of circulating coins
      • -
    • getblockcount: returns the current block height as a plain text string
      • -
    • getdifficulty-randomx: returns the RandomX difficulty as a plain text string
      • -
    • getdifficulty-progpow: returns the ProgPow difficulty as a plain text string
      • -
    • getdifficulty-cuckoo: returns the Cuckoo difficulty as a plain text string
      • -
    • totalcoins: returns the outstanding number of coins
      • +

      {{'api-view.real-time-simple-query' | translate}}

      + -

      Block Queries

      -

      - Block APIs only consider blocks in the "main" chain (as determined by the explorer wallet). +

      {{'api-view.Block-Queries' | translate}}

      +

      + {{'api-view.block-query-text' | translate}}

      -
        -
      • getblockhash: takes a height parameter and returns corresponding block hash.
        • -
      • getblockheight: takes a hash parameter and returns corresponding block height.
        • -
      • getblocktime: takes a height parameter and returns unixtime of the block.
        • +
          +
        • getblockhash: takes a height {{'api-view.getblockhash' | translate}}
          • +
        • getblockheight: takes a hash {{'api-view.getblockheight' | translate}}
          • +
        • getblocktime: takes a height {{'api-view.getblocktime' | translate}}
    +
    +

    {{'api-view.Note' | translate}}

    + + If you require another API, please request it by sending an email to {{email}} +
    diff --git a/src/app/view/api-view/api-view.component.ts b/src/app/view/api-view/api-view.component.ts index 97ac34f..0d81cc4 100644 --- a/src/app/view/api-view/api-view.component.ts +++ b/src/app/view/api-view/api-view.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { environment } from "../../../environments/environment"; @Component({ selector: 'app-api-view', @@ -8,6 +9,9 @@ import { Component, OnInit } from '@angular/core'; export class ApiViewComponent implements OnInit { constructor() { } + + public email:string = environment.EMAIL; + public angerstring:string ="mailto:"+ environment.EMAIL +"?subject = API-Request&body = Message"; ngOnInit() { } diff --git a/src/app/view/block-view/block-detail/block-detail.component.html b/src/app/view/block-view/block-detail/block-detail.component.html index d94a635..306461f 100644 --- a/src/app/view/block-view/block-detail/block-detail.component.html +++ b/src/app/view/block-view/block-detail/block-detail.component.html @@ -291,50 +291,50 @@
    -

      Output Commit

    +

      {{'commit-id-view.output-commit' | translate}}

    - + - + - + - + - + - + - + diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.ts b/src/app/view/graph-view/graph-detail/graph-detail.component.ts index 88ca5a6..fb198f2 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.ts +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.ts @@ -22,7 +22,7 @@ export class GraphDetailComponent implements OnInit { public title: any; public chartType : any = []; public selectedItem: Number = 3; - public selectedItem8: Number = 2; + public selectedItem8: Number = 1; public selectedItem12: Number = 4; public Type: any = ''; public selectedTarget: Number = 3; @@ -63,8 +63,8 @@ export class GraphDetailComponent implements OnInit { this.hashdata = this.comp.linearTotalGraphData; console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData); this.hashdata.layout.height = 300; - this.hashdata.layout.xaxis.domain = [0.1,0.9]; - this.hashdata.layout.yaxis2.position = 2.25; + //this.hashdata.layout.xaxis.domain = [0.1,0.9]; + //this.hashdata.layout.yaxis2.position = 1.25; this.title = 'Total Difficulty'; this.selectedItem = 6; this.titleService.setTitle( @@ -77,12 +77,12 @@ export class GraphDetailComponent implements OnInit { // this.totalDifficultyreq(); this.comp.Difficultyreq('target').then(res => { this.hashdata = this.comp.linearGraphData; - console.log('this.comp.linearGraphData',this.comp.linearGraphData); - this.hashdata.layout.height = 300; - this.hashdata.layout.xaxis.domain = [0.1,0.9]; - this.hashdata.layout.yaxis2.position = 2.25; + // console.log('this.comp.linearGraphData',this.comp.linearGraphData); + // this.hashdata.layout.height = 300; + // this.hashdata.layout.xaxis.domain = [0.1,0.9]; + // this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Target Difficulty'; - this.selectedItem = 6; + // this.selectedItem = 6; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -241,18 +241,21 @@ export class GraphDetailComponent implements OnInit { case 'target-difficulty': this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => { this.hashdata = this.comp.linearGraphData; - this.hashdata.layout.height = 300; - this.hashdata.layout.xaxis.domain = [0.1,0.9]; - this.hashdata.layout.yaxis2.position = 2.25; + // this.hashdata.layout.height = 300; + // this.hashdata.layout.xaxis.domain = [0.1,0.9]; + // this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Target Difficulty'; }); break; case 'total-difficulty': this.comp.Difficultyreq('total',p1, p2, p3, p4).then(res => { this.hashdata = this.comp.linearTotalGraphData; - this.hashdata.layout.height = 300; - this.hashdata.layout.xaxis.domain = [0.1,0.9]; - this.hashdata.layout.yaxis2.position = 2.25; + // this.hashdata.layout.height = 300; + // this.hashdata.layout.xaxis.domain = [0.9, 0.9]; + // this.hashdata.layout.yaxis.automargin= true; + // this.hashdata.layout.yaxis1.automargin= true; + // this.hashdata.layout.yaxis2.automargin= true; + // this.hashdata.layout.yaxis2.position = 0.0; this.title = 'Total Difficulty'; }); break; diff --git a/src/app/view/home/block-append/block-append.component.html b/src/app/view/home/block-append/block-append.component.html index 319b2eb..653c8dd 100644 --- a/src/app/view/home/block-append/block-append.component.html +++ b/src/app/view/home/block-append/block-append.component.html @@ -17,6 +17,9 @@
    Age
    {{ blockdetails.age }}
    +
    +
    Time Taken(Sec)
    {{ blockdetails.timetaken }}
    +
    Difficulty
    {{(blockdetails.PoWAlgo == 'Cuckoo') ? (blockdetails.target_difficulty_cuckatoo | number) : (blockdetails.PoWAlgo == 'RandomX') ? (blockdetails.target_difficulty_randomx | number) : (blockdetails.PoWAlgo == 'ProgPow') ? (blockdetails.target_difficulty_progpow | number) : 0}}
    diff --git a/src/app/view/home/block-detail-list/block-detail-list.component.ts b/src/app/view/home/block-detail-list/block-detail-list.component.ts index 2b9c28e..a574ca0 100644 --- a/src/app/view/home/block-detail-list/block-detail-list.component.ts +++ b/src/app/view/home/block-detail-list/block-detail-list.component.ts @@ -66,7 +66,7 @@ export class BlockDetailListComponent implements OnInit { if (res["status"] == 200) { // var hasharray = res.response; this.latestblockdetail = res.response; - setInterval(() => this.incrementseconds(), 1000); + // setInterval(() => this.incrementseconds(), 1000); this.latestblockdetail["blink"] = false; resolve(); } diff --git a/src/app/view/home/graph-list/graph-list.component.html b/src/app/view/home/graph-list/graph-list.component.html index 327a793..04b3843 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -215,7 +215,7 @@

    {{'home.TRANSACTION_FEES' | translate}}

    - {{this.fg_last |number}} +
    700) + { + position = 0.10; + angle = 0; + domain_start = 0.18; + left_margin = 5; + } + else + { + position = 0.03; + angle = -45; + domain_start = 0.23; + left_margin = 25; + } + // console.log('range rangerangerange',range); this.linearGraphData = { data: data, @@ -621,17 +642,24 @@ export class GraphListComponent implements OnInit { xaxis: { tickangle: -45, tickformat: tickformat, - fixedrange: true, + // fixedrange: true, rangemode: 'nonnegative', - domain: [0.2, 0.8] - // showgrid: true + domain: [domain_start, 0.9], + // showgrid: true + tickfont: { + size: 12 + } }, yaxis: { title: 'Cuckoo', fixedrange: true, rangemode: 'nonnegative', // showgrid: true, - range: range1 + range: range1, + tickangle: angle, + tickfont: { + size: 12 + } }, yaxis2: { title: 'Progpow', @@ -640,8 +668,12 @@ export class GraphListComponent implements OnInit { range: range3, overlaying: 'y', rangemode: 'nonnegative', - side: 'left', - position: 1.25 + // side: 'left', + position: position, + tickangle: angle, + tickfont: { + size: 12 + } }, yaxis3: { title: 'RandomX', @@ -651,12 +683,17 @@ export class GraphListComponent implements OnInit { anchor: 'x', overlaying: 'y', rangemode: 'nonnegative', - side: 'right' + side: 'right', + position: 0.00 , + tickangle: angle, + tickfont: { + size: 12 + } }, margin: { - l: 50, - r: 50, + l: left_margin, + r: 5, b: 50, t: 50, }, @@ -742,7 +779,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -783,7 +820,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -835,7 +872,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -882,7 +919,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -915,17 +952,24 @@ export class GraphListComponent implements OnInit { tickformat: '%m-%d', rangemode: 'nonnegative', fixedrange: true, - showgrid: true, + showgrid: true, + tickfont: { + size: 13 + } }, yaxis: { title: 'Tx Fee', rangemode: 'nonnegative', fixedrange: true, - showgrid: true, + // showgrid: true, + tickangle: -45, + tickfont: { + size: 13 + } }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -978,7 +1022,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -1023,7 +1067,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -1109,7 +1153,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -1134,11 +1178,11 @@ export class GraphListComponent implements OnInit { [0.2222222222222222, "rgb(44,187,232)"], [0.3333333333333333, "rgb(97,211,254)"], [0.4444444444444444, "rgb(72,220,107)"], - [0.5555555555555556, "rgb(255,72,102)"], - [0.6666666666666666, "rgb(254,85,51)"], - [0.7777777777777778, "rgb(255,166,0)"], - [0.8888888888888888, "rgb(255,209,0)"], - [1.0, "rgb(255,209,0)"]], + [0.5555555555555556, "rgb(255,209,0)"], + [0.6666666666666666, "rgb(255,166,0)"], + [0.7777777777777778, "rgb(255,72,102)"], + [0.8888888888888888, "rgb(254,85,51)"], + [1.0, "rgb(254,85,51)"]], //colors : colorRamp(c("red", "green")), type: 'heatmap', visible: true, @@ -1161,7 +1205,7 @@ export class GraphListComponent implements OnInit { tickangle: screen.width < 767 ? '-90' : 360, side: 'top', autotick: false, - showgrid: true, + showgrid: false, rangemode: 'nonnegative', fixedrange: true, autosize: true, @@ -1171,7 +1215,7 @@ export class GraphListComponent implements OnInit { ticksuffix: ' ', tickformat: '%m-%d', autosize: true, - showgrid: true, + showgrid: false, autotick: false, rangemode: 'nonnegative', fixedrange: true, @@ -1246,7 +1290,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -1301,7 +1345,7 @@ export class GraphListComponent implements OnInit { }, margin: { l: 50, - r: 50, + r: 10, b: 50, t: 50, }, @@ -1311,6 +1355,28 @@ export class GraphListComponent implements OnInit { }; } totaldifficultyChartFunc(DifficultychartDate, data, type, range1, range2, range3, tickformat) { + let window_width = window.screen.width; + let position = 0.00; + let angle = 0; + let domain_start = 0; + let left_margin = 5; + let tick_size = 11; + if(window_width > 700) + { + position = 0.10; + angle = 0; + domain_start = 0.18; + left_margin = 5; + tick_size = 12; + } + else + { + position = 0.17; + angle = -45; + domain_start = 0.34; + left_margin = 5; + tick_size = 10; + } this.linearTotalGraphData = { data: data, layout: { @@ -1321,28 +1387,37 @@ export class GraphListComponent implements OnInit { legend: {"orientation": "h", x: 0.1, y: -0.5,font :{ 'size': 10}}, xaxis: { - tickangle: -45, + tickangle: -40, tickformat: tickformat, - fixedrange: true, - domain: [0.2, 0.8] + // fixedrange: true, + domain: [domain_start, 0.9] // showgrid: true }, yaxis: { title: 'Cuckoo', fixedrange: true, rangemode: 'nonnegative', - // showgrid: true, + // position: 0.33, range: range1, + tickangle: angle, + tickfont: { + size: 12 + } }, yaxis2: { title: 'Progpow', fixedrange: true, // showgrid: true, range: range3, + // overlaying: 'y', overlaying: 'y', rangemode: 'nonnegative', - side: 'left', - position: 1.25 + // side: 'right', + position: position , + tickangle: angle, + tickfont: { + size: tick_size + } }, yaxis3: { title: 'RandomX', @@ -1352,12 +1427,17 @@ export class GraphListComponent implements OnInit { rangemode: 'nonnegative', anchor: 'x', overlaying: 'y', - side: 'right' + side: 'right', + position: 0.00 , + tickangle: angle, + tickfont: { + size: 12 + } }, margin: { - l: 50, - r: 50, + l: left_margin, + r: 5, b: 50, t: 50, }, diff --git a/src/app/view/home/latestblocks/latestblocks.component.html b/src/app/view/home/latestblocks/latestblocks.component.html index a78c301..45c4ab5 100644 --- a/src/app/view/home/latestblocks/latestblocks.component.html +++ b/src/app/view/home/latestblocks/latestblocks.component.html @@ -18,8 +18,13 @@
    {{'home.AGE' | translate}}
    -
    +
    +
    {{'home.TIMETAKEN' | translate}}
    +
    +
    +
    +
    {{'home.TARGET_DIFFICULTY' | translate}}
    @@ -29,17 +34,17 @@
    -
    +
    #{{'home.INPUTS' | translate}}
    -
    +
    #{{'home.OUTPUTS' | translate}}
    -
    +
    #{{'home.KERNELS' | translate}}
    @@ -51,8 +56,8 @@ id="hash_{{hashvalue.blockchain_block_height}}" #item >
    -
    -
    +
    Age{{ hashvalue.age }}
    +
    +
    +
    Time Taken
    {{ hashvalue.timetaken }} +
    +
    -
    +
    Difficulty
    {{(hashvalue.powalgo == 'Cuckoo') ? (hashvalue.target_difficulty_cuckatoo | number) : (hashvalue.powalgo == 'RandomX') ? (hashvalue.target_difficulty_randomx | number) : (hashvalue.powalgo == 'ProgPow') ? (hashvalue.target_difficulty_progpow | number) : 0}}
    @@ -87,17 +97,17 @@
    -
    +
    #{{'home.INPUTS' | translate}}
    {{ hashvalue.input_count }}
    -
    +
    #{{'home.OUTPUTS' | translate}}
    {{ hashvalue.output_count }}
    -
    +
    #{{'home.KERNELS' | translate}}
    {{ hashvalue.kernal_count }}
    @@ -164,7 +174,7 @@

    Peers - {{ + {{ peers.length | number }}

    @@ -172,34 +182,34 @@
    -
    -
    +
    +
    Capabilities
    -
    +
    User Agent
    -
    +
    Version
    -
    -
    +
    +
    Addr
    -
    -
    +
    +
    Direction
    -
    -
    +
    +
    Total Difficulty
    @@ -254,7 +264,7 @@
    -
    +
    User Agent
    {{ peer.user_agent }}
    @@ -266,13 +276,13 @@
    -
    +
    Addr
    {{ peer.addr }}
    -
    +
    Direction
    {{ peer.direction }}
    diff --git a/src/app/view/home/latestblocks/latestblocks.component.ts b/src/app/view/home/latestblocks/latestblocks.component.ts index 4f44da2..fc4b32a 100644 --- a/src/app/view/home/latestblocks/latestblocks.component.ts +++ b/src/app/view/home/latestblocks/latestblocks.component.ts @@ -122,6 +122,7 @@ export class LatestblocksComponent implements OnInit { //this.blockAppend['target_difficulty'] = 0; this.blockAppend['PoWAlgo'] = DifferentList.powalgo; this.blockAppend['input_count'] = DifferentList.input_count; + this.blockAppend['timetaken'] = DifferentList.timetaken; this.blockAppend['output_count'] = DifferentList.output_count; this.blockAppend['kernal_count'] = DifferentList.kernal_count; this.blockAppend['hashstart'] = DifferentList.hashstart; diff --git a/src/app/view/view-routing.module.ts b/src/app/view/view-routing.module.ts index 6f47895..d28ad6d 100755 --- a/src/app/view/view-routing.module.ts +++ b/src/app/view/view-routing.module.ts @@ -36,7 +36,7 @@ const siteRoutes: Routes = [ }, }, { - path: 'api-view', + path: 'api-index', component: ApiViewComponent } ]; diff --git a/src/assets/css/responsive.css b/src/assets/css/responsive.css index ab2a01c..0e1e7b1 100644 --- a/src/assets/css/responsive.css +++ b/src/assets/css/responsive.css @@ -1,17 +1,25 @@ @media(min-width: 992px){ - .block_div {min-width: 136px; text-align: center;padding: .75rem; } - .peer_table .block_div{min-width: 148px; text-align: center;} + .block_div {min-width: 110px; text-align: center;padding: .75rem; } + /* .block_div.inp_div{min-width: 100px;} */ + .block_div.targ_div{min-width: 200px;} + .block_div.targ_div_hdng{min-width: 180px; text-align: left;padding-left: 30px;} + .block_div.addr_div{min-width: 150px;} + .block_div.addr_hdng{min-width: 140px;} + .block_div.peers_diff_hdng{min-width: 375px;} + .peer_table .block_div{/*min-width: 148px;*/ text-align: center;} .mobile_table{border-bottom: 1px solid #dee2e6; padding: 0 15px;display: table; width: 100%;} .view_moble_tble{border-bottom: 1px solid #dee2e6;} - .mobile_table .row{display: table;} -.mobile_table .tble_col{padding: 0;display: table-cell; max-width: unset; flex: unset;} + .mobile_table .row, .row.peer_table_data{display: table;} +.mobile_table .tble_col, .peer_table_data .col-md-3{padding: 0;display: table-cell; max-width: unset; flex: unset; width: auto;} .mobile_table h6, .view_moble_tble h6, .peer_mobile_table h6{display: none;} .view_moble_tble .block_div{text-align: left;} -.peer_table_data .col-md-3 { flex: 0 0 13%; max-width: 13%;} +/* .peer_table_data .col-md-3 { flex: 0 0 13%; max-width: 13%;} */ .peer_table{ margin-left: -20px; border-bottom: none} .peer_table .tble_col{display: inline-block;} /* .ver_col .block_div{min-width: 10px;max-width: 15px;} */ .block_div.peers_diff{ min-width: 368px; } +.block_div.agent_div{min-width: 115px;} +.block_div.dir_div{min-width: 125px;} } @media(max-width: 1199px){ @@ -25,9 +33,11 @@ .detail_div .count span{font-size: 14px;} .chart_heading{font-size: 18px;} .day_filter a{font-size: 11px; margin: 0 4px;} - .blck_value {font-size: 13px; } - .block_div {min-width: 110px;} - .peer_table .block_div {min-width: 145px;} + .blck_value {font-size: 12px; } + .block_div {min-width: 87px;} + .peer_table_data .block_div {min-width: 105px;} + .block_div.addr_hdng{min-width: 120px;} + .hash{height: 8px; width: 3px;} .txn_peers{margin-top: 0px;} } @@ -52,8 +62,10 @@ .mobile_table span.blck_value, .view_moble_tble span.blck_value, .peer_mobile_table span.blck_value{font-size: 13px;} .mobile_table span.blck_value::before, .view_moble_tble span.blck_value::before, .peer_mobile_table span.blck_value::before{content: ' - ';} .view_moble_tble{border-bottom: 1px solid #dee2e6;padding-bottom: 10px; margin-bottom: 10px;} - .expnd_blck {font-size: 13px; margin-right: 5px; color: green;position: absolute; left: -15px; top: 5px; display: inline-block;} + .expnd_blck {font-size: 13px; margin-right: 5px; color: green;position: absolute; left: -8px; top: 5px; display: inline-block;} + .mble_hght{padding-left: 8px;} .peer_mobile_table .expnd_blck{left: -8px;} + } @media(max-width:767px){ .day_filter a{margin: 0 4px; font-size: 11px;} @@ -69,10 +81,12 @@ .ytitle, .y2tick, .y3tick, .ytick, .y2title, .y3title, .xtitle, .xtick{font-size: 11px !important} .chart_section.mt-4{margin-top: 0px !important;} .logo_img{height: 50px;} - .ngx-pagination li{display: none;} - .ngx-pagination li.pagination-previous{display: inline-block;} - .ngx-pagination li.pagination-next{display: inline-block;} + .ngx-pagination li{display: none !important;} + .ngx-pagination li.pagination-previous{display: inline-block !important;} + .ngx-pagination li.pagination-next{display: inline-block !important;} .hashdata_table td{border: 1px solid #a6a6a6;} + .body_bg.py-4{padding-top: 0px !important} + .block_details.mb-5{margin-bottom: 0px !important} } @media(max-width: 575px){ diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 242af2a..cfc38b3 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -137,7 +137,7 @@ a:focus { color: #BF9B30; } .txt_secondary { - color: #333333; + color: #a6a6a6; } .gray_txt { color: #555555; @@ -242,7 +242,7 @@ a:focus { color: #f3f4f2; padding: 4px 18px 2px; /* display: inline-block; */ - margin-left: 5px; + margin-left: 10px; position: relative; z-index: 1; float: right; @@ -250,6 +250,7 @@ a:focus { border: 1px solid #BF9B30; transition: all 0.3s linear; } +.txn_peers{margin-top: 2px;} .blocks:hover .txn_count { background: #f3f4f2; color: #BF9B30; @@ -391,7 +392,7 @@ a:focus { .zerolinelayer path { stroke: #a6a6a6 !important; } -.text_break{white-space: normal; word-break: break-all;} +.text_break{white-space: normal !important; word-break: break-all;} /************************************************Footer*****************************************/ .footer_div { border-top: 1px solid rgba(0, 0, 0, 0.15); @@ -480,8 +481,8 @@ a:focus { background: #dadada; } .expnd_blck{display: none;} -.block_div h5{color: #555;font-size: 16px;} -.blck_value{font-size: 15px;} +.block_div h5{color: #555;font-size: 13px;} +.blck_value{font-size: 12px;} .tab_hdng{ display: block; position: relative; diff --git a/src/index.html b/src/index.html index aa505d9..01f7403 100644 --- a/src/index.html +++ b/src/index.html @@ -10,7 +10,7 @@ --> - +
    Created at block {{'commit-id-view.created-at-block' | translate}} -

    Created at block

    +

    {{'commit-id-view.created-at-block' | translate}}

    {{ hashdata.BlockchainBlockFetchQuery.Height }}
    Created At {{'commit-id-view.created-at' | translate}} -

    Created At

    +

    {{'commit-id-view.created-at' | translate}}

    {{ hashdata.BlockchainBlockFetchQuery.Timestamp }}
    Output Type{{'commit-id-view.output-type' | translate}} -

    Output Type

    +

    {{'commit-id-view.output-type' | translate}}

    {{ hashdata.BlockchainBlockOutputFetchQuery[0].OutputType }}
    Proof{{'commit-id-view.proof' | translate}} -

    Proof

    +

    {{'commit-id-view.proof' | translate}}

    {{ hashdata.BlockchainBlockOutputFetchQuery[0].Proof }}
    Proof hash{{'commit-id-view.proof-hash' | translate}} -

    Proof hash

    +

    {{'commit-id-view.proof-hash' | translate}}

    {{ hashdata.BlockchainBlockOutputFetchQuery[0].ProofHash }}
    Merkle Proof{{'commit-id-view.merkle-proof' | translate}} -

    Merkle Proof

    +

    {{'commit-id-view.merkle-proof' | translate}}

    {{ hashdata.BlockchainBlockOutputFetchQuery[0].MerkleProof }}
    MMR Index{{'commit-id-view.mmr-index' | translate}} -

    MMR Index

    +

    {{'commit-id-view.mmr-index' | translate}}

    {{ hashdata.BlockchainBlockOutputFetchQuery[0].MmrIndex }}