diff --git a/litmus-portal/frontend/public/icons/LitmusLogo.svg b/litmus-portal/frontend/public/icons/LitmusLogo.svg new file mode 100644 index 000000000..396007f94 --- /dev/null +++ b/litmus-portal/frontend/public/icons/LitmusLogo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/litmus-portal/frontend/public/icons/community.png b/litmus-portal/frontend/public/icons/community.png deleted file mode 100644 index 9dfe12aaa..000000000 Binary files a/litmus-portal/frontend/public/icons/community.png and /dev/null differ diff --git a/litmus-portal/frontend/public/icons/setting.png b/litmus-portal/frontend/public/icons/setting.png deleted file mode 100644 index 4fede8184..000000000 Binary files a/litmus-portal/frontend/public/icons/setting.png and /dev/null differ diff --git a/litmus-portal/frontend/public/icons/workflows.png b/litmus-portal/frontend/public/icons/workflows.png deleted file mode 100644 index 96af12e7f..000000000 Binary files a/litmus-portal/frontend/public/icons/workflows.png and /dev/null differ diff --git a/litmus-portal/frontend/src/components/InputField/index.tsx b/litmus-portal/frontend/src/components/InputField/index.tsx index d212a1286..b660a55a4 100644 --- a/litmus-portal/frontend/src/components/InputField/index.tsx +++ b/litmus-portal/frontend/src/components/InputField/index.tsx @@ -1,10 +1,10 @@ -import { TextField, OutlinedInputProps } from '@material-ui/core'; -import React, { useState } from 'react'; +import { OutlinedInputProps, TextField } from '@material-ui/core'; import IconButton from '@material-ui/core/IconButton'; import InputAdornment from '@material-ui/core/InputAdornment'; +import AccountCircle from '@material-ui/icons/AccountCircle'; import Visibility from '@material-ui/icons/Visibility'; import VisibilityOff from '@material-ui/icons/VisibilityOff'; -import AccountCircle from '@material-ui/icons/AccountCircle'; +import React, { useState } from 'react'; import { useStyles, useStylesLitmus } from './styles'; interface InputFieldProps { @@ -17,6 +17,7 @@ interface InputFieldProps { value: string; required?: boolean; iconType?: string | undefined; + styles?: Object; handleChange?: (event: React.ChangeEvent) => void; } @@ -27,6 +28,7 @@ const InputField: React.FC = ({ disabled, helperText, validationError, + styles, success, required, iconType, @@ -60,6 +62,7 @@ const InputField: React.FC = ({ required={required} onChange={handleChange} variant="filled" + style={styles} InputProps={ { classes, @@ -91,6 +94,7 @@ const InputField: React.FC = ({ type={showPassword ? 'text' : 'password'} required={required} onChange={handleChange} + style={styles} variant="filled" InputProps={ { @@ -123,6 +127,7 @@ const InputField: React.FC = ({ value={value} type={type} required={required} + style={styles} onChange={handleChange} variant="filled" InputProps={ @@ -148,6 +153,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" @@ -173,6 +179,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" @@ -203,6 +210,7 @@ const InputField: React.FC = ({ value={value} type={type} required={required} + style={styles} onChange={handleChange} variant="filled" InputProps={ @@ -228,6 +236,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" @@ -253,6 +262,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" @@ -284,6 +294,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" @@ -317,6 +328,7 @@ const InputField: React.FC = ({ helperText={helperText} value={value} type={type} + style={styles} required={required} onChange={handleChange} variant="filled" diff --git a/litmus-portal/frontend/src/components/InputField/styles.ts b/litmus-portal/frontend/src/components/InputField/styles.ts index 2a9318276..5f3b02ef9 100644 --- a/litmus-portal/frontend/src/components/InputField/styles.ts +++ b/litmus-portal/frontend/src/components/InputField/styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles, Theme, fade } from '@material-ui/core'; +import { createStyles, fade, makeStyles, Theme } from '@material-ui/core'; const useStylesLitmus = makeStyles((theme: Theme) => createStyles({ @@ -9,7 +9,6 @@ const useStylesLitmus = makeStyles((theme: Theme) => : `1px solid ${theme.palette.primary.dark}`, overflow: 'hidden', borderRadius: 4, - margin: '0 1rem', backgroundColor: theme.palette.common.white, transition: theme.transitions.create(['border-color', 'box-shadow']), '&$error': { @@ -81,6 +80,7 @@ const useStyles = makeStyles((theme) => ({ inputArea: { width: theme.spacing(45), marginTop: theme.spacing(1), + paddingLeft: theme.spacing(2), textDecoration: 'none', borderRadius: 3, }, diff --git a/litmus-portal/frontend/src/components/SideBar/index.tsx b/litmus-portal/frontend/src/components/SideBar/index.tsx index b5b277f64..47e2c782c 100644 --- a/litmus-portal/frontend/src/components/SideBar/index.tsx +++ b/litmus-portal/frontend/src/components/SideBar/index.tsx @@ -10,6 +10,10 @@ import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; import { history } from '../../redux/configureStore'; import { RootState } from '../../redux/reducers'; +import { ReactComponent as CommunityIcon } from '../../svg/community.svg'; +import { ReactComponent as HomeIcon } from '../../svg/home.svg'; +import { ReactComponent as SettingsIcon } from '../../svg/settings.svg'; +import { ReactComponent as WorkflowsIcon } from '../../svg/workflows.svg'; import useStyles from './styles'; interface CustomisedListItemProps { @@ -66,7 +70,7 @@ const SideBar: React.FC = () => { }} label="Home" > - home + { }} label="Workflows" > - workflow + - {/* { - history.push('/404'); - }} - label="My Hub" - > - hub - */} { @@ -93,7 +88,7 @@ const SideBar: React.FC = () => { }} label="Community" > - community + {userRole === 'Owner' && ( { }} label="Settings" > - settings + )} diff --git a/litmus-portal/frontend/src/components/SideBar/styles.ts b/litmus-portal/frontend/src/components/SideBar/styles.ts index 867394c42..9164d660f 100644 --- a/litmus-portal/frontend/src/components/SideBar/styles.ts +++ b/litmus-portal/frontend/src/components/SideBar/styles.ts @@ -39,12 +39,14 @@ const useStyles = makeStyles((theme: Theme) => ({ '&:hover': { backgroundColor: theme.palette.secondary.light, color: theme.palette.getContrastText(theme.palette.primary.contrastText), + '& path': { + fill: theme.palette.common.white, + }, }, }, listIcon: { paddingLeft: theme.spacing(2), - alignSelf: 'center', }, listText: { marginLeft: theme.spacing(0), diff --git a/litmus-portal/frontend/src/components/Tabs/index.tsx b/litmus-portal/frontend/src/components/Tabs/index.tsx index 22195cc2f..e58f59d33 100644 --- a/litmus-portal/frontend/src/components/Tabs/index.tsx +++ b/litmus-portal/frontend/src/components/Tabs/index.tsx @@ -10,7 +10,7 @@ const TabPanel: React.FC = ({ children, index, value }) => { return (