Skip to content

Commit 24d35ee

Browse files
committed
update student component
1 parent e8c2ede commit 24d35ee

3 files changed

Lines changed: 44 additions & 37 deletions

File tree

‎front/src/pods/student/student.component.tsx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React from 'react';
2-
import * as classes from './student.styles';
3-
// Material UI ~ components
42
import TextareaAutosize from '@material-ui/core/TextareaAutosize';
53
import Typography from '@material-ui/core/Typography';
4+
import * as innerClasses from './student.styles';
65

76
interface Props {
87
room: string;
@@ -11,22 +10,25 @@ interface Props {
1110

1211
export const StudentComponent: React.FC<Props> = props => {
1312
const { room, log } = props;
14-
const { mainContainer, sessionName, studentBoard, labelTextarea } = classes;
1513

1614
return (
1715
<>
18-
<main className={mainContainer}>
19-
<Typography className={sessionName} variant="body1" role="heading">
16+
<main className={innerClasses.root}>
17+
<Typography
18+
className={innerClasses.sessionName}
19+
variant="body1"
20+
role="heading"
21+
>
2022
Session name: {room ?? ''}
2123
</Typography>
22-
<label className={labelTextarea} htmlFor="session">
24+
<label className={innerClasses.label} htmlFor="session">
2325
Content
2426
</label>
2527
<TextareaAutosize
2628
id="session"
2729
rowsMax={30}
2830
rowsMin={30}
29-
className={studentBoard}
31+
className={innerClasses.textarea}
3032
value={log ?? ''}
3133
/>
3234
</main>

‎front/src/pods/student/student.styles.ts‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,44 @@ import { theme } from 'core/theme';
44
const { typography, spacing, palette, breakpoints } = theme;
55
const color = palette.customPalette;
66

7-
export const mainContainer = css`
8-
width: 60%;
9-
margin: ${spacing(10)} auto;
10-
@media (max-width: ${breakpoints.values.lg}px) {
11-
width: 80%;
7+
export const root = css`
8+
display: grid;
9+
grid-template-columns: auto;
10+
grid-row-gap: 1rem;
11+
grid-column-gap: 1rem;
12+
padding: 1rem;
13+
14+
@media (min-width: ${breakpoints.values.md}px) {
15+
padding: 2rem;
16+
grid-template-columns: 1fr 6fr 1fr;
17+
& > :nth-child(n) {
18+
grid-column-start: 2;
19+
grid-column-end: 3;
20+
}
21+
}
22+
23+
@media (min-width: ${breakpoints.values.lg}px) {
24+
grid-template-columns: 1fr 4fr 1fr;
25+
}
26+
`;
27+
28+
export const sessionName = css`
29+
@media (min-width: ${breakpoints.values.md}px) {
30+
justify-self: start;
1231
}
32+
font-size: 1.125rem;
33+
text-align: center;
34+
border-bottom: 2px solid ${color.primary};
35+
`;
36+
37+
export const label = css`
38+
display: block;
39+
font-family: ${typography.fontFamily};
40+
font-size: 1.125rem;
1341
`;
1442

15-
export const studentBoard = css`
43+
export const textarea = css`
1644
box-sizing: border-box;
17-
width: 100%;
18-
margin-top: ${spacing(1.25)};
19-
margin-bottom: ${spacing(1.25)};
2045
padding: ${spacing(2)};
2146
font-family: ${typography.fontFamily};
2247
font-size: 1rem;
@@ -28,18 +53,3 @@ export const studentBoard = css`
2853
outline: none;
2954
}
3055
`;
31-
32-
export const labelTextarea = css`
33-
display: block;
34-
font-family: ${typography.fontFamily};
35-
font-size: 1.125rem;
36-
`;
37-
38-
export const sessionName = css`
39-
display: inline-block;
40-
margin-bottom: ${spacing(5)};
41-
padding-bottom: ${spacing(0.625)};
42-
font-size: 1.125rem;
43-
text-align: center;
44-
border-bottom: 2px solid ${color.primary};
45-
`;

‎front/src/pods/trainer/trainer.styles.ts‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const { breakpoints, palette } = theme;
55
const color = palette.customPalette;
66

77
export const root = css`
8-
width: 100%;
98
display: grid;
109
grid-template-columns: 1fr;
1110
grid-row-gap: 1rem;
@@ -17,10 +16,6 @@ export const root = css`
1716
padding: 1rem;
1817
}
1918
20-
& > :last-child {
21-
padding-bottom: 2rem;
22-
}
23-
2419
@media (min-width: ${breakpoints.values.md}px) {
2520
grid-template-columns: 1fr 6fr 1fr;
2621
& > :nth-child(n) {
@@ -30,7 +25,7 @@ export const root = css`
3025
}
3126
3227
@media (min-width: ${breakpoints.values.lg}px) {
33-
grid-template-columns: 1fr 5fr 1fr;
28+
grid-template-columns: 1fr 4fr 1fr;
3429
}
3530
`;
3631

0 commit comments

Comments
 (0)