Skip to content

Commit db4d115

Browse files
MichaelCSnyderMichaelCSnyder
authored
Merge pull request #60 from oslabs-beta/mx/testingBranch
Mx/testing branch
2 parents 84a124b + 5b1ae0f commit db4d115

17 files changed

+1551
-41
lines changed

‎ksqLight/package-lock.json

Lines changed: 901 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ksqLight/package.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44
"private": true,
55
"dependencies": {
66
"@electron/remote": "^2.0.8",
7+
"@emotion/react": "^11.9.3",
8+
"@emotion/styled": "^11.9.3",
9+
"@mui/icons-material": "^5.8.4",
10+
"@mui/material": "^5.9.0",
711
"@testing-library/jest-dom": "^5.16.4",
812
"@testing-library/react": "^13.3.0",
913
"@testing-library/user-event": "^13.5.0",
14+
"clsx": "^1.2.1",
1015
"concurrently": "^7.2.2",
1116
"cross-env": "^7.0.3",
1217
"electron": "^19.0.6",
1318
"ksqldb-js": "^1.1.0",
1419
"react": "^18.2.0",
1520
"react-dom": "^18.2.0",
21+
"react-router-dom": "^6.3.0",
1622
"react-scripts": "5.0.1",
1723
"wait-on": "^6.0.1",
1824
"web-vitals": "^2.1.4"
@@ -45,5 +51,10 @@
4551
"last 1 firefox version",
4652
"last 1 safari version"
4753
]
54+
},
55+
"devDependencies": {
56+
"autoprefixer": "^10.4.7",
57+
"postcss": "^8.4.14",
58+
"tailwindcss": "^3.1.4"
4859
}
49-
}
60+
}

‎ksqLight/postcss.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
plugins: {
3+
tailwindcss: {},
4+
autoprefixer: {},
5+
},
6+
}

‎ksqLight/public/favicon.ico

-3.78 KB
Binary file not shown.

‎ksqLight/public/index.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
85
<meta
96
name="description"
10-
content="Web site created using create-react-app"
7+
content="ksqLight"
118
/>
12-
<title>React App</title>
9+
<link rel="preconnect" href="https://fonts.googleapis.com">
10+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
11+
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"/>
12+
<link href="https://fonts.googleapis.com/css2?family=Cabin:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&family=Oswald:wght@200;300;400;500;600;700&family=Raleway:wght@500&display=swap" rel="stylesheet">
13+
<meta name="viewport" content="width=device-width, initial-scale=1" />
14+
<meta name="theme-color" content="#000000" />
1315
</head>
1416
<body>
1517
<div id="root"></div>

‎ksqLight/public/logo192.png

-5.22 KB
Binary file not shown.

‎ksqLight/public/logo512.png

-9.44 KB
Binary file not shown.

‎ksqLight/src/App.css

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ksqLight/src/App.js

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
1-
2-
import './App.css';
1+
import React from "react";
2+
import { useState } from "react";
3+
import { BrowserRouter, Routes, Route } from "react-router-dom";
4+
import { Header } from "./components/Header.js";
5+
import { Homepage } from "./components/Homepage.js";
6+
import { SettingsSidebar } from "./components/SettingsSidebar.js";
7+
import { PermanentDrawer } from "./components/PermanentDrawer.js";
8+
import { QueryPage } from "./components/QueryPage.js";
9+
import { CssBaseline } from "@mui/material";
310

411
function App() {
12+
const [fetchMetrics, setFetchMetrics] = useState(true);
13+
const [showSettings, setShowSettings] = useState(false);
14+
515
return (
6-
<div className="App">
7-
<header className="App-header">
8-
<p>
9-
Edit <code>src/App.js</code> and save to reload.
10-
</p>
11-
<a
12-
className="github-link"
13-
href="https://github.com/oslabs-beta/ksqljs/"
14-
target="_blank"
15-
rel="noopener noreferrer"
16-
>
17-
Check our Github!
18-
</a>
19-
</header>
20-
</div>
16+
<BrowserRouter>
17+
<CssBaseline/>
18+
<Header fetchMetrics={fetchMetrics} setFetchMetrics={setFetchMetrics} showSettings={showSettings} setShowSettings={setShowSettings}/>
19+
<SettingsSidebar showSettings={showSettings} setShowSettings={setShowSettings}></SettingsSidebar>
20+
<PermanentDrawer></PermanentDrawer>
21+
<Routes>
22+
<Route path="/" element={<Homepage/>}/>
23+
<Route path="/queryPage" element={<QueryPage/>}/>
24+
</Routes>
25+
</BrowserRouter>
26+
2127
);
2228
}
2329

2430
export default App;
31+
32+
//PaperProps={{ style: { height: "90vh" } }} <- in Drawer

‎ksqLight/src/components/Chart.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import React from "react";
2+
import { Grid, Typography } from "@mui/material";
3+
4+
export const Chart = ({ content }) => {
5+
6+
return (
7+
<Grid item xs={3}>
8+
<Typography color="primary">{content}</Typography>
9+
</Grid>
10+
)
11+
}

0 commit comments

Comments
 (0)