Skip to content

Commit b54d01d

Browse files
committed
finished handling error msgs for input fields on the left side, got rid of autocomplete, changed font size of dropdown select
1 parent cfa1c5c commit b54d01d

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

app/src/components/left/HTMLPanel.tsx

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ const HTMLPanel = (props): JSX.Element => {
6565
const triggerError = (type: String) => {
6666
setErrorStatus(true);
6767
if (type === 'empty') {
68-
setErrorMsg('Tag/ Tag name cannot be blank.');
68+
setErrorMsg('* Input cannot be blank. *');
6969
} else if (type === 'dupe') {
70-
setErrorMsg('Tag/ Tag name already exists.');
70+
setErrorMsg('* Input already exists. *');
7171
} else if (type === 'letters') {
72-
setErrorMsg('Tag/ Tag name must start with a letter.');
72+
setErrorMsg('* Input must start with a letter. *');
7373
} else if (type === 'symbolsDetected') {
74-
setErrorMsg('Tag/ Tag name must not contain symbols.');
74+
setErrorMsg('* Input must not contain symbols. *');
7575
} else if (type === 'length') {
76-
setErrorMsg('Element name cannot exceed 10 characters.');
76+
setErrorMsg('* Input cannot exceed 10 characters. *');
7777
}
7878
};
7979

@@ -183,11 +183,14 @@ const HTMLPanel = (props): JSX.Element => {
183183
type="text"
184184
name="Tag"
185185
value={tag}
186+
autocomplete="off"
186187
onChange={handleTagChange}
187-
className={classes.input}
188+
className={isThemeLight ? `${classes.input} ${classes.lightThemeFontColor}` : `${classes.input} ${classes.darkThemeFontColor}`}
188189
style={{ marginBottom: '10px' }}
190+
189191
/>
190-
{errorStatus && <span>{errorMsg}</span>}
192+
{errorStatus && <span style={{fontSize:"11px", marginTop: "10px", color: "red"}}><em>{errorMsg}</em></span>}
193+
191194
<br></br>
192195
<label className={isThemeLight ? `${classes.inputLabel} ${classes.lightThemeFontColor}` : `${classes.inputLabel} ${classes.darkThemeFontColor}`}>
193196
Element Name:
@@ -198,10 +201,12 @@ const HTMLPanel = (props): JSX.Element => {
198201
name="Tag Name"
199202
value={name}
200203
onChange={handleNameChange}
201-
className={classes.input}
204+
autocomplete="off"
205+
className={isThemeLight ? `${classes.input} ${classes.lightThemeFontColor}` : `${classes.input} ${classes.darkThemeFontColor}`}
202206
/>
203-
{errorStatus && <span>{errorMsg}</span>}
207+
{errorStatus && <span style={{fontSize:"11px", marginTop: "10px", color: "red"}}><em>{errorMsg}</em></span>}
204208
<input
209+
205210
className={isThemeLight ? `${classes.addElementButton} ${classes.lightThemeFontColor}` : `${classes.addElementButton} ${classes.darkThemeFontColor}`}
206211
id="submitButton"
207212
type="submit"
@@ -237,7 +242,7 @@ const useStyles = makeStyles({
237242
backgroundColor: 'rgba(255,255,255,0.15)',
238243
margin: '0px 0px 0px 10px',
239244
width: '140px',
240-
height: '30px'
245+
height: '30px',
241246
},
242247
inputLabel: {
243248
fontSize: '85%',

app/src/containers/LeftContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useContext } from 'react';
22
import Grid from '@material-ui/core/Grid';
3-
import ComponentPanel from '../components/left/ComponentPanel';
3+
import ComponentPanel from '../components/right/ComponentPanel';
44
import HTMLPanel from '../components/left/HTMLPanel';
55
import { styleContext } from './AppContainer';
66

app/src/containers/RightContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import List from '@material-ui/core/List';
2323
import ListItem from '@material-ui/core/ListItem';
2424
import ListItemText from '@material-ui/core/ListItemText';
2525
import createModal from '../components/right/createModal';
26-
import ComponentPanel from '../components/left/ComponentPanel'
26+
import ComponentPanel from '../components/right/ComponentPanel'
2727

2828
// need to pass in props to use the useHistory feature of react router
2929
const RightContainer = ({isThemeLight}): JSX.Element => {
@@ -536,7 +536,7 @@ const RightContainer = ({isThemeLight}): JSX.Element => {
536536

537537
const useStyles = makeStyles({
538538
select: {
539-
fontSize: '1.25em',
539+
fontSize: '1em',
540540
'> .MuiSelect-icon': {
541541
color: '#186BB4'
542542
}

0 commit comments

Comments
 (0)