Skip to content

Commit 0753a8d

Browse files
committed
WelcomePage: исправление стилей
1 parent 8294a98 commit 0753a8d

3 files changed

Lines changed: 20 additions & 12 deletions

File tree

hwproj.front/src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import PasswordRecovery from "components/Auth/PasswordRecovery";
2424
import AuthLayout from "./AuthLayout";
2525
import ExpertAuthLayout from "./components/Experts/AuthLayout";
2626
import TrackPageChanges from "TrackPageChanges";
27-
import PromoPage from "./pages/PromoPage";
27+
import WelcomePage from "./pages/WelcomePage";
2828

2929
// TODO: add flux
3030

@@ -128,7 +128,7 @@ class App extends Component<{ navigate: any }, AppState> {
128128
<Route path="recovery" element={<PasswordRecovery/>}/>
129129
<Route path="resetPassword" element={<ResetPassword/>}/>
130130
<Route path="join/:token" element={<ExpertAuthLayout onLogin={this.login}/>}/>
131-
<Route path="/welcome" element={<PromoPage/>}/>
131+
<Route path="/welcome" element={<WelcomePage/>}/>
132132
<Route path={"*"} element={<WrongPath/>}/>
133133
</Routes>
134134
<div style={{marginBottom: 10}}/>

hwproj.front/src/components/AppBar.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,13 @@ export const Header: React.FC<AppBarProps> = (props: AppBarProps) => {
144144
color="inherit"
145145
component={Link}
146146
to="/login"
147-
style={{ marginRight: 8 }}
147+
sx={{"&:hover": {color: "white"}}}
148148
>
149149
Вход
150150
</Button>
151-
<Button color="inherit" component={Link} to="/register">
151+
<Button color="inherit" component={Link}
152+
sx={{"&:hover": {color: "white"}}}
153+
to="/register">
152154
Регистрация
153155
</Button>
154156
</div>
Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
Paper,
2222
} from "@mui/material";
2323

24-
const PromoPage: React.FC = () => {
24+
const WelcomePage: React.FC = () => {
2525
const [userType, setUserType] = useState<"student" | "lecturer" | "expert">(
2626
"student",
2727
);
@@ -115,7 +115,7 @@ const PromoPage: React.FC = () => {
115115
<Box
116116
sx={{
117117
bgcolor: "#e3f2fd",
118-
py: { xs: 8, md: 8 },
118+
py: { xs: 4, md: 4 },
119119
textAlign: "center",
120120
}}
121121
>
@@ -136,7 +136,7 @@ const PromoPage: React.FC = () => {
136136
variant="h5"
137137
color="text.secondary"
138138
paragraph
139-
sx={{ mb: 4, fontSize: { xs: "1rem", md: "1.5rem" } }}
139+
sx={{ fontSize: { xs: "1rem", md: "1.5rem" } }}
140140
>
141141
Веб-сервис, который помогает автоматизировать учебный процесс и
142142
упростить взаимодействие между студентами, преподавателями и
@@ -181,9 +181,15 @@ const PromoPage: React.FC = () => {
181181
},
182182
}}
183183
>
184-
<ToggleButton value="student">Студентам</ToggleButton>
185-
<ToggleButton value="lecturer">Преподавателям</ToggleButton>
186-
<ToggleButton value="expert">Экспертам</ToggleButton>
184+
<ToggleButton
185+
sx={{ fontSize: "1.1rem", textTransform: "none"}}
186+
value="student">Студентам</ToggleButton>
187+
<ToggleButton
188+
sx={{ fontSize: "1.1rem", textTransform: "none"}}
189+
value="lecturer">Преподавателям</ToggleButton>
190+
<ToggleButton
191+
sx={{ fontSize: "1.1rem", textTransform: "none"}}
192+
value="expert">Экспертам</ToggleButton>
187193
</ToggleButtonGroup>
188194
</Box>
189195
</Grid>
@@ -316,7 +322,7 @@ const PromoPage: React.FC = () => {
316322
fontSize: "1.1rem",
317323
textTransform: "none",
318324
borderRadius: "8px",
319-
"&:hover": { bgcolor: "#1565c0" },
325+
"&:hover": { bgcolor: "#3f51b5", color: "white" },
320326
}}
321327
>
322328
Присоединиться
@@ -327,4 +333,4 @@ const PromoPage: React.FC = () => {
327333
);
328334
};
329335

330-
export default PromoPage;
336+
export default WelcomePage;

0 commit comments

Comments
 (0)