Merge pull request #1994 from SkynetLabs/dashboard-v2-feedback-fixes-main-screen
Dashboard v2 - Address feedback regarding main dashboard
This commit is contained in:
commit
a611dd5d07
|
@ -12,11 +12,13 @@ const BarTip = styled.span.attrs({
|
||||||
})``;
|
})``;
|
||||||
|
|
||||||
const BarLabel = styled.span.attrs({
|
const BarLabel = styled.span.attrs({
|
||||||
className: "bg-white rounded border-2 border-palette-200 px-3 whitespace-nowrap absolute shadow",
|
className: "usage-label bg-white rounded border-2 border-palette-200 px-3 whitespace-nowrap absolute shadow",
|
||||||
})`
|
})`
|
||||||
right: max(0%, ${({ $percentage }) => 100 - $percentage}%);
|
${({ $percentage }) => `
|
||||||
|
left: max(0%, ${$percentage}%);
|
||||||
top: -0.5rem;
|
top: -0.5rem;
|
||||||
transform: translateX(50%);
|
transform: translateX(-${$percentage}%);
|
||||||
|
`}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const GraphBar = ({ value, limit, label }) => {
|
export const GraphBar = ({ value, limit, label }) => {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import useSWR from "swr";
|
||||||
import { Table, TableBody, TableCell, TableRow } from "../Table";
|
import { Table, TableBody, TableCell, TableRow } from "../Table";
|
||||||
import { ContainerLoadingIndicator } from "../LoadingIndicator";
|
import { ContainerLoadingIndicator } from "../LoadingIndicator";
|
||||||
|
|
||||||
|
import { ViewAllLink } from "./ViewAllLink";
|
||||||
import useFormattedActivityData from "./useFormattedActivityData";
|
import useFormattedActivityData from "./useFormattedActivityData";
|
||||||
|
|
||||||
export default function ActivityTable({ type }) {
|
export default function ActivityTable({ type }) {
|
||||||
|
@ -22,6 +23,7 @@ export default function ActivityTable({ type }) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<Table style={{ tableLayout: "fixed" }}>
|
<Table style={{ tableLayout: "fixed" }}>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{items.map(({ id, name, type, size, date, skylink }) => (
|
{items.map(({ id, name, type, size, date, skylink }) => (
|
||||||
|
@ -37,5 +39,7 @@ export default function ActivityTable({ type }) {
|
||||||
))}
|
))}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
|
<ViewAllLink to={`/files?tab=${type}`} />
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,21 +1,10 @@
|
||||||
import * as React from "react";
|
import * as React from "react";
|
||||||
import { Link } from "gatsby";
|
|
||||||
|
|
||||||
import { Panel } from "../Panel";
|
import { Panel } from "../Panel";
|
||||||
import { Tab, TabPanel, Tabs } from "../Tabs";
|
import { Tab, TabPanel, Tabs } from "../Tabs";
|
||||||
import { ArrowRightIcon } from "../Icons";
|
|
||||||
|
|
||||||
import ActivityTable from "./ActivityTable";
|
import ActivityTable from "./ActivityTable";
|
||||||
|
|
||||||
const ViewAllLink = (props) => (
|
|
||||||
<Link className="inline-flex mt-6 items-center gap-3 ease-in-out hover:brightness-90" {...props}>
|
|
||||||
<span className="bg-primary rounded-full w-[32px] h-[32px] inline-flex justify-center items-center">
|
|
||||||
<ArrowRightIcon />
|
|
||||||
</span>
|
|
||||||
<span className="font-sans text-xs uppercase text-palette-400">View all</span>
|
|
||||||
</Link>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default function LatestActivity() {
|
export default function LatestActivity() {
|
||||||
return (
|
return (
|
||||||
<Panel title="Latest activity">
|
<Panel title="Latest activity">
|
||||||
|
@ -24,11 +13,9 @@ export default function LatestActivity() {
|
||||||
<Tab id="downloads" title="Downloads" />
|
<Tab id="downloads" title="Downloads" />
|
||||||
<TabPanel tabId="uploads" className="pt-4">
|
<TabPanel tabId="uploads" className="pt-4">
|
||||||
<ActivityTable type="uploads" />
|
<ActivityTable type="uploads" />
|
||||||
<ViewAllLink to="/files?tab=uploads" />
|
|
||||||
</TabPanel>
|
</TabPanel>
|
||||||
<TabPanel tabId="downloads" className="pt-4">
|
<TabPanel tabId="downloads" className="pt-4">
|
||||||
<ActivityTable type="downloads" />
|
<ActivityTable type="downloads" />
|
||||||
<ViewAllLink to="/files?tab=downloads" />
|
|
||||||
</TabPanel>
|
</TabPanel>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</Panel>
|
</Panel>
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
import { Link } from "gatsby";
|
||||||
|
|
||||||
|
import { ArrowRightIcon } from "../Icons";
|
||||||
|
|
||||||
|
export const ViewAllLink = (props) => (
|
||||||
|
<Link className="inline-flex mt-6 items-center gap-3 ease-in-out hover:brightness-90" {...props}>
|
||||||
|
<span className="bg-primary rounded-full w-[32px] h-[32px] inline-flex justify-center items-center">
|
||||||
|
<ArrowRightIcon />
|
||||||
|
</span>
|
||||||
|
<span className="font-sans text-xs uppercase text-palette-400">View all</span>
|
||||||
|
</Link>
|
||||||
|
);
|
|
@ -109,7 +109,6 @@ export default function UploaderItem({ onUploadStateChange, upload }) {
|
||||||
{upload.status === "uploading" && (
|
{upload.status === "uploading" && (
|
||||||
<span className="uppercase tabular-nums">{Math.floor(upload.progress * 100)}%</span>
|
<span className="uppercase tabular-nums">{Math.floor(upload.progress * 100)}%</span>
|
||||||
)}
|
)}
|
||||||
{upload.status === "processing" && <span className="uppercase text-palette-300">Wait</span>}
|
|
||||||
{upload.status === "complete" && (
|
{upload.status === "complete" && (
|
||||||
<button
|
<button
|
||||||
className="uppercase hover:text-primary transition-colors duration-200"
|
className="uppercase hover:text-primary transition-colors duration-200"
|
||||||
|
|
Reference in New Issue