Skip to content

Commit e3109f6

Browse files
enigmawunenigmawun
committed
updated some blue styling to orange
1 parent 34203b7 commit e3109f6

File tree

6 files changed

+46
-52
lines changed

6 files changed

+46
-52
lines changed

‎app/src/components/left/CreatePanel.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const CreatePanel = (props): JSX.Element => {
3636
null
3737
);
3838

39-
const [isCreatingModule, setCreateModule] = useState(false);
4039
const [MUIMode, setMUIMode] = useState(false);
4140

4241
const handleDelete = (id: number): void => {
@@ -201,7 +200,6 @@ const CreatePanel = (props): JSX.Element => {
201200
textAlign: 'center',
202201
marginBottom: '6px'
203202
}}
204-
key={name + idx}
205203
>
206204
<Button component="label" id={name + '-button'} key={name + idx}>
207205
{name}

‎app/src/components/login/FBPassWord.tsx

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
Link as RouteLink,
55
withRouter,
66
RouteComponentProps,
7-
useHistory,
7+
useHistory
88
} from 'react-router-dom';
99
import Avatar from '@mui/material/Avatar';
1010
import Button from '@mui/material/Button';
@@ -17,26 +17,24 @@ import {
1717
styled,
1818
StyledEngineProvider,
1919
Theme,
20-
ThemeProvider,
20+
ThemeProvider
2121
} from '@mui/material/styles';
2222
import Container from '@mui/material/Container';
2323
import AssignmentIcon from '@mui/icons-material/Assignment';
2424
import {
2525
validateInputs,
2626
handleChange,
2727
resetErrorValidation,
28-
updatePassword,
28+
updatePassword
2929
} from '../../helperFunctions/auth';
3030
import { SigninDark } from '../../../../app/src/public/styles/theme';
3131
import { LoginInt } from '../../interfaces/Interfaces';
3232

33-
3433
declare module '@mui/styles/defaultTheme' {
3534
// eslint-disable-next-line @typescript-eslint/no-empty-interface
3635
interface DefaultTheme extends Theme {}
3736
}
3837

39-
4038
declare module '@mui/styles/defaultTheme' {
4139
interface DefaultTheme extends Theme {}
4240
}
@@ -55,27 +53,27 @@ const StyledPaper = styled(Box)(({ theme }) => ({
5553
marginTop: theme.spacing(8),
5654
display: 'flex',
5755
flexDirection: 'column',
58-
alignItems: 'center',
56+
alignItems: 'center'
5957
}));
6058

6159
const StyledAvatar = styled(Avatar)(({ theme }) => ({
6260
margin: theme.spacing(1),
63-
backgroundColor: 'white',
61+
backgroundColor: 'white'
6462
}));
6563

6664
const StyledForm = styled('form')(({ theme }) => ({
6765
width: '100%', // Fix IE 11 issue.
68-
marginTop: theme.spacing(3),
66+
marginTop: theme.spacing(3)
6967
}));
7068

7169
const StyledButton = styled(Button)(({ theme }) => ({
72-
margin: theme.spacing(3, 0, 2),
70+
margin: theme.spacing(3, 0, 2)
7371
}));
7472

7573
const StyledTextField = styled(TextField)(({ theme }) => ({
7674
'& .MuiOutlinedInput-root.Mui-focused .MuiOutlinedInput-notchedOutline': {
77-
borderColor: '#white',
78-
},
75+
borderColor: '#white'
76+
}
7977
}));
8078

8179
const FBPassWord: React.FC<LoginInt & RouteComponentProps> = () => {
@@ -99,13 +97,13 @@ const FBPassWord: React.FC<LoginInt & RouteComponentProps> = () => {
9997
setInvalidPassword,
10098
setInvalidPasswordMsg,
10199
setInvalidVerifyPassword,
102-
setInvalidVerifyPasswordMsg,
100+
setInvalidVerifyPasswordMsg
103101
};
104102
// define handle change setters to pass to handleChange function
105103
const handleChangeSetters = {
106104
setUsername,
107105
setPassword,
108-
setPasswordVerify,
106+
setPasswordVerify
109107
};
110108

111109
/**
@@ -134,7 +132,7 @@ const FBPassWord: React.FC<LoginInt & RouteComponentProps> = () => {
134132
username,
135133
password,
136134
passwordVerify,
137-
errorSetters,
135+
errorSetters
138136
}); // Validate Inputs using Auth helper function
139137
if (!isValid) {
140138
console.log('Validation failed, not updating password.');
@@ -148,13 +146,13 @@ const FBPassWord: React.FC<LoginInt & RouteComponentProps> = () => {
148146
} else {
149147
console.log(
150148
'Update password failed: Unknown or unhandled error',
151-
isUpdated,
149+
isUpdated
152150
);
153151
}
154152
} catch (err) {
155153
console.error(
156154
'Error during password updating in handleUpdatePassword:',
157-
err,
155+
err
158156
);
159157
}
160158
};
@@ -228,15 +226,15 @@ const FBPassWord: React.FC<LoginInt & RouteComponentProps> = () => {
228226
color="primary"
229227
variant="contained"
230228
sx={{
231-
backgroundColor: '#2997ff',
229+
backgroundColor: '#f08c00;',
232230
marginBottom: '5px',
233231
marginTop: '20px',
234232
textTransform: 'none',
235233
fontSize: '1rem',
236234
'$:hover': {
237-
cursor: 'pointer',
235+
cursor: 'pointer'
238236
},
239-
width: '100%',
237+
width: '100%'
240238
}}
241239
>
242240
Update Password

‎app/src/components/login/SignIn.tsx

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import React, { useCallback, useEffect, useState } from 'react';
33
import {
44
RouteComponentProps,
55
Link as RouteLink,
6-
useHistory,
6+
useHistory
77
} from 'react-router-dom';
88
import {
99
StyledEngineProvider,
1010
Theme,
1111
ThemeProvider,
12-
styled,
12+
styled
1313
} from '@mui/material/styles';
1414
import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
1515
import makeStyles from '@mui/styles/makeStyles';
@@ -21,25 +21,23 @@ import {
2121
Container,
2222
CssBaseline,
2323
TextField,
24-
Typography,
24+
Typography
2525
} from '@mui/material';
2626
import { LoginInt } from '../../interfaces/Interfaces';
2727
import serverConfig from '../../serverConfig.js';
2828
import {
2929
sessionIsCreated,
3030
handleChange,
3131
resetErrorValidation,
32-
validateInputs,
32+
validateInputs
3333
} from '../../helperFunctions/auth';
3434
import { SigninDark } from '../../../../app/src/public/styles/theme';
3535

36-
3736
declare module '@mui/styles/defaultTheme' {
3837
// eslint-disable-next-line @typescript-eslint/no-empty-interface
3938
interface DefaultTheme extends Theme {}
4039
}
4140

42-
4341
const { API_BASE_URL } = serverConfig;
4442

4543
declare module '@mui/styles/defaultTheme' {
@@ -60,27 +58,27 @@ const useStyles = makeStyles((theme) => ({
6058
paper: {
6159
display: 'flex',
6260
flexDirection: 'column',
63-
alignItems: 'center',
61+
alignItems: 'center'
6462
},
6563
avatar: {
66-
backgroundColor: 'white',
64+
backgroundColor: 'white'
6765
},
6866
form: {
69-
width: '100%',
67+
width: '100%'
7068
},
7169
submit: {
72-
cursor: 'pointer',
70+
cursor: 'pointer'
7371
},
7472
root: {
7573
'& .MuiOutlinedInput-root.Mui-focused .MuiOutlinedInput-notchedOutline': {
76-
borderColor: 'white',
77-
},
78-
},
74+
borderColor: 'white'
75+
}
76+
}
7977
}));
8078

8179
const StyledForm = styled('form')(({ theme }) => ({
8280
width: '100%', // Fix IE 11 issue.
83-
marginTop: theme.spacing(3),
81+
marginTop: theme.spacing(3)
8482
}));
8583

8684
const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
@@ -119,12 +117,12 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
119117
setInvalidUser,
120118
setInvalidUserMsg,
121119
setInvalidPassword,
122-
setInvalidPasswordMsg,
120+
setInvalidPasswordMsg
123121
};
124122
// define handle change setters to pass to handleChange function
125123
const handleChangeSetters = {
126124
setUsername,
127-
setPassword,
125+
setPassword
128126
};
129127

130128
/**
@@ -150,7 +148,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
150148
const isValid = validateInputs({
151149
username,
152150
password,
153-
errorSetters,
151+
errorSetters
154152
}); // Validate Inputs using Auth helper function
155153
if (!isValid) {
156154
console.log('Validation failed, login attempt not processed.');
@@ -168,7 +166,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
168166
'No Username Input',
169167
'No Password Input',
170168
'Invalid Username',
171-
'Incorrect Password',
169+
'Incorrect Password'
172170
].includes(loginStatus)
173171
) {
174172
setInvalidUser(true);
@@ -215,7 +213,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
215213
component="main"
216214
maxWidth="xs"
217215
sx={{
218-
marginTop: '10vh',
216+
marginTop: '10vh'
219217
}}
220218
>
221219
<CssBaseline />
@@ -278,9 +276,9 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
278276
textTransform: 'none',
279277
fontSize: '1rem',
280278
'$:hover': {
281-
cursor: 'pointer',
279+
cursor: 'pointer'
282280
},
283-
width: '100%',
281+
width: '100%'
284282
}}
285283
>
286284
<svg
@@ -317,8 +315,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
317315
'$:hover': {
318316
cursor: 'pointer',
319317
color: 'black',
320-
textDecoration: 'underline',
321-
},
318+
textDecoration: 'underline'
319+
}
322320
}}
323321
>
324322
<svg
@@ -349,8 +347,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
349347
color: 'white',
350348
'$:hover': {
351349
cursor: 'pointer',
352-
color: 'black',
353-
},
350+
color: 'black'
351+
}
354352
}}
355353
>
356354
<svg
@@ -381,8 +379,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = () => {
381379
color: 'white',
382380
'$:hover': {
383381
cursor: 'pointer',
384-
color: 'black',
385-
},
382+
color: 'black'
383+
}
386384
}}
387385
>
388386
<svg

‎app/src/public/styles/style.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ h1 {
414414
}
415415

416416
#export-modal:hover {
417-
background-color: #66c4eb;
417+
background-color: #1a8a98;
418418
cursor: pointer;
419419
}
420420
/* ///CHANGED COLOR COLOR */
@@ -481,8 +481,8 @@ RIGHT COLUMN
481481
}
482482

483483
#addComponentButton:hover {
484-
background-color: #c76e00;
485-
border: 2px solid #c76e00;
484+
background-color: #f08c00;
485+
border: 2px solid #f08c00;
486486
color: white;
487487
cursor: pointer;
488488
}
@@ -977,7 +977,7 @@ li {
977977
}
978978

979979
.blue-accent-text {
980-
color: #2997ff;
980+
color: #f08c00;
981981
}
982982

983983
a.nav_link {

‎resources/v22 MUI Canvas.png

-1.44 MB
Loading

‎resources/v22 code preview.png

-1.55 MB
Loading

0 commit comments

Comments
 (0)