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.

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

Hubble Responsive #1466

Merged
merged 20 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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: 4 additions & 4 deletions apps/bridge-dapp/src/containers/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { Transition } from '@headlessui/react';
import {
Banner,
Footer,
ItemProps,
FooterProps,
SideBarItemProps,
SideBarFooterType,
Logo,
LogoWithoutName,
SideBar,
Expand All @@ -21,7 +21,7 @@ import {
WEBB_DOCS_URL,
} from '../../constants';

const items: ItemProps[] = [
const items: SideBarItemProps[] = [
{
name: 'Hubble',
isInternal: true,
Expand Down Expand Up @@ -60,7 +60,7 @@ const items: ItemProps[] = [
},
];

const footer: FooterProps = {
const footer: SideBarFooterType = {
name: 'Webb Docs',
isInternal: false,
href: WEBB_DOCS_URL,
Expand Down
79 changes: 5 additions & 74 deletions apps/hubble-stats/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,95 +4,26 @@ import {
WebbUIProvider,
Footer,
SideBar,
Logo,
LogoWithoutName,
ItemProps,
FooterProps,
} from '@webb-tools/webb-ui-components';
import '@webb-tools/webb-ui-components/tailwind.css';
import { ContrastTwoLine, DocumentationIcon, Tangle } from '@webb-tools/icons';
import {
BRIDGE_URL,
WEBB_FAUCET_URL,
STATS_URL,
TANGLE_MKT_URL,
WEBB_DOCS_URL,
WEBB_MKT_URL,
} from '@webb-tools/webb-ui-components/constants';

import { Header } from '../components';
import { sideBarProps } from '../constants';

export default function RootLayout({
children,
}: {
children: React.ReactNode;
}) {
const items: ItemProps[] = [
{
name: 'Hubble',
isInternal: true,
href: '',
Icon: ContrastTwoLine,
subItems: [
{
name: 'Bridge',
isInternal: false,
href: BRIDGE_URL,
},
{
name: 'Explorer',
isInternal: true,
href: '',
},
{
name: 'Faucet',
isInternal: false,
href: WEBB_FAUCET_URL,
},
],
},
{
name: 'Tangle Network',
isInternal: false,
href: '',
Icon: Tangle,
subItems: [
{
name: 'DKG Explorer',
isInternal: false,
href: STATS_URL,
},
{
name: 'Homepage',
isInternal: false,
href: TANGLE_MKT_URL,
},
],
},
];

const footer: FooterProps = {
name: 'Webb Docs',
isInternal: false,
href: WEBB_DOCS_URL,
Icon: DocumentationIcon,
};

return (
<html lang="en">
<WebbUIProvider defaultThemeMode="light">
<body className="h-screen bg-body dark:bg-body_dark bg-cover flex">
<SideBar
items={items}
Logo={Logo}
ClosedLogo={LogoWithoutName}
logoLink={WEBB_MKT_URL}
footer={footer}
/>

<main className="flex-1 px-10 overflow-y-auto">
<SideBar {...sideBarProps} className="hidden lg:block" />
<main className="flex-1 px-3 md:px-5 lg:px-10 overflow-y-auto">
<Header />
{children}
<Footer isMinimal style={{ background: 'inherit' }} />
<Footer isMinimal className="max-w-none" />
</main>
</body>
</WebbUIProvider>
Expand Down
2 changes: 1 addition & 1 deletion apps/hubble-stats/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const metadata: Metadata = {

export default async function Index() {
return (
<div className="py-4 space-y-8">
<div className="py-4 space-y-6">
<OverviewChartsContainer />
<KeyMetricsTableContainer />
<ShieldedTablesContainer />
Expand Down
4 changes: 2 additions & 2 deletions apps/hubble-stats/app/pool/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export default function Pool({ params }: { params: { slug: string } }) {

return (
<div className="py-4 space-y-8">
<div className="flex gap-4">
<div className="w-[400px]">
<div className="flex flex-col lg:flex-row gap-4">
<div className="lg:w-[400px]">
<PoolOverviewContainer />
</div>
<div className="flex-grow"></div>
Expand Down
23 changes: 15 additions & 8 deletions apps/hubble-stats/components/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { BlockIcon, GridFillIcon, Spinner } from '@webb-tools/icons';
import { IconBase } from '@webb-tools/icons/types';
import { FC, useMemo } from 'react';
import Link from 'next/link';
import {
Breadcrumbs,
BreadcrumbsItem,
Chip,
ChipProps,
SideBarMenu,
} from '@webb-tools/webb-ui-components';
import Link from 'next/link';
import React, { useMemo } from 'react';
import { BlockIcon, GridFillIcon, Spinner } from '@webb-tools/icons';
import { IconBase } from '@webb-tools/icons/types';

import { sideBarProps } from '../../constants';

const Header = () => {
const tvl = useMemo(() => {
Expand All @@ -21,18 +24,22 @@ const Header = () => {
return (
<div className="flex items-center justify-between pt-6 pb-4">
{/* Breadcrumbs */}
<div>
<div className="flex gap-2 items-center">
<SideBarMenu {...sideBarProps} className="lg:hidden" />
<Breadcrumbs>
<Link href="/">
<BreadcrumbsItem icon={<GridFillIcon />} className="ml-0">
<BreadcrumbsItem
icon={<GridFillIcon />}
className="ml-0 bg-[rgba(156,160,176,0.10)] dark:bg-[rgba(255,255,255,0.05)]"
>
Hubble Overview
</BreadcrumbsItem>
</Link>
</Breadcrumbs>
</div>

{/* TVL and Volume Chips */}
<div className="flex items-center gap-4">
<div className="hidden md:flex items-center gap-4">
<VolumeChip
color="blue"
Icon={BlockIcon}
Expand Down Expand Up @@ -64,7 +71,7 @@ type VolumeChipProps = {
isLoading?: boolean;
};

export const VolumeChip: React.FC<VolumeChipProps> = ({
export const VolumeChip: FC<VolumeChipProps> = ({
color,
className,
Icon,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ const NetworkPoolTable: FC<NetworkPoolTableProps> = ({
return (
<div className="overflow-hidden rounded-lg border border-mono-40 dark:border-mono-160">
<Table
tableClassName="block overflow-x-auto max-w-[-moz-fit-content] md:table md:max-w-none"
thClassName="border-t-0 bg-mono-0 border-r first:px-3 last:border-r-0 last:pr-2"
tdClassName="border-r last:border-r-0 first:px-3 last:pr-2"
tableProps={table as RTTable<unknown>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const NetworkTokenTable: FC<NetworkTokenTableProps> = ({
return (
<div className="overflow-hidden rounded-lg border border-mono-40 dark:border-mono-160">
<Table
tableClassName="block overflow-x-auto max-w-[-moz-fit-content] max-w-fit md:table md:max-w-none"
thClassName="border-t-0 bg-mono-0 border-r first:px-3 last:border-r-0 last:pr-2"
tdClassName="border-r last:border-r-0 first:px-3 last:pr-2"
tableProps={table as RTTable<unknown>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ const PoolMetadataTable: FC<PoolMetadataTableProps> = ({ data }) => {
return (
<div className="overflow-hidden rounded-lg border border-mono-40 dark:border-mono-160">
<Table
thClassName="w-1/2 border-t-0 bg-mono-0 border-r last-of-type:border-r-0"
tdClassName="border-r last-of-type:border-r-0"
thClassName="w-1/2 border-t-0 bg-mono-0 border-r last-of-type:border-r-0 first:pl-2 last:pr-2"
tdClassName="border-r last-of-type:border-r-0 first:pl-2 last:pr-2"
paginationClassName="bg-mono-0 dark:bg-mono-180 pl-6"
tableProps={table as RTTable<unknown>}
totalRecords={data.length}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ const PoolTransactionsTable: FC<PoolTransactionsTableProps> = ({
return (
<div className="overflow-hidden rounded-lg border border-mono-40 dark:border-mono-160">
<Table
tableClassName="block overflow-x-auto max-w-[-moz-fit-content] max-w-fit max-w-fit md:table md:max-w-none"
thClassName="border-t-0 bg-mono-0"
paginationClassName="bg-mono-0 dark:bg-mono-180 pl-6"
tableProps={table as RTTable<unknown>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ const staticColumns: ColumnDef<ShieldedAssetType, any>[] = [

const ShieldedAssetsTable: FC<ShieldedAssetsTableProps> = ({
data,
globalSearchText,
pageSize,
}) => {
const [isDarkMode] = useDarkMode();
Expand All @@ -91,9 +90,6 @@ const ShieldedAssetsTable: FC<ShieldedAssetsTableProps> = ({
const table = useReactTable({
data,
columns,
state: {
globalFilter: globalSearchText,
},
initialState: {
pagination: {
pageSize,
Expand All @@ -112,6 +108,7 @@ const ShieldedAssetsTable: FC<ShieldedAssetsTableProps> = ({
return (
<div className="overflow-hidden rounded-lg bg-mono-0 dark:bg-mono-180 border border-mono-40 dark:border-mono-160">
<Table
tableClassName="block overflow-x-auto max-w-[-moz-fit-content] max-w-fit md:table md:max-w-none"
thClassName="border-t-0 bg-mono-0"
paginationClassName="bg-mono-0 dark:bg-mono-180 pl-6"
tableProps={table as RTTable<unknown>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ export interface ShieldedAssetType {

export interface ShieldedAssetsTableProps {
data: ShieldedAssetType[];
globalSearchText: string;
pageSize: number;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ const columns: ColumnDef<ShieldedPoolType, any>[] = [
}),
columnHelper.accessor('token', {
header: () => <HeaderCell title="Token #" className="justify-end" />,
cell: (props) => (
<NumberCell value={props.getValue()} className="text-right" />
),
cell: (props) => <NumberCell value={props.getValue()} />,
}),
columnHelper.accessor('deposits24h', {
header: () => <HeaderCell title="24H Deposits" />,
Expand All @@ -65,15 +63,11 @@ const columns: ColumnDef<ShieldedPoolType, any>[] = [

const ShieldedPoolsTable: FC<ShieldedPoolsTableProps> = ({
data,
globalSearchText,
pageSize,
}) => {
const table = useReactTable({
data,
columns,
state: {
globalFilter: globalSearchText,
},
initialState: {
pagination: {
pageSize,
Expand All @@ -92,6 +86,7 @@ const ShieldedPoolsTable: FC<ShieldedPoolsTableProps> = ({
return (
<div className="overflow-hidden rounded-lg bg-mono-0 dark:bg-mono-180 border border-mono-40 dark:border-mono-160">
<Table
tableClassName="block overflow-x-auto max-w-[-moz-fit-content] max-w-fit md:table md:max-w-none"
thClassName="border-t-0 bg-mono-0"
paginationClassName="bg-mono-0 dark:bg-mono-180 pl-6"
tableProps={table as RTTable<unknown>}
Expand Down
1 change: 0 additions & 1 deletion apps/hubble-stats/components/ShieldedPoolsTable/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ export interface ShieldedPoolType {

export interface ShieldedPoolsTableProps {
data: ShieldedPoolType[];
globalSearchText: string;
pageSize: number;
}
2 changes: 1 addition & 1 deletion apps/hubble-stats/components/table/HeaderCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const HeaderCell: FC<HeaderCellProps> = ({ title, tooltip, className }) => {
variant="body1"
fw="bold"
className={cx(
'text-mono-140 dark:text-mono-40 flex-[1] flex items-center justify-center',
'text-mono-140 dark:text-mono-40 flex-[1] flex items-center justify-center whitespace-nowrap',
className
)}
>
Expand Down
1 change: 1 addition & 0 deletions apps/hubble-stats/constants/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as sideBarProps } from './sideBar';
Loading
Loading