Skip to content

Commit 1e089d7

Browse files
committed
switching branches
1 parent 14754f5 commit 1e089d7

File tree

5 files changed

+105
-40
lines changed

5 files changed

+105
-40
lines changed

ksqLight/package-lock.json

Lines changed: 37 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"react-dom": "^18.2.0",
3030
"react-router-dom": "^6.3.0",
3131
"react-scripts": "5.0.1",
32+
"sass": "^1.54.0",
3233
"wait-on": "^6.0.1",
3334
"web-vitals": "^2.1.4"
3435
},

ksqLight/src/App.js

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { PermanentDrawer } from "./components/PermanentDrawer.js";
88
import { QueryPage } from "./components/QueryPage.js";
99
import { CssBaseline, ThemeProvider, createTheme, Box, Grid } from "@mui/material";
1010
import { LivenessCard } from "./components/LivenessCard.js";
11+
import { Welcomepage } from "./components/Welcomepage.js";
1112

1213
const theme = createTheme({
1314
palette: {
@@ -24,46 +25,47 @@ function App() {
2425

2526

2627
return (
27-
<BrowserRouter>
28-
<ThemeProvider theme={theme}>
29-
<CssBaseline />
30-
<Box sx={{
31-
display: 'flex',
32-
flexDirection: 'column'
33-
}}>
28+
<Welcomepage></Welcomepage>
29+
// <BrowserRouter>
30+
// <ThemeProvider theme={theme}>
31+
// <CssBaseline />
32+
// <Box sx={{
33+
// display: 'flex',
34+
// flexDirection: 'column'
35+
// }}>
3436

35-
<Header fetchMetrics={fetchMetrics} setFetchMetrics={setFetchMetrics} showSettings={showSettings} setShowSettings={setShowSettings} />
36-
<SettingsSidebar showSettings={showSettings} setShowSettings={setShowSettings}></SettingsSidebar>
37-
<Box sx={{ display: 'flex' }}>
38-
<PermanentDrawer
39-
setShowQueries={setShowQueries}
40-
setShowMessages={setShowMessages}
41-
setShowErrors={setShowErrors}
42-
/>
43-
<Box sx={{
44-
display: 'flex',
45-
flexDirection: 'column'
46-
}}>
47-
<Grid container spacing={4} sx={{ display: 'flex', flexDirection: "row", p: 3 }}>
48-
<Grid item xs={4} md={4} lg={4}>
49-
<LivenessCard />
50-
</Grid>
51-
<Grid item xs={4} md={4} lg={4}>
52-
<LivenessCard />
53-
</Grid>
54-
<Grid item xs={4} md={4} lg={4}>
55-
<LivenessCard />
56-
</Grid>
57-
</Grid>
58-
<Routes>
59-
<Route path="/" element={<Homepage showQueries={showQueries} showMessages={showMessages} showErrors={showErrors} />} />
60-
<Route path="/queryPage" element={<QueryPage />} />
61-
</Routes>
62-
</Box>
63-
</Box>
64-
</Box>
65-
</ThemeProvider>
66-
</BrowserRouter >
37+
// <Header fetchMetrics={fetchMetrics} setFetchMetrics={setFetchMetrics} showSettings={showSettings} setShowSettings={setShowSettings} />
38+
// <SettingsSidebar showSettings={showSettings} setShowSettings={setShowSettings}></SettingsSidebar>
39+
// <Box sx={{ display: 'flex' }}>
40+
// <PermanentDrawer
41+
// setShowQueries={setShowQueries}
42+
// setShowMessages={setShowMessages}
43+
// setShowErrors={setShowErrors}
44+
// />
45+
// <Box sx={{
46+
// display: 'flex',
47+
// flexDirection: 'column'
48+
// }}>
49+
// <Grid container spacing={4} sx={{ display: 'flex', flexDirection: "row", p: 3 }}>
50+
// <Grid item xs={4} md={4} lg={4}>
51+
// <LivenessCard />
52+
// </Grid>
53+
// <Grid item xs={4} md={4} lg={4}>
54+
// <LivenessCard />
55+
// </Grid>
56+
// <Grid item xs={4} md={4} lg={4}>
57+
// <LivenessCard />
58+
// </Grid>
59+
// </Grid>
60+
// <Routes>
61+
// <Route path="/" element={<Homepage showQueries={showQueries} showMessages={showMessages} showErrors={showErrors} />} />
62+
// <Route path="/queryPage" element={<QueryPage />} />
63+
// </Routes>
64+
// </Box>
65+
// </Box>
66+
// </Box>
67+
// </ThemeProvider>
68+
// </BrowserRouter >
6769

6870
);
6971
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from "react";
2+
import { Typography, createTheme, Box } from "@mui/material";
3+
import { useNavigate } from "react-router-dom";
4+
5+
export const Welcomepage = () => {
6+
const navigate = useNavigate();
7+
8+
const navHome = () => {
9+
navigate("/dashboard");
10+
};
11+
12+
return (
13+
<Box class="hero">
14+
<Box class="diagonal-hero-bg">
15+
<Box class="stars">
16+
<Box class="small"></Box>
17+
<Box class="medium"></Box>
18+
<Box class="big"></Box>
19+
</Box>
20+
</Box>
21+
</Box>
22+
);
23+
};
24+

ksqLight/src/index.css renamed to ksqLight/src/index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ code {
3838
.header-viewport {
3939
height: calc(100vh - 64px);
4040
}
41-
}
41+
}
42+

0 commit comments

Comments
 (0)