diff --git a/client/src/App.tsx b/client/src/App.tsx index cfade88..4adecdb 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -14,6 +14,8 @@ import { useLocation, Redirect } from "react-router-dom"; +import { Typography } from '@material-ui/core'; +import Mockup from './components/Mockup'; const JSURL = require('jsurl'); @@ -121,11 +123,15 @@ function AppBody() { ); } +function AppMockup() { + return +} + function App() { return ( - + ); diff --git a/client/src/components/Mockup.tsx b/client/src/components/Mockup.tsx new file mode 100644 index 0000000..44e8bd6 --- /dev/null +++ b/client/src/components/Mockup.tsx @@ -0,0 +1,147 @@ +import React from 'react'; +import { makeStyles, createMuiTheme, ThemeProvider } from '@material-ui/core/styles'; +import Table from '@material-ui/core/Table'; +import TableBody from '@material-ui/core/TableBody'; +import TableCell from '@material-ui/core/TableCell'; +import TableContainer from '@material-ui/core/TableContainer'; +import TableHead from '@material-ui/core/TableHead'; +import TableRow from '@material-ui/core/TableRow'; +import Paper from '@material-ui/core/Paper'; +import Box from '@material-ui/core/Box'; +import SearchIcon from '@material-ui/icons/Search'; +import { IconButton, Button, Typography, Chip, Link, Card, CardContent, CssBaseline } from '@material-ui/core'; + +export function MockTable() { + + const rows = [ + ['No One Knows', "Queens of the Stone Age", "Blabla", "Tag"], + ['Ice cream sandwich', "My man", "What?", 37], + ['Eclair', "George Baker", "Bakeroo", 24], + ['Cupcake', "The Sweetie Pies", "Bla", "Bloo"], + ['Gingerbread', "Is ahead", "But you'll get", "Vury fet"], + ]; + + const useTableStyles = makeStyles({ + table: { + minWidth: 650, + }, + }); + const classes = useTableStyles(); + + return ( + + + + + Title + Artist + Album + Tags + + + + {rows.map((row) => ( + + {row[0]} + {row[1]} + {row[2]} + {row[3]} + + ))} + +
+
+ ); +} + +export function QueryContainer(props: any) { + return + {props.children} + +} + +export function QueryElem(props: any) { + return <> + + +} + +export function QueryBar() { + return + + + + + + + + + + + + By Queens of the Stone Age + + + + And + + + + Released before 2020 + + + + + + + + Or + + + + + Genre: "Awesome" + + + + +} + +function MockupBody() { + return <> + + + + + + + + + + + + + +} + + +const darkTheme = createMuiTheme({ + palette: { + type: 'dark' + }, +}); + +export default function Mockup() { + return <> + + + + + +} \ No newline at end of file diff --git a/server/knexfile.ts b/server/knexfile.ts index 18d26c5..1377c10 100644 --- a/server/knexfile.ts +++ b/server/knexfile.ts @@ -12,6 +12,6 @@ export default > { // In production, we base the config on an environment // variable setting. - production: JSON.parse(process.env.MUDBASE_DB_CONFIG || "") + production: JSON.parse(process.env.MUDBASE_DB_CONFIG || "{}") };