ui(admin): cleanup

This commit is contained in:
Matthew Penner 2021-08-02 11:32:09 -06:00
parent 27ed07e81f
commit 98ed8e431b
2 changed files with 10 additions and 11 deletions

View File

@ -1,12 +1,12 @@
import React, { useContext, useEffect } from 'react';
import getDatabases, { Context as DatabasesContext, Filters } from '@/api/admin/databases/getDatabases';
import FlashMessageRender from '@/components/FlashMessageRender';
import useFlash from '@/plugins/useFlash';
import { AdminContext } from '@/state/admin';
import { NavLink, useRouteMatch } from 'react-router-dom';
import tw from 'twin.macro';
import AdminContentBlock from '@/components/admin/AdminContentBlock';
import getDatabases, { Context as DatabasesContext, Filters } from '@/api/admin/databases/getDatabases';
import useFlash from '@/plugins/useFlash';
import { AdminContext } from '@/state/admin';
import FlashMessageRender from '@/components/FlashMessageRender';
import AdminCheckbox from '@/components/admin/AdminCheckbox';
import AdminContentBlock from '@/components/admin/AdminContentBlock';
import AdminTable, { TableBody, TableHead, TableHeader, TableRow, Pagination, Loading, NoItems, ContentWrapper, useTableHooks } from '@/components/admin/AdminTable';
import Button from '@/components/elements/Button';
import CopyOnClick from '@/components/elements/CopyOnClick';
@ -103,7 +103,7 @@ const DatabasesContainer = () => {
<TableHeader name={'ID'} direction={sort === 'id' ? (sortDirection ? 1 : 2) : null} onClick={() => setSort('id')}/>
<TableHeader name={'Name'} direction={sort === 'name' ? (sortDirection ? 1 : 2) : null} onClick={() => setSort('name')}/>
<TableHeader name={'Address'}/>
<TableHeader name={'Username'} direction={sort === 'username' ? (sortDirection ? 1 : 2) : null} onClick={() => setSort('username')}/>
<TableHeader name={'Username'}/>
</TableHead>
<TableBody>

View File

@ -1,11 +1,10 @@
import { State, useStoreState } from 'easy-peasy';
import React, { useState } from 'react';
import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
import { State, useStoreState } from 'easy-peasy';
import tw, { styled } from 'twin.macro';
import { breakpoint } from '@/theme';
import { ApplicationStore } from '@/state';
import { AdminContext } from '@/state/admin';
import { NotFound } from '@/components/elements/ScreenBlock';
import { breakpoint } from '@/theme';
import OverviewContainer from '@/components/admin/overview/OverviewContainer';
import SettingsContainer from '@/components/admin/settings/SettingsContainer';
import DatabasesContainer from '@/components/admin/databases/DatabasesContainer';
@ -29,6 +28,7 @@ import MountsContainer from '@/components/admin/mounts/MountsContainer';
import MountEditContainer from '@/components/admin/mounts/MountEditContainer';
import EggRouter from '@/components/admin/nests/eggs/EggRouter';
import ServerRouter from '@/components/admin/servers/ServerRouter';
import { NotFound } from '@/components/elements/ScreenBlock';
const Sidebar = styled.div<{ collapsed?: boolean }>`
${tw`fixed h-screen hidden md:flex flex-col items-center flex-shrink-0 bg-neutral-900 overflow-x-hidden transition-all duration-250 ease-linear`};
@ -79,8 +79,7 @@ const Sidebar = styled.div<{ collapsed?: boolean }>`
& > div.user {
${tw`h-16 w-full flex items-center bg-neutral-700`};
${props => !props.collapsed && tw`mt-auto px-5`};
${props => props.collapsed && tw`justify-center`};
${props => props.collapsed ? tw`justify-center` : tw`mt-auto px-5`};
& > div, a {
${props => props.collapsed && tw`hidden`};