Hide unused tabs and functionalities #7

Merged
nikugogoi merged 4 commits from ng-hide-unused into main 2022-12-05 11:31:47 +00:00
6 changed files with 77 additions and 70 deletions

View File

@ -11,7 +11,7 @@ import Typography from '@material-ui/core/Typography';
import blueGrey from '@material-ui/core/colors/blueGrey'; import blueGrey from '@material-ui/core/colors/blueGrey';
import GraphQLIcon from '@material-ui/icons/Adb'; import GraphQLIcon from '@material-ui/icons/Adb';
import DXOSIcon from '../icons/DXOS'; // import LaconicIcon from '../icons/Laconic';
import { graphqlApi } from '../client'; import { graphqlApi } from '../client';
const useStyles = makeStyles((theme) => ({ const useStyles = makeStyles((theme) => ({
@ -51,14 +51,18 @@ const AppBar = ({ config }) => {
<MuiAppBar position='fixed' elevation={0}> <MuiAppBar position='fixed' elevation={0}>
<Toolbar> <Toolbar>
<Link classes={{ root: classes.logoLink }} href='/'> <Link classes={{ root: classes.logoLink }} href='/'>
<div className={classes.logo}> {/* <div className={classes.logo}>
<DXOSIcon /> <LaconicIcon />
</div> */}
<div className={classes.title}>
<Typography variant='h6'>Laconic</Typography>
</div> </div>
</Link> </Link>
&nbsp;
<div className={classes.title}> <div className={classes.title}>
<Typography variant='h6'>{config.app.title}</Typography> <Typography variant='h6'>{config.app.title}</Typography>
</div> </div>
<div> {/* <div>
<Link <Link
className={classes.link} className={classes.link}
href={graphqlApi(config)} href={graphqlApi(config)}
@ -68,7 +72,7 @@ const AppBar = ({ config }) => {
> >
<GraphQLIcon /> <GraphQLIcon />
</Link> </Link>
</div> </div> */}
</Toolbar> </Toolbar>
</MuiAppBar> </MuiAppBar>

View File

@ -4,8 +4,8 @@
import clsx from 'clsx'; import clsx from 'clsx';
import React from 'react'; import React from 'react';
import { useQuery } from '@apollo/react-hooks';
import { useHistory, useParams } from 'react-router'; import { useHistory, useParams } from 'react-router';
// import { useQuery } from '@apollo/react-hooks';
import { makeStyles } from '@material-ui/core'; import { makeStyles } from '@material-ui/core';
import List from '@material-ui/core/List'; import List from '@material-ui/core/List';
@ -14,8 +14,8 @@ import ListItemIcon from '@material-ui/core/ListItemIcon';
import LinkIcon from '@material-ui/icons/ExitToApp'; import LinkIcon from '@material-ui/icons/ExitToApp';
import ListItemText from '@material-ui/core/ListItemText'; import ListItemText from '@material-ui/core/ListItemText';
import EXTENSIONS from '../gql/extensions.graphql'; // import EXTENSIONS from '../gql/extensions.graphql';
import { useQueryStatusReducer } from '../hooks'; // import { useQueryStatusReducer } from '../hooks';
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
root: { root: {
@ -48,8 +48,9 @@ const Sidebar = ({ modules: { services, settings } }) => {
const history = useHistory(); const history = useHistory();
const { module } = useParams(); const { module } = useParams();
const { data: extensionsData } = useQueryStatusReducer(useQuery(EXTENSIONS)); // const { data: extensionsData } = useQueryStatusReducer(useQuery(EXTENSIONS));
const extensions = extensionsData ? JSON.parse(extensionsData.extensions.json) : []; // const extensions = extensionsData ? JSON.parse(extensionsData.extensions.json) : [];
const extensions = [];
const isSelected = path => path === `/${module}`; const isSelected = path => path === `/${module}`;

View File

@ -19,15 +19,15 @@ import modules from '../modules';
import Layout from './Layout'; import Layout from './Layout';
import ConsoleContextProvider from './ConsoleContextProvider'; import ConsoleContextProvider from './ConsoleContextProvider';
import Apps from './panels/apps/Apps';
import Bots from './panels/bots/Bots';
import Kubes from './panels/kubes/Kubes';
import Config from './panels/Config'; import Config from './panels/Config';
import IPFS from './panels/ipfs/IPFS';
import Metadata from './panels/Metadata';
import Signaling from './panels/signal/Signaling';
import System from './panels/system/System';
import Registry from './panels/registry/Registry'; import Registry from './panels/registry/Registry';
// import Apps from './panels/apps/Apps';
// import Bots from './panels/bots/Bots';
// import Kubes from './panels/kubes/Kubes';
// import IPFS from './panels/ipfs/IPFS';
// import Metadata from './panels/Metadata';
// import Signaling from './panels/signal/Signaling';
// import System from './panels/system/System';
// Global error handler. // Global error handler.
const errorHandler = new ErrorHandler(); const errorHandler = new ErrorHandler();
@ -47,18 +47,18 @@ const Main = ({ config }) => {
<Switch> <Switch>
<Route path='/:module'> <Route path='/:module'>
<Layout> <Layout>
<Route path='/kubes' component={Kubes} />
<Route path='/apps' component={Apps} />
<Route path='/bots' component={Bots} />
<Route path='/config' component={Config} /> <Route path='/config' component={Config} />
<Route path='/registry' component={Registry} /> <Route path='/registry' component={Registry} />
{/* <Route path='/kubes' component={Kubes} />
<Route path='/apps' component={Apps} />
<Route path='/bots' component={Bots} />
<Route path='/ipfs' component={IPFS} /> <Route path='/ipfs' component={IPFS} />
<Route path='/metadata' component={Metadata} /> <Route path='/metadata' component={Metadata} />
<Route path='/signaling' component={Signaling} /> <Route path='/signaling' component={Signaling} />
<Route path='/system' component={System} /> <Route path='/system' component={System} /> */}
</Layout> </Layout>
</Route> </Route>
<Redirect to='/system' /> <Redirect to='/registry' />
</Switch> </Switch>
</HashRouter> </HashRouter>
</ThemeProvider> </ThemeProvider>

View File

@ -20,7 +20,7 @@ import { ConsoleContext, useStatusReducer } from '../hooks';
import Error from '../components/Error'; import Error from '../components/Error';
import VersionCheck from './VersionCheck'; // import VersionCheck from './VersionCheck';
const useStyles = makeStyles((theme) => ({ const useStyles = makeStyles((theme) => ({
root: { root: {
@ -110,7 +110,7 @@ const StatusBar = () => {
<div className={classes.center}> <div className={classes.center}>
<div>{name} [{version} {moment(buildDate).format('L')}]</div> <div>{name} [{version} {moment(buildDate).format('L')}]</div>
<VersionCheck /> {/* <VersionCheck /> */}
</div> </div>
<div className={classes.right}> <div className={classes.right}>

View File

@ -9,18 +9,19 @@ import Tab from '@material-ui/core/Tab';
import Tabs from '@material-ui/core/Tabs'; import Tabs from '@material-ui/core/Tabs';
import TabContext from '@material-ui/lab/TabContext'; import TabContext from '@material-ui/lab/TabContext';
import LogPoller from '../../../components/LogPoller';
import Panel from '../../../components/Panel'; import Panel from '../../../components/Panel';
import Toolbar from '../../../components/Toolbar'; import Toolbar from '../../../components/Toolbar';
// import LogPoller from '../../../components/LogPoller';
import RegistryRecords, { RecordType } from './RegistryRecords';
import RegistryLookup, { LookupType } from './RegistryLookup'; import RegistryLookup, { LookupType } from './RegistryLookup';
import RegistryStatus from './RegistryStatus'; import RegistryStatus from './RegistryStatus';
import RegistryRecords from './RegistryRecords';
// import RegistryRecords, { RecordType } from './RegistryRecords';
const TAB_RECORDS = 'records'; const TAB_RECORDS = 'records';
const TAB_STATUS = 'status'; const TAB_STATUS = 'status';
const TAB_LOG = 'log';
const TAB_LOOKUP = 'lookup'; const TAB_LOOKUP = 'lookup';
// const TAB_LOG = 'log';
const useStyles = makeStyles(() => ({ const useStyles = makeStyles(() => ({
expand: { expand: {
@ -43,8 +44,8 @@ const useStyles = makeStyles(() => ({
const Registry = () => { const Registry = () => {
const classes = useStyles(); const classes = useStyles();
const [tab, setTab] = useState(TAB_RECORDS); const [tab, setTab] = useState(TAB_RECORDS);
const [type, setType] = useState();
const [scope, setScope] = useState(LookupType.default); const [scope, setScope] = useState(LookupType.default);
// const [type, setType] = useState();
return ( return (
<Panel <Panel
@ -54,12 +55,12 @@ const Registry = () => {
<Tab value={TAB_RECORDS} label='Records' /> <Tab value={TAB_RECORDS} label='Records' />
<Tab value={TAB_LOOKUP} label='Lookup' /> <Tab value={TAB_LOOKUP} label='Lookup' />
<Tab value={TAB_STATUS} label='Status' /> <Tab value={TAB_STATUS} label='Status' />
<Tab value={TAB_LOG} label='Log' /> {/* <Tab value={TAB_LOG} label='Log' /> */}
</Tabs> </Tabs>
{tab === TAB_RECORDS && ( {/* {tab === TAB_RECORDS && (
<RecordType type={type} onChange={setType} /> <RecordType type={type} onChange={setType} />
)} )} */}
{tab === TAB_LOOKUP && ( {tab === TAB_LOOKUP && (
<LookupType scope={scope} onChange={setScope} /> <LookupType scope={scope} onChange={setScope} />
)} )}
@ -69,7 +70,8 @@ const Registry = () => {
<TabContext value={tab}> <TabContext value={tab}>
{tab === TAB_RECORDS && ( {tab === TAB_RECORDS && (
<div className={classes.panel}> <div className={classes.panel}>
<RegistryRecords type={type} /> {/* <RegistryRecords type={type} /> */}
<RegistryRecords />
</div> </div>
)} )}
@ -87,11 +89,11 @@ const Registry = () => {
</div> </div>
)} )}
{tab === TAB_LOG && ( {/* {tab === TAB_LOG && (
<div className={classes.panel}> <div className={classes.panel}>
<LogPoller service='wns-lite' /> <LogPoller service='wns-lite' />
</div> </div>
)} )} */}
</TabContext> </TabContext>
</Panel> </Panel>
); );

View File

@ -2,55 +2,55 @@
// Copyright 2020 DXOS.org // Copyright 2020 DXOS.org
// //
import AppsIcon from '@material-ui/icons/Apps';
import BotsIcon from '@material-ui/icons/Android';
import StatsIcon from '@material-ui/icons/Equalizer';
import RegistryIcon from '@material-ui/icons/Language'; import RegistryIcon from '@material-ui/icons/Language';
import IPFSIcon from '@material-ui/icons/GraphicEq';
import ConfigIcon from '@material-ui/icons/Settings'; import ConfigIcon from '@material-ui/icons/Settings';
import SignalIcon from '@material-ui/icons/Traffic'; // import AppsIcon from '@material-ui/icons/Apps';
import KubeIcon from '@material-ui/icons/Dns'; // import BotsIcon from '@material-ui/icons/Android';
// import StatsIcon from '@material-ui/icons/Equalizer';
// import IPFSIcon from '@material-ui/icons/GraphicEq';
// import SignalIcon from '@material-ui/icons/Traffic';
// import KubeIcon from '@material-ui/icons/Dns';
/** /**
* Paths should match Main routes. * Paths should match Main routes.
*/ */
export default { export default {
services: [ services: [
{
path: '/system',
title: 'System',
icon: StatsIcon
},
{ {
path: '/registry', path: '/registry',
title: 'Registry', title: 'Registry',
icon: RegistryIcon icon: RegistryIcon
},
{
path: '/kubes',
title: 'KUBE Nodes',
icon: KubeIcon
},
{
path: '/apps',
title: 'Apps',
icon: AppsIcon
},
{
path: '/bots',
title: 'Bots',
icon: BotsIcon
},
{
path: '/signaling',
title: 'Signaling',
icon: SignalIcon
},
{
path: '/ipfs',
title: 'IPFS',
icon: IPFSIcon
} }
// {
// path: '/system',
// title: 'System',
// icon: StatsIcon
// },
// {
// path: '/kubes',
// title: 'KUBE Nodes',
// icon: KubeIcon
// },
// {
// path: '/apps',
// title: 'Apps',
// icon: AppsIcon
// },
// {
// path: '/bots',
// title: 'Bots',
// icon: BotsIcon
// },
// {
// path: '/signaling',
// title: 'Signaling',
// icon: SignalIcon
// },
// {
// path: '/ipfs',
// title: 'IPFS',
// icon: IPFSIcon
// }
], ],
settings: [ settings: [