Skip to content

Commit

Permalink
Merge pull request #243 from pastelnetwork/feature/multi-volume-file-…
Browse files Browse the repository at this point in the history
…ticket

multi volume file ticket
  • Loading branch information
Dicklesworthstone authored Aug 30, 2024
2 parents e6ce843 + 4bfda4d commit 09095ee
Show file tree
Hide file tree
Showing 46 changed files with 2,893 additions and 184 deletions.
172 changes: 172 additions & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
"usd": {
"message": "USD",
"description": "Used for the common"
},
"mb": {
"message": "MB",
"description": "Used for the common"
}
},
"components": {
Expand Down Expand Up @@ -389,6 +393,10 @@
"inferenceAPICreditPack": {
"message": "Inference API Credit Pack Ticket",
"description": "Used for the ticket title component"
},
"cascadeMultiVolume": {
"message": "Cascade Multi Volume",
"description": "Used for the ticket title component"
}
},
"acceptTicket": {
Expand Down Expand Up @@ -1280,6 +1288,72 @@
"description": "Used for the PastelIDRegistrationTicket component"
}
}
},
"multiVolume": {
"fileName": {
"message": "Filename:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"totalFile": {
"message": "Total file:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"secondaryKey": {
"message": "secondary_key:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"totalFee": {
"message": "Total fee:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"fileID": {
"message": "File ID:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"uploadTimestamp": {
"message": "Upload timestamp:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"taskID": {
"message": "Task ID:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"regTxID": {
"message": "Reg txID:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"activationTxID": {
"message": "Activation txID:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"reqBurnTxnAmount": {
"message": "Req burn txn amount:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"burnTxnId": {
"message": "Burn txn id:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"reqAmount": {
"message": "Req amount:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"isConcluded": {
"message": "Is concluded:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"cascadeMetadataTicketId": {
"message": "Cascade metadata ticket id:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"startBlock": {
"message": "Start block:",
"description": "Used for the CascadeMultiVolumeTicket component"
},
"doneBlock": {
"message": "Done block:",
"description": "Used for the CascadeMultiVolumeTicket component"
}
}
},
"historicalStatisticsLayout": {
Expand Down Expand Up @@ -3484,6 +3558,46 @@
"costPerCredit": {
"message": "Cost per credit",
"description": "Used for the Tickets page"
},
"completed": {
"message": "Completed",
"description": "Used for the Tickets page"
},
"inProgress": {
"message": "In Progress",
"description": "Used for the Tickets page"
},
"fail": {
"message": "Fail",
"description": "Used for the Tickets page"
},
"key": {
"message": "Key",
"description": "Used for the Tickets page"
},
"secondaryKey": {
"message": "Secondary key",
"description": "Used for the Tickets page"
},
"fileHash": {
"message": "File hash",
"description": "Used for the Tickets page"
},
"totalFee": {
"message": "Multisig tx total fee",
"description": "Used for the Tickets page"
},
"multisigOutputsCount": {
"message": "File count",
"description": "Used for the Tickets page"
},
"files": {
"message": "Files",
"description": "Used for the Tickets page"
},
"volumes": {
"message": "Volumes",
"description": "Used for the Tickets page"
}
},
"ticketsType": {
Expand Down Expand Up @@ -3786,6 +3900,26 @@
"transfers": {
"message": "Transfers",
"description": "Used for the Cascade Details page"
},
"totalVolumes": {
"message": "Total Volumes",
"description": "Used for the Cascade Details page"
},
"downloadedVolumes": {
"message": "Downloaded Volumes",
"description": "Used for the Cascade Details page"
},
"volumesDownloadInProgress": {
"message": "Volumes download in progress",
"description": "Used for the Cascade Details page"
},
"volumesPendingDownload": {
"message": "Volumes pending download",
"description": "Used for the Cascade Details page"
},
"volumesDownloadFailed": {
"message": "Volumes download failed",
"description": "Used for the Cascade Details page"
}
},
"collection": {
Expand Down Expand Up @@ -4211,6 +4345,40 @@
"message": "Report",
"description": "Used for the Network Challenges And Self Healing page"
}
},
"coinSupplyAndInflationStats": {
"pageTitle": {
"message": "Coin Supply And Inflation Stats",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"month": {
"message": "{{month}} Month Ago ({{date}})",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"months": {
"message": "{{months}} Months Ago ({{date}})",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"year": {
"message": "{{year}} Year Ago ({{date}})",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"today": {
"message": "Today ({{date}})",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"coinSupply": {
"message": "Coin Supply",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"circulatingSupply": {
"message": "Circulating Supply",
"description": "Used for the Coin Supply And Inflation Stats page"
},
"start": {
"message": "From start ({{date}})",
"description": "Used for the Coin Supply And Inflation Stats page"
}
}
},
"routes": {
Expand Down Expand Up @@ -4421,6 +4589,10 @@
"networkChallengesAndSelfHealing": {
"message": "Network Challenges and Self Healing",
"description": "Used for the routes"
},
"coinSupplyAndInflationStats": {
"message": "Coin Supply and Inflation Stats",
"description": "Used for the routes"
}
},
"chartOptions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import styled from 'styled-components';
import {
LinearProgress as MuiLinearProgress,
Typography as MuiTypography,
} from '@mui/material';
import { LinearProgress as MuiLinearProgress, Typography as MuiTypography } from '@mui/material';

export const LinearProgress = styled(MuiLinearProgress)`
height: 14px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Progress/LinearProgress/LinearProgress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ const LinearProgressComponent: React.FC<LinearProgressProps> = ({ value, descrip

LinearProgressComponent.defaultProps = {
description: '',
}
};

export default LinearProgressComponent;
20 changes: 20 additions & 0 deletions src/components/Sidebar/Sidebar.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ export const Category = styled(ListItem)<CategoryType>`
font-weight: ${props => props.theme.typography.fontWeightRegular};
transition: all 0.3s ease-in-out;
&.has-sub {
${props => props.theme.breakpoints.down(960)} {
flex-direction: column;
width: 100%;
.sub-menu {
width: 100%;
}
}
}
${props => props.theme.breakpoints.down('md')} {
margin: 0;
}
Expand Down Expand Up @@ -274,6 +285,15 @@ export const Category = styled(ListItem)<CategoryType>`
&.has-sub {
padding: 0;
border-radius: 0;
${props => props.theme.breakpoints.down(960)} {
flex-direction: column;
width: 100%;
.sub-menu {
width: 100%;
}
}
}
.menu-text {
Expand Down
2 changes: 2 additions & 0 deletions src/components/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const SidebarCategory: React.FC<SidebarCategoryPropsType> = ({
(window.location.pathname === ROUTES.STATISTICS ||
window.location.pathname === ROUTES.STATISTICS_OVERTIME ||
window.location.pathname === ROUTES.CASCADE_AND_SENSE_STATISTICS ||
window.location.pathname === ROUTES.COIN_SUPPLY_AND_INFLATION_STATS ||
window.location.pathname.includes(ROUTES.STATISTICS_OVERTIME)) &&
category?.path === ROUTES.STATISTICS_PARENT
) {
Expand Down Expand Up @@ -176,6 +177,7 @@ const Sidebar: React.FC<SidebarPropsType> = ({ ...rest }) => {
(pathName === ROUTES.STATISTICS ||
pathName === ROUTES.STATISTICS_OVERTIME ||
pathName === ROUTES.CASCADE_AND_SENSE_STATISTICS ||
pathName === ROUTES.COIN_SUPPLY_AND_INFLATION_STATS ||
pathName.includes(ROUTES.STATISTICS_OVERTIME)) &&
route.path === ROUTES.STATISTICS_PARENT &&
width < 960
Expand Down
Loading

0 comments on commit 09095ee

Please sign in to comment.