Skip to content

Commit 9a4a93f

Browse files
committed
now theme is working
1 parent 6c71a46 commit 9a4a93f

File tree

3 files changed

+199
-182
lines changed

3 files changed

+199
-182
lines changed

src/App.js

Lines changed: 84 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,43 @@
1+
import { useEffect, useState } from "react";
12
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
3+
4+
import { createTheme, ThemeProvider } from '@material-ui/core/styles';
5+
import CssBaseline from '@material-ui/core/CssBaseline';
6+
import {
7+
lightBlue,
8+
blueGrey,
9+
deepOrange,
10+
yellow,
11+
} from "@material-ui/core/colors";
12+
213
import PredictionPage from "./prediction";
314
import AnalysisPage from "./analysis";
415
import Layout from "./components/Layout";
5-
import { useEffect, useState } from "react";
616
import api from "./lib/api";
717

818
function App() {
19+
const [darkState, setDarkState] = useState(false);
20+
const palletType = darkState ? "dark" : "light";
21+
const mainPrimaryColor = darkState ? blueGrey[800] : lightBlue[800];
22+
const mainSecondaryColor = darkState ? deepOrange[400] : yellow[800];
23+
const theme = createTheme({
24+
palette: {
25+
type: palletType,
26+
primary: {
27+
main: mainPrimaryColor,
28+
},
29+
secondary: {
30+
main: mainSecondaryColor,
31+
},
32+
contrastThreshold: 3,
33+
tonalOffset: 0.2,
34+
},
35+
});
36+
37+
const handleThemeChange = () => {
38+
setDarkState(!darkState);
39+
};
40+
941
const [rank, setRank] = useState("");
1042
const [showresult, setShowresult] = useState(false);
1143
const [collegeList, setCollegeList] = useState([]);
@@ -56,52 +88,57 @@ function App() {
5688
}, [selectedCollege]);
5789

5890
return (
59-
<Router>
60-
<div>
61-
<Layout
62-
collegeList={collegeList}
63-
facultyList={facultyList}
64-
selectedCollege={selectedCollege}
65-
selectedFaculty={selectedFaculty}
66-
setSelectedCollege={handleCollegeSelect}
67-
setSelectedFaculty={setSelectedFaculty}
68-
setShowResult={setShowresult}
69-
showResult={showresult}
70-
>
71-
<Switch>
72-
<Route path="/" exact>
73-
<PredictionPage
74-
selectedCollege={selectedCollege}
75-
selectedFaculty={selectedFaculty}
76-
rank={rank}
77-
setRank={setRank}
78-
setShowResult={setShowresult}
79-
showResult={showresult}
80-
/>
81-
</Route>
82-
<Route path="/predict" exact>
83-
<PredictionPage
84-
selectedCollege={selectedCollege}
85-
selectedFaculty={selectedFaculty}
86-
rank={rank}
87-
setRank={setRank}
88-
setShowResult={setShowresult}
89-
showResult={showresult}
90-
/>
91-
</Route>
92-
<Route path="/analyse" exact>
93-
<AnalysisPage
94-
selectedCollege={selectedCollege}
95-
selectedFaculty={selectedFaculty}
96-
/>
97-
</Route>
98-
<Route>
99-
<h1>404</h1>
100-
</Route>
101-
</Switch>
102-
</Layout>
103-
</div>
104-
</Router>
91+
<ThemeProvider theme={theme}>
92+
<CssBaseline />
93+
<Router>
94+
<div>
95+
<Layout
96+
collegeList={collegeList}
97+
facultyList={facultyList}
98+
selectedCollege={selectedCollege}
99+
selectedFaculty={selectedFaculty}
100+
setSelectedCollege={handleCollegeSelect}
101+
setSelectedFaculty={setSelectedFaculty}
102+
setShowResult={setShowresult}
103+
showResult={showresult}
104+
darkState={darkState}
105+
handleThemeChange={handleThemeChange}
106+
>
107+
<Switch>
108+
<Route path="/" exact>
109+
<PredictionPage
110+
selectedCollege={selectedCollege}
111+
selectedFaculty={selectedFaculty}
112+
rank={rank}
113+
setRank={setRank}
114+
setShowResult={setShowresult}
115+
showResult={showresult}
116+
/>
117+
</Route>
118+
<Route path="/predict" exact>
119+
<PredictionPage
120+
selectedCollege={selectedCollege}
121+
selectedFaculty={selectedFaculty}
122+
rank={rank}
123+
setRank={setRank}
124+
setShowResult={setShowresult}
125+
showResult={showresult}
126+
/>
127+
</Route>
128+
<Route path="/analyse" exact>
129+
<AnalysisPage
130+
selectedCollege={selectedCollege}
131+
selectedFaculty={selectedFaculty}
132+
/>
133+
</Route>
134+
<Route>
135+
<h1>404</h1>
136+
</Route>
137+
</Switch>
138+
</Layout>
139+
</div>
140+
</Router>
141+
</ThemeProvider>
105142
);
106143
}
107144

src/components/Dropdown.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@ import Select from "@material-ui/core/Select";
66
import MenuItem from "@material-ui/core/MenuItem";
77

88
const useStyles = makeStyles((theme) => ({
9-
margin: {
9+
form: {
1010
margin: theme.spacing(2, 4),
1111
},
12+
title:{
13+
fontSize: "1.1rem",
14+
},
15+
fields:{
16+
fontSize: "1.2rem",
17+
paddingTop:"0.5rem",
18+
},
1219
}));
1320

1421
export default function CustomizedSelects({
@@ -25,12 +32,12 @@ export default function CustomizedSelects({
2532
<div style={{ width: "70%" }}>
2633
<FormControl
2734
fullWidth={true}
28-
className={classes.margin}
35+
className={classes.form}
2936
>
30-
<InputLabel color="secondary" disableAnimation style={{ fontSize: "1.3rem" }}>
37+
<InputLabel color="secondary" disableAnimation className={classes.title}>
3138
{type.toUpperCase()}
3239
</InputLabel>
33-
<Select
40+
<Select className={classes.fields}
3441
id="demo-customized-select-native"
3542
value={selected}
3643
onChange={handleChange}

0 commit comments

Comments
 (0)