Skip to content

Commit 8c6a985

Browse files
committed
update main component and header styles
1 parent 972a06e commit 8c6a985

9 files changed

Lines changed: 89 additions & 127 deletions

File tree

‎front/src/layout/app-layout.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import React from 'react';
22
import { AppbarComponent, FooterComponent } from 'common-app';
33

44
export const AppLayout: React.FC = props => {
5-
const [showLinks, setShowLinks] = React.useState<boolean>(true);
65
return (
76
<>
8-
<AppbarComponent showLinks={showLinks} />
7+
<AppbarComponent showLinks={true} />
98
{props.children}
10-
<FooterComponent showLinks={showLinks} />
9+
<FooterComponent showLinks={true} />
1110
</>
1211
);
1312
};

‎front/src/layout/session-layout.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import React from 'react';
22
import { AppbarComponent, FooterComponent } from 'common-app';
33

44
export const SessionLayout: React.FC = props => {
5-
const [showLinks, setShowLinks] = React.useState<boolean>(false);
65
return (
76
<>
8-
<AppbarComponent showLinks={showLinks} />
7+
<AppbarComponent showLinks={false} />
98
{props.children}
10-
<FooterComponent showLinks={showLinks} />
9+
<FooterComponent showLinks={false} />
1110
</>
1211
);
1312
};
Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import React from 'react';
2-
import * as classes from './header.styles';
3-
// Material UI ~ components
4-
import TextField from '@material-ui/core/TextField';
2+
import { cx } from 'emotion';
53
import FileCopyOutlinedIcon from '@material-ui/icons/FileCopyOutlined';
4+
import * as innerClasses from './header.styles';
65

76
interface Props {
87
currentTrainerUrl: string;
98
currentStudentUrl: string;
9+
className?: string;
1010
}
1111

1212
export const HeaderComponent: React.FC<Props> = props => {
13-
const { currentStudentUrl, currentTrainerUrl } = props;
14-
const { headerContainer } = classes;
13+
const { currentStudentUrl, currentTrainerUrl, className } = props;
1514

1615
return (
17-
<div className={headerContainer}>
16+
<div className={cx(innerClasses.root, className)}>
1817
<CopyFieldComponent
1918
labelName="Trainer Link"
2019
inputId="trainer-link"
@@ -39,36 +38,29 @@ interface CopyFieldProps {
3938

4039
export const CopyFieldComponent: React.FC<CopyFieldProps> = props => {
4140
const { labelName, inputId, urlLink } = props;
42-
const {
43-
inputField,
44-
label,
45-
inputIconContainer,
46-
textArea,
47-
copyIcon,
48-
copyBtn,
49-
} = classes;
41+
5042
return (
51-
<div className={inputField}>
52-
<label className={label} htmlFor={inputId}>
43+
<>
44+
<label className={innerClasses.label} htmlFor={inputId}>
5345
{labelName}
5446
</label>
55-
<div className={inputIconContainer}>
47+
<div className={innerClasses.inputContainer}>
5648
<input
5749
id={inputId}
5850
type="text"
59-
className={textArea}
51+
className={innerClasses.input}
6052
value={urlLink}
6153
readOnly
6254
aria-readonly
6355
/>
6456
<button
6557
aria-label={`copy ${labelName}`}
66-
className={copyBtn}
58+
className={innerClasses.button}
6759
onClick={() => navigator.clipboard.writeText(urlLink)}
6860
>
69-
<FileCopyOutlinedIcon className={copyIcon} />
61+
<FileCopyOutlinedIcon className={innerClasses.icon} />
7062
</button>
7163
</div>
72-
</div>
64+
</>
7365
);
7466
};

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

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

7-
export const headerContainer = css`
8-
width: 100%;
9-
margin-top: ${spacing(7.5)};
10-
margin-bottom: ${spacing(10)};
11-
`;
12-
13-
export const inputField = css`
14-
margin-bottom: ${spacing(3.75)};
15-
&:last-of-type {
16-
margin-bottom: 0;
17-
}
7+
export const root = css`
8+
display: grid;
9+
grid-row-gap: 1rem;
10+
grid-column-gap: 1rem;
1811
`;
1912

2013
export const label = css`
@@ -23,17 +16,13 @@ export const label = css`
2316
color: ${palette.text.primary};
2417
`;
2518

26-
export const inputIconContainer = css`
19+
export const inputContainer = css`
2720
display: flex;
28-
align-items: center;
29-
width: 100%;
30-
margin-top: ${spacing(1.25)};
21+
flex-direction: row;
3122
`;
3223

33-
export const textArea = css`
24+
export const input = css`
3425
flex: 1;
35-
min-width: 0;
36-
margin-right: 0;
3726
padding: ${spacing(2.25)};
3827
font-family: ${typography.fontFamily};
3928
font-size: 1rem;
@@ -50,20 +39,13 @@ export const textArea = css`
5039
&::selection {
5140
background: ${color.greyMedium};
5241
}
53-
@media (max-width: ${breakpoints.values.xs}px) {
54-
padding: ${spacing(2)};
55-
font-size: 0.875rem;
56-
}
5742
`;
5843

59-
export const copyIcon = css`
44+
export const icon = css`
6045
font-size: 1.875rem;
61-
@media (max-width: ${breakpoints.values.xs}px) {
62-
font-size: 1.625rem;
63-
}
6446
`;
6547

66-
export const copyBtn = css`
48+
export const button = css`
6749
width: ${spacing(7.375)};
6850
height: ${spacing(7.375)};
6951
background-color: ${color.background};

‎front/src/pods/trainer/components/new-text.component.tsx‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
import React from 'react';
2-
import * as classes from './new-text.styles';
3-
// Material UI ~ components
2+
import { cx } from 'emotion';
43
import ArrowForwardRoundedIcon from '@material-ui/icons/ArrowForwardRounded';
54
import Button from '@material-ui/core/Button';
65
import TextareaAutosize from '@material-ui/core/TextareaAutosize';
6+
import * as innerClasses from './new-text.styles';
77

88
interface Props {
99
handleAppendTrainerText: (trainerText: string) => void;
10+
className?: string;
1011
}
1112

1213
export const NewTextComponent: React.FC<Props> = props => {
13-
const { handleAppendTrainerText } = props;
14+
const { handleAppendTrainerText, className } = props;
1415
const [trainerText, setTrainerText] = React.useState<string>('');
15-
const {
16-
newTextContainer,
17-
labelTextarea,
18-
editTextArea,
19-
sendBtn,
20-
sendBtnDisabled,
21-
sendIcon,
22-
} = classes;
2316

2417
const trainerTextRef = React.useRef<string>(trainerText);
2518

@@ -45,29 +38,31 @@ export const NewTextComponent: React.FC<Props> = props => {
4538
}, []);
4639

4740
return (
48-
<div className={newTextContainer}>
41+
<div className={cx(innerClasses.newTextContainer, className)}>
4942
<form>
50-
<label className={labelTextarea} htmlFor="new-text">
43+
<label className={innerClasses.labelTextarea} htmlFor="new-text">
5144
New text
5245
</label>
5346
<TextareaAutosize
5447
rowsMax={10}
5548
rowsMin={10}
56-
className={editTextArea}
49+
className={innerClasses.editTextArea}
5750
onChange={e => handleOnChange(e)}
5851
value={trainerText}
5952
/>
6053
<Button
6154
variant="contained"
6255
color="primary"
63-
className={trainerText ? sendBtn : sendBtnDisabled}
56+
className={
57+
trainerText ? innerClasses.sendBtn : innerClasses.sendBtnDisabled
58+
}
6459
onClick={() => trainerText && handleAppendTrainerTextInternal()}
6560
aria-disabled={!trainerText}
6661
disableRipple={!trainerText}
6762
disableElevation
6863
>
6964
Send
70-
<ArrowForwardRoundedIcon className={sendIcon} />
65+
<ArrowForwardRoundedIcon className={innerClasses.sendIcon} />
7166
</Button>
7267
</form>
7368
</div>

‎front/src/pods/trainer/components/session.component.tsx‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import React from 'react';
2-
import * as classes from './session.styles';
3-
// Material UI ~ components
2+
import { cx } from 'emotion';
43
import TextareaAutosize from '@material-ui/core/TextareaAutosize';
54
import ArrowForwardRoundedIcon from '@material-ui/icons/ArrowForwardRounded';
6-
75
import UndoIcon from '@material-ui/icons/Undo';
86
import Button from '@material-ui/core/Button';
7+
import * as innerClasses from './session.styles';
98

109
interface Props {
1110
log: string;
1211
handleSendFullContentLog: (fullContent: string) => void;
12+
className?: string;
1313
}
1414

1515
const getTextArea = (elementId: string): HTMLInputElement =>
@@ -28,54 +28,44 @@ const getFullContent = (currenSessionContent: string) => {
2828
};
2929

3030
export const SessionComponent: React.FC<Props> = props => {
31-
const { log, handleSendFullContentLog } = props;
32-
const {
33-
sessionContainer,
34-
btnContainer,
35-
sendIcon,
36-
undoIcon,
37-
labelTextarea,
38-
studentBoard,
39-
sendBtn,
40-
undoBtn,
41-
} = classes;
31+
const { log, handleSendFullContentLog, className } = props;
4232

4333
React.useEffect(() => {
4434
handleSetSessionContent(log);
4535
}, [log]);
4636

4737
return (
48-
<div className={sessionContainer}>
49-
<label className={labelTextarea} htmlFor="session">
38+
<div className={cx(innerClasses.sessionContainer, className)}>
39+
<label className={innerClasses.labelTextarea} htmlFor="session">
5040
Session
5141
</label>
5242

5343
<TextareaAutosize
5444
id="session"
5545
rowsMax={20}
5646
rowsMin={20}
57-
className={studentBoard}
47+
className={innerClasses.studentBoard}
5848
/>
59-
<div className={btnContainer}>
49+
<div className={innerClasses.btnContainer}>
6050
<Button
6151
variant="contained"
6252
color="secondary"
6353
disableElevation
64-
className={undoBtn}
54+
className={innerClasses.undoBtn}
6555
onClick={() => handleSetSessionContent(log)}
6656
>
67-
<UndoIcon className={undoIcon} />
57+
<UndoIcon className={innerClasses.undoIcon} />
6858
Undo
6959
</Button>
7060
<Button
7161
variant="contained"
7262
color="primary"
7363
disableElevation
74-
className={sendBtn}
64+
className={innerClasses.sendBtn}
7565
onClick={() => handleSendFullContentLog(getFullContent(log))}
7666
>
7767
Send Full Content
78-
<ArrowForwardRoundedIcon className={sendIcon} />
68+
<ArrowForwardRoundedIcon className={innerClasses.sendIcon} />
7969
</Button>
8070
</div>
8171
</div>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export const btnContainer = css`
3030
display: flex;
3131
margin-top: ${spacing(1.25)};
3232
padding-bottom: ${spacing(3.125)};
33-
border-bottom: 2px solid ${color.greyMedium};
3433
`;
3534

3635
export const sendBtn = css`

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

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react';
2-
import * as classes from './trainer.styles';
32
import { HeaderComponent } from './components/header.component';
43
import { NewTextComponent } from './components/new-text.component';
54
import { SessionComponent } from './components/session.component';
5+
import * as innerClasses from './trainer.styles';
66

77
interface Props {
88
handleAppendTrainerText: (trainerText: string) => void;
@@ -21,32 +21,20 @@ export const TrainerComponent: React.FC<Props> = props => {
2121
log,
2222
} = props;
2323

24-
const { mainContainer, content, backgroundContainer } = classes;
25-
2624
return (
2725
<>
28-
<main className={mainContainer}>
29-
<div className={backgroundContainer}>
30-
<div className={content}>
31-
<HeaderComponent
32-
currentTrainerUrl={currentTrainerUrl}
33-
currentStudentUrl={currentStudentUrl}
34-
/>
35-
</div>
36-
</div>
37-
<div className={backgroundContainer}>
38-
<div className={content}>
39-
<NewTextComponent
40-
handleAppendTrainerText={handleAppendTrainerText}
41-
/>
42-
</div>
43-
</div>
44-
<div className={content}>
45-
<SessionComponent
46-
log={log}
47-
handleSendFullContentLog={handleSendFullContentLog}
48-
/>
49-
</div>
26+
<main className={innerClasses.root}>
27+
<HeaderComponent
28+
currentTrainerUrl={currentTrainerUrl}
29+
currentStudentUrl={currentStudentUrl}
30+
/>
31+
<div className={innerClasses.divider} />
32+
<NewTextComponent handleAppendTrainerText={handleAppendTrainerText} />
33+
<div className={innerClasses.divider} />
34+
<SessionComponent
35+
log={log}
36+
handleSendFullContentLog={handleSendFullContentLog}
37+
/>
5038
</main>
5139
</>
5240
);

0 commit comments

Comments
 (0)