Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(datetime): fix datetime (tables) #102

Merged
merged 2 commits into from
Sep 24, 2024
Merged

fix(datetime): fix datetime (tables) #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8835747
fix(datetime): fix datetime (tables)
MixailE Sep 23, 2024
fa566d6
Merge branch 'main' into fix-datetime
MixailE Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/pages/capacities/CapacitiesTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,9 @@ const CapacityRow: React.FC<CapacityRowProps> = ({ capacity }) => {
</A>
</Cell>
{/* Created at */}
<Cell>
<Column>
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Cell>
{/* Duration */}
<Cell>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/compute-unit/ComputeUnitProofsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const ProofRow: React.FC<ProofRowProps> = ({ proof }) => {
</A>
</Cell>
{/* Timestamp */}
<Cell>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Cell>
Expand Down
22 changes: 6 additions & 16 deletions src/pages/peer/PeerCapacityCommitmentsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import Skeleton from 'react-loading-skeleton'
import styled from '@emotion/styled'
import { STATUS_NAMES } from '@fluencelabs/deal-ts-clients/dist/dealExplorerClient/constants'
import {
CapacityCommitmentsByPeerFilter,
Expand Down Expand Up @@ -189,18 +188,14 @@ const CapacityRow: React.FC<CapacityRowProps> = ({ capacity, index }) => {
</A>
</Cell>
{/* Created at */}
<Cell>
<Column>
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Cell>
{/* Expiration */}
<Cell>
<Column>
<Text size={12}>{expiredAt.date}</Text>
<Text size={12}>{expiredAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{expiredAt.date}</Text>
<Text size={12}>{expiredAt.time}</Text>
</Cell>
{/* Compute units */}
<Cell>
Expand All @@ -216,8 +211,3 @@ const CapacityRow: React.FC<CapacityRowProps> = ({ capacity, index }) => {
</RowBlock>
)
}

const Column = styled.div`
display: flex;
flex-direction: column;
`
28 changes: 8 additions & 20 deletions src/pages/provider/ProviderCapacityTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useContext, useEffect, useState } from 'react'
import Skeleton from 'react-loading-skeleton'
import styled from '@emotion/styled'
import {
CapacityCommitmentsByProviderFilter,
CapacityCommitmentsOrderBy,
Expand Down Expand Up @@ -213,24 +212,18 @@ const CapacityRow: React.FC<CapacityRowProps> = ({ capacity }) => {
</A>
</Cell>
{/* # Created At */}
<Cell>
<Column>
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Cell>
{/* Duration */}
<Cell>
<Column>
<Text size={12}>{formatDuration(capacityDuration)}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{formatDuration(capacityDuration)}</Text>
</Cell>
{/* Expiration */}
<Cell>
<Column>
<Text size={12}>{expiredAt.date}</Text>
<Text size={12}>{expiredAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{expiredAt.date}</Text>
<Text size={12}>{expiredAt.time}</Text>
</Cell>
{/* Peer Id */}
<Cell>
Expand Down Expand Up @@ -258,8 +251,3 @@ const CapacityRow: React.FC<CapacityRowProps> = ({ capacity }) => {
</RowBlock>
)
}

const Column = styled.div`
display: flex;
flex-direction: column;
`
14 changes: 3 additions & 11 deletions src/pages/provider/ProviderDealsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import Skeleton from 'react-loading-skeleton'
import styled from '@emotion/styled'
import { DealShort } from '@fluencelabs/deal-ts-clients/dist/dealExplorerClient/types/schemes'
import { useLocation } from 'wouter'

Expand Down Expand Up @@ -118,11 +117,9 @@ const DealRow: React.FC<DealRowProps> = ({ deal }) => {
<Cell>
<A href={`/deal/${deal.id}`}>{formatHexData(deal.id)}</A>
</Cell>
<Cell>
<Column>
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Column>
<Cell flexDirection="column" alignItems="flex-start">
<Text size={12}>{createdAt.date}</Text>
<Text size={12}>{createdAt.time}</Text>
</Cell>
{/* <Cell>
<A href={`/offer/${deal.client}`}>{deal.client}</A>
Expand Down Expand Up @@ -150,8 +147,3 @@ const DealRow: React.FC<DealRowProps> = ({ deal }) => {
</RowBlock>
)
}

const Column = styled.div`
display: flex;
flex-direction: column;
`