Skip to content

Commit

Permalink
feat #131 #120 home page, footer and request form, feedback form, and…
Browse files Browse the repository at this point in the history
… contact us form
  • Loading branch information
redet-G committed Nov 22, 2024
1 parent 8277bee commit 813d916
Show file tree
Hide file tree
Showing 15 changed files with 965 additions and 103 deletions.
68 changes: 64 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
"react-leaflet": "^4.2.1",
"react-router-dom": "^6.23.0",
"react-scripts": "latest",
"react-slick": "^0.30.2",
"regression": "^2.0.1",
"science": "^1.9.3",
"slick-carousel": "^1.8.1",
"xlsx": "^0.18.5"
},
"browserslist": {
Expand Down
Binary file added public/gemechu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/mesud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 21 additions & 10 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,18 @@ import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
import Link from "@mui/material/Link";
import Dashboard from "./Components/Dashboard";
import RequestForm from "./Components/RequestForm";
import RequestForm from "./Pages/RequestForm";
import useInstallPrompt from "./hooks/useInstallPrompt";
import useServiceWorker from "./hooks/useServiceWorker";
import ReactGA from "react-ga4";
import Home from "./Pages/Home";
import ThemeProvider from "@mui/material/styles/ThemeProvider";
import { createTheme } from "@mui/material/styles";
import FeedBack from "./Pages/Feedback";
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";
// TODO remove, this demo shouldn't need to reset the theme.
const defaultTheme = createTheme();

export default function App() {
const GAKey = process.env.REACT_APP_GA_ID;
Expand All @@ -22,14 +30,17 @@ export default function App() {
useServiceWorker();

return (
<div>
<Router>
<Routes>
<Route path="/" element={<Dashboard />} />
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/request-form" element={<RequestForm />} />
</Routes>
</Router>
</div>
<ThemeProvider theme={defaultTheme}>
<div>
<Router>
<Routes>
<Route path="/" element={<Home />} />
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/request-form" element={<RequestForm />} />
<Route path="/feedback" element={<FeedBack />} />
</Routes>
</Router>
</div>
</ThemeProvider>
);
}
47 changes: 47 additions & 0 deletions src/Components/AppBar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
const drawerWidth = 240;

const AppBar = styled(MuiAppBar, {
shouldForwardProp: (prop) => prop !== "open",
})(({ theme, open }) => ({
zIndex: theme.zIndex.drawer + 1,
transition: theme.transitions.create(["width", "margin"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
...(open && {
marginLeft: drawerWidth,
width: `calc(100% - ${drawerWidth}px)`,
transition: theme.transitions.create(["width", "margin"], {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
}),
}));

const Drawer = styled(MuiDrawer, {
shouldForwardProp: (prop) => prop !== "open",
})(({ theme, open }) => ({
"& .MuiDrawer-paper": {
position: "relative",
whiteSpace: "nowrap",
width: drawerWidth,
transition: theme.transitions.create("width", {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.enteringScreen,
}),
boxSizing: "border-box",
...(!open && {
overflowX: "hidden",
transition: theme.transitions.create("width", {
easing: theme.transitions.easing.sharp,
duration: theme.transitions.duration.leavingScreen,
}),
width: theme.spacing(7),
[theme.breakpoints.up("sm")]: {
width: theme.spacing(9),
},
}),
},
}));

export default { AppBar, Drawer };
2 changes: 1 addition & 1 deletion src/Components/Chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
MenuItem,
Paper,
} from "@mui/material";
import DashboardItems from "./DashboardItem";
import { DashboardItems, DashboardItem } from "./DashboardItem";
import Title from "./Title";
import { useSnackbar } from "material-ui-snackbar-provider";
import OrgUnitFilterModal from "./OrgUnitFilterModal";
Expand Down
Loading

0 comments on commit 813d916

Please sign in to comment.