First version of frontend

main
Kevin Belisle 2021-07-06 16:41:47 -04:00
parent d65bb0445a
commit ca3a8d6186
18 changed files with 29079 additions and 13 deletions

View File

@ -47,7 +47,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
implementation("com.h2database:h2:1.4.200")
implementation("org.jetbrains.exposed:exposed-core:0.31.1")
implementation("org.jetbrains.exposed:exposed-dao:0.31.1")
implementation("org.jetbrains.exposed:exposed-jdbc:0.31.1")
@ -64,6 +64,12 @@ dependencies {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
dependsOn("copySinglePageApp")
}
tasks.register<Copy>("copySinglePageApp") {
from("../spa/build")
into(layout.buildDirectory.dir("resources/main/spa"))
}
application {

View File

@ -21,14 +21,23 @@ private var playersCache = ""
private var playersCacheTimestamp = Instant.now()
fun initApiServer(apiServerPort: Int, database: Database) {
val app = Javalin.create().start(apiServerPort)
println("Javalin web server started")
val app =
Javalin.create { config ->
config.enableCorsForAllOrigins()
config.addStaticFiles("./spa")
config.addStaticFiles("/")
config.addSinglePageRoot("/", "./spa")
config.enforceSsl = false
config.ignoreTrailingSlashes = true
}
.start(apiServerPort)
app.get("api/statistics") { ctx ->
run {
if (statisticsCache.isEmpty() or
(Duration.between(Instant.now(), statisticsCacheTimestamp) >
Duration.ofHours(1))) {
(Duration.between(Instant.now(), statisticsCacheTimestamp) >
Duration.ofHours(1))
) {
transaction(database) {
addLogger(StdOutSqlLogger)
@ -58,7 +67,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
LiveStatistics.name,
LiveStatistics.playerId,
LiveStatistics.value,
LiveStatistics.rank)
LiveStatistics.rank
)
.select {
LiveStatistics.type.eq(ctx.pathParam("type")) and
LiveStatistics.name.eq(ctx.pathParam("name"))
@ -70,7 +80,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
it[LiveStatistics.type],
it[LiveStatistics.name],
it[LiveStatistics.value],
it[LiveStatistics.rank])
it[LiveStatistics.rank]
)
}
ctx.result(Json { prettyPrint = true }.encodeToString(statistics))
@ -81,8 +92,9 @@ fun initApiServer(apiServerPort: Int, database: Database) {
app.get("api/players") { ctx ->
run {
if (playersCache.isEmpty() or
(Duration.between(Instant.now(), playersCacheTimestamp) >
Duration.ofHours(1))) {
(Duration.between(Instant.now(), playersCacheTimestamp) >
Duration.ofHours(1))
) {
transaction(database) {
addLogger(StdOutSqlLogger)
@ -111,7 +123,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
LiveStatistics.name,
LiveStatistics.playerId,
LiveStatistics.value,
LiveStatistics.rank)
LiveStatistics.rank
)
.select { LiveStatistics.playerId.eq(ctx.pathParam("playerId")) }
.map {
StatisticValue(
@ -119,7 +132,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
it[LiveStatistics.type],
it[LiveStatistics.name],
it[LiveStatistics.value],
it[LiveStatistics.rank])
it[LiveStatistics.rank]
)
}
ctx.result(Json { prettyPrint = true }.encodeToString(statistics))
@ -137,7 +151,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
Statistics.name,
Statistics.playerId,
Statistics.timestamp,
Statistics.value)
Statistics.value
)
.select {
Statistics.playerId.eq(ctx.pathParam("playerId")) and
Statistics.type.eq(ctx.pathParam("type")) and
@ -150,13 +165,18 @@ fun initApiServer(apiServerPort: Int, database: Database) {
it[Statistics.type],
it[Statistics.name],
it[Statistics.timestamp].toString(),
it[Statistics.value])
it[Statistics.value]
)
}
ctx.result(Json { prettyPrint = true }.encodeToString(statistics))
}
}
}
app.get("api/*") { ctx -> ctx.status(404) }
println("Javalin web server started")
}
@Serializable data class Statistic(val type: String, val name: String)

23
spa/.gitignore vendored 100644
View File

@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*

70
spa/README.md 100644
View File

@ -0,0 +1,70 @@
# Getting Started with Create React App
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
In the project directory, you can run:
### `yarn start`
Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
The page will reload if you make edits.\
You will also see any lint errors in the console.
### `yarn test`
Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `yarn build`
Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `yarn eject`
**Note: this is a one-way operation. Once you `eject`, you cant go back!**
If you arent satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point youre on your own.
You dont have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldnt feel obligated to use this feature. However we understand that this tool wouldnt be useful if you couldnt customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
### Analyzing the Bundle Size
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
### Making a Progressive Web App
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
### Advanced Configuration
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
### Deployment
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
### `yarn build` fails to minify
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

17081
spa/package-lock.json generated 100644

File diff suppressed because it is too large Load Diff

47
spa/package.json 100644
View File

@ -0,0 +1,47 @@
{
"name": "spa",
"version": "0.1.0",
"private": true,
"dependencies": {
"@chakra-ui/react": "^1.6.4",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"axios": "^0.21.1",
"chart.js": "^3.4.1",
"chartjs-adapter-date-fns": "^2.0.0",
"date-fns": "^2.22.1",
"framer-motion": "^4.1.17",
"fuse.js": "^6.4.6",
"react": "^17.0.2",
"react-chartjs-2": "^3.0.3",
"react-dom": "^17.0.2",
"react-icons": "^4.2.0",
"react-query": "^3.18.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -0,0 +1,38 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>

View File

@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:

63
spa/src/App.js 100644
View File

@ -0,0 +1,63 @@
import React from "react";
import { useQuery } from "react-query";
import axios from "axios";
import { BrowserRouter, Switch, Redirect, Route } from "react-router-dom";
import { Container } from "@chakra-ui/react";
import Search from "./Search";
import Player from "./Player";
import Statistic from "./Statistic";
const App = () => {
const statistics = useQuery(
"statistics",
async () => {
const { data } = await axios.get("/api/statistics");
return data;
},
{
placeholderData: [],
}
);
const players = useQuery(
"players",
async () => {
const { data } = await axios.get("/api/players");
return data;
},
{
placeholderData: [],
}
);
return (
<Container>
<BrowserRouter>
<Switch>
<Route
path="/statistic/:type/:name"
render={(routeProps) => (
<Statistic
type={routeProps.match.params.type}
name={routeProps.match.params.name}
players={players}
/>
)}
/>
<Route
path="/player/:id"
render={(routeProps) => (
<Player playerId={routeProps.match.params.id} players={players} />
)}
/>
<Route>
<Search statistics={statistics.data} players={players.data} />
</Route>
</Switch>
</BrowserRouter>
</Container>
);
};
export default App;

88
spa/src/Player.js 100644
View File

@ -0,0 +1,88 @@
import React, { useMemo, useState } from "react";
import { useQuery } from "react-query";
import axios from "axios";
import {
Button,
Center,
Flex,
Heading,
Icon,
Image,
Table,
Thead,
Tbody,
Tfoot,
Tr,
Th,
Td,
TableCaption,
} from "@chakra-ui/react";
import { FaUserCircle, FaArrowAltCircleRight } from "react-icons/fa";
import { Link } from "react-router-dom";
const Player = ({ playerId, players }) => {
const playerStats = useQuery(
`player ${playerId}`,
async () => {
const { data } = await axios.get(`/api/players/${playerId}`);
data.sort((a, b) => a.rank - b.rank);
return data;
},
{
placeholderData: [],
}
);
const playerDict = useMemo(() => {
return Object.assign({}, ...players.data.map((x) => ({ [x.id]: x.name })));
}, players);
return (
<>
<Heading as="h2" size="4xl" my="8">
<Link to="/">
<Center>📈</Center>
</Link>
</Heading>
<Heading as="h3" size="sm" mt="8" fontWeight="normal">
Stonks for
</Heading>
<Heading as="h1" size="xl" mb="8">
<Image
display="inline"
width="48px"
height="48px"
src={`https://minotar.net/avatar/${playerId.replaceAll("-", "")}/48`}
mr="4"
/>
{playerDict[playerId]}
</Heading>
<Table variant="simple" size="sm" variant="striped">
<Thead>
<Tr>
<Th>Statistic</Th>
<Th isNumeric>Rank</Th>
<Th isNumeric>Value</Th>
</Tr>
</Thead>
<Tbody>
{playerStats.data.map((x, i) => {
return (
<Tr key={i}>
<Td>
<Link to={`/statistic/${x.type}/${x.name}`}>
{x.type} {x.name}
</Link>
</Td>
<Td isNumeric>{x.rank}</Td>
<Td isNumeric>{x.value}</Td>
</Tr>
);
})}
</Tbody>
</Table>
</>
);
};
export default Player;

93
spa/src/Search.js 100644
View File

@ -0,0 +1,93 @@
import React, { useMemo, useState } from "react";
import Fuse from "fuse.js";
import { Button, Center, Flex, Heading, Icon, Input } from "@chakra-ui/react";
import { FaUserCircle, FaArrowAltCircleRight } from "react-icons/fa";
import { Link } from "react-router-dom";
const Search = ({ statistics, players }) => {
const [searchTerm, setSearchTerm] = useState("");
const searchEngine = useMemo(() => {
const fullList = statistics
.map((s) => {
return {
type: "statistic",
value: s,
searchTerm: `${s.type} ${s.name}`,
};
})
.concat(
players.map((p) => {
return {
type: "player",
value: p,
searchTerm: p.name,
};
})
);
return new Fuse(fullList, {
minMatchCharLength: 3,
ignoreLocation: true,
shouldSort: true,
keys: ["searchTerm"],
});
}, [statistics, players]);
const searchResults = useMemo(() => {
return searchEngine.search(`'"${searchTerm}"'`);
}, [searchEngine, searchTerm]);
return (
<>
<Heading as="h1" size="4xl" my="8">
<Center>📈</Center>
</Heading>
<Input
placeholder="Find statistics or players"
size="lg"
variant="filled"
value={searchTerm}
onChange={(event) => setSearchTerm(event.target.value)}
/>
<Flex direction="column" align="stretch" my="4">
{searchResults.map((x, i) => {
return (
<Link
to={
x.item.type === "player"
? `/${x.item.type}/${x.item.value.id}`
: `/${x.item.type}/${x.item.value.type}/${x.item.value.name}`
}
>
<Button
key={i}
size="sm"
leftIcon={
x.item.type === "player" ? (
<Icon as={FaUserCircle} />
) : (
<Icon
as={FaArrowAltCircleRight}
transform="rotate(-45deg)"
/>
)
}
variant="ghost"
my="0.5"
display="block"
textAlign="left"
width="100%"
>
{x.item.searchTerm}
</Button>
</Link>
);
})}
</Flex>
</>
);
};
export default Search;

View File

@ -0,0 +1,80 @@
import React, { useMemo, useState } from "react";
import { useQuery } from "react-query";
import axios from "axios";
import {
Button,
Center,
Flex,
Heading,
Icon,
Input,
Table,
Thead,
Tbody,
Tfoot,
Tr,
Th,
Td,
TableCaption,
} from "@chakra-ui/react";
import { FaUserCircle, FaArrowAltCircleRight } from "react-icons/fa";
import { Link } from "react-router-dom";
const Statistic = ({ type, name, players }) => {
const ranking = useQuery(
`statistic ${type} ${name}`,
async () => {
const { data } = await axios.get(`/api/statistics/${type}/${name}`);
return data;
},
{
placeholderData: [],
}
);
const playerDict = useMemo(() => {
return Object.assign({}, ...players.data.map((x) => ({ [x.id]: x.name })));
}, players);
return (
<>
<Heading as="h1" size="4xl" my="8">
<Link to="/">
<Center>📈</Center>
</Link>
</Heading>
<Heading as="h3" size="sm" mt="8" fontWeight="normal">
Stonks for
</Heading>
<Heading as="h1" size="xl" mb="8">
{type} {name}
</Heading>
<Table variant="simple" size="sm" variant="striped">
<Thead>
<Tr>
<Th>Player</Th>
<Th isNumeric>Rank</Th>
<Th isNumeric>Value</Th>
</Tr>
</Thead>
<Tbody>
{ranking.data.map((x, i) => {
return (
<Tr key={i}>
<Td>
<Link to={`/player/${x.playerId}`}>
{playerDict[x.playerId]}
</Link>
</Td>
<Td isNumeric>{x.rank}</Td>
<Td isNumeric>{x.value}</Td>
</Tr>
);
})}
</Tbody>
</Table>
</>
);
};
export default Statistic;

13
spa/src/index.css 100644
View File

@ -0,0 +1,13 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
monospace;
}

28
spa/src/index.js 100644
View File

@ -0,0 +1,28 @@
import { ChakraProvider, ColorModeScript, extendTheme } from "@chakra-ui/react";
import React from "react";
import ReactDOM from "react-dom";
import { QueryClient, QueryClientProvider } from "react-query";
import App from "./App.js";
import "./index.css";
const queryClient = new QueryClient();
const config = {
initialColorMode: "light",
useSystemColorMode: false,
};
const theme = extendTheme(config);
ReactDOM.render(
<React.StrictMode>
<ColorModeScript initialColorMode={theme.config.initialColorMode} />
<QueryClientProvider client={queryClient}>
<ChakraProvider resetCSS={true} theme={theme}>
<App />
</ChakraProvider>
</QueryClientProvider>
</React.StrictMode>,
document.getElementById("root")
);

1
spa/src/logo.svg 100644
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -0,0 +1,5 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom';

11407
spa/yarn.lock 100644

File diff suppressed because it is too large Load Diff