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

Development review #32

Merged
merged 11 commits into from
Nov 8, 2021
Merged

Development review #32

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
427d813
ci: add docker releaser section
kenriortega Nov 7, 2021
5cf2510
Added websocket
khorne07 Nov 8, 2021
43afb13
Merge pull request #30 from khorne07/Fixing-websocket-usage
kenriortega Nov 8, 2021
df303a6
build: add run fronentend ui with yarn
kenriortega Nov 8, 2021
f6d87fe
ref+fix: change logic for webSocket hook
kenriortega Nov 8, 2021
7c4c108
fix: change color by `status`
kenriortega Nov 8, 2021
b5aa84f
build: comment this for `production` env
kenriortega Nov 8, 2021
4ebc551
docs: add new endpoints for testing
kenriortega Nov 8, 2021
0f8edc0
fix: error connection on `CheckOrigin`
kenriortega Nov 8, 2021
6b2c597
build: Production ready web UI compilation thx (@khorne07) for this R…
kenriortega Nov 8, 2021
942e3e7
Merge pull request #31 from kenriortega/frontend-app
kenriortega Nov 8, 2021
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
30 changes: 14 additions & 16 deletions web/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { useState } from 'react'
import Header from './components/Header'
import Footer from './components/Footer'
import Endpoints from './components/Endpoints'
import { QueryClient, QueryClientProvider, useQuery } from 'react-query'
const queryClient = new QueryClient()
import Header from "./components/Header";
import Footer from "./components/Footer";
import Endpoints from "./components/Endpoints";

function App() {
return (
<QueryClientProvider client={queryClient}>
<Header />
<main className={"main"}>
<Endpoints />
</main>
<Footer />
</QueryClientProvider>
)
return (
<>
<Header />
<main className={"main"}>
<Endpoints />
</main>
<Footer />
</>
);
}

export default App
export default App;
84 changes: 42 additions & 42 deletions web/src/components/EndpointTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
import { Table, Thead, Tr, Th, Tbody, Td, Tooltip, Link } from '@chakra-ui/react'
import React from 'react'
import urlParse from 'https://cdn.skypack.dev/url-parse';
import {
Table,
Thead,
Tr,
Th,
Tbody,
Td,
Tooltip,
Link,
} from "@chakra-ui/react";
import React from "react";
import urlParse from "https://cdn.skypack.dev/url-parse";

const EndpointTable = ({ endpoints, onSelectedRow }) => {

return (
<>
<Table variant="simple">

<Thead>
<Tr>
{
Object.keys(endpoints[0]).map(k => (<Th key={k}>{k}</Th>))
}
</Tr>
</Thead>
<Tbody>

{
endpoints.map(endpoint => (


<Tr onClick={() => onSelectedRow(endpoint)} key={endpoint.id}>

<Td cursor="pointer" color="green">
<Tooltip label="go to ..." placement="left">
{endpoint.id.split("-")[0]}
</Tooltip>
</Td>

<Td >{urlParse(endpoint.path_url).pathname}</Td>
<Td >{endpoint.status ? '☠️ down' : '✅ up'}</Td>
</Tr>
))
}

</Tbody>
</Table>
</>
)
}

export default EndpointTable
return (
<>
<Table variant="simple">
<Thead>
<Tr>
{Object.keys(endpoints[0]).map((k) => (
<Th key={k}>{k}</Th>
))}
</Tr>
</Thead>
<Tbody>
{endpoints.map((endpoint) => (
<Tr onClick={() => onSelectedRow(endpoint)} key={endpoint.id}>
<Td cursor="pointer" color="green">
<Tooltip label="go to ..." placement="left">
{endpoint.id.split("-")[0]}
</Tooltip>
</Td>

<Td>{urlParse(endpoint.path_url).pathname}</Td>
<Td>{endpoint.status ? "☠️ down" : "✅ up"}</Td>
</Tr>
))}
</Tbody>
</Table>
</>
);
};

export default EndpointTable;
157 changes: 62 additions & 95 deletions web/src/components/Endpoints.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,64 @@
import React, { Fragment, useEffect, useReducer, useState } from 'react'
import EndpointCard from './EndpointCard'
import { Box, Container, Flex, Heading, Text, Center } from "@chakra-ui/react"
import { FaIdCard, FaTable } from 'react-icons/fa'
import EndpointTable from './EndpointTable'
import NoDataImage from './NoData'
import { useQuery } from 'react-query'
import React, { useState } from "react";
import { Box, Container, Flex, Heading, Text, Center } from "@chakra-ui/react";
import EndpointCard from "./EndpointCard";
import { FaIdCard, FaTable } from "react-icons/fa";
import EndpointTable from "./EndpointTable";
import NoDataImage from "./NoData";
import { useSocket } from "../hooks";

const Endpoints = () => {

const [viewElement, setViewElement] = useState(false)

const handleViewElement = () => {
setViewElement(!viewElement)
}
const handleSelectedRow = (endpoint) => {
console.log(endpoint)
}
const width = "100%";

const { isLoading, error, data } = useQuery('endpointsData', () =>
fetch('/api/v1/mngt/')
.then(response =>
response.json()
)
)

if (isLoading) return 'Loading...'

if (error) return 'An error has occurred: ' + error.message


return (
<>
<Container maxW="container.1sm" px={[0, 4]}>
<Heading as="h2" m={8} size="md">
Ngonx Proxy!!
</Heading>

<Heading as="h1" m={8} size="2xl">
Service Discovery
</Heading>
{

<>
<Box onClick={handleViewElement} cursor="pointer">
{viewElement
? <FaIdCard size={23} />
: <FaTable size={23} />
}
</Box>
{
viewElement
? (
<Box p={23}>

{
data.length > 0
? <EndpointTable endpoints={data} onSelectedRow={handleSelectedRow} />
: <NoDataImage
width="300"
height="300" />
}

</Box>

)
: (

<div>
{
data.length > 0
? (<div className={'grid'}>
{data.map((endpoint) => (
<Fragment key={endpoint.id}>

<EndpointCard {...endpoint} />
</Fragment>
))}
</div>)
: <Center>
<NoDataImage
width="300"
height="300" />
</Center>
}
</div>
)
}
</>

}
</Container>
</>
)
}
export default Endpoints;
const [viewElement, setViewElement] = useState(false);
const { data, error } = useSocket("api/v1/mngt/wss");

const handleViewElement = () => {
setViewElement(!viewElement);
};
const handleSelectedRow = (endpoint) => {
console.log(endpoint);
};

if (error) return "An error has occurred: " + error;

return (
<>
<Container maxW="container.1sm" px={[0, 4]}>
<Heading as="h2" m={8} size="md">
Ngonx Proxy!!
</Heading>
<Heading as="h1" m={8} size="2xl">
Service Discovery
</Heading>
<Box onClick={handleViewElement} cursor="pointer">
{viewElement ? <FaIdCard size={23} /> : <FaTable size={23} />}
</Box>
{viewElement ? (
<Box p={23}>
{data.length > 0 ? (
<EndpointTable
endpoints={data}
onSelectedRow={handleSelectedRow}
/>
) : (
<NoDataImage width="300" height="300" />
)}
</Box>
) : (
<div>
{data?.length > 0 ? (
<div className={"grid"}>
{data.map((endpoint) => (
<EndpointCard {...endpoint} key={endpoint.id} />
))}
</div>
) : (
<Center>
<NoDataImage width="300" height="300" />
</Center>
)}
</div>
)}
</Container>
</>
);
};
export default Endpoints;
Loading