Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Help / Contact Support UI Updates #160

Open
wants to merge 8 commits into
base: Update/ui-theme
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions webapp/src/components/ContactSupportMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import toast from 'react-hot-toast'
import Dialog from '@mui/material/Dialog'
import { Button, DialogActions, DialogContent, DialogTitle } from '@mui/material'
import { AdminButton } from '../styles/components/AdminButton'
import { LightButton } from '../styles/components/LightButton'
import ContactSupportIcon from '@mui/icons-material/ContactSupport'

const ContactSupportMenu = () => {
const [hidden, setHidden] = useState(true) // hidden by default
Expand Down Expand Up @@ -41,16 +39,15 @@ const ContactSupportMenu = () => {
if (hidden) {
return (
<div>
<LightButton
<Button
variant="contained"
startIcon={<ContactSupportIcon />}
onClick={() => {
setHidden(!hidden)
}}
sx={{ padding: 2, margin: 1, top: 5 }}
sx={{ margin: 1, top: 5 }}
>
Contact Support
</LightButton>
</Button>
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/components/Help.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { alpha, useTheme } from '@mui/material'
const Help = () => {
const theme = useTheme()
return (
<div id="help">
<div id="help" style={{ backgroundColor: theme.palette.background.default, textAlign: 'left' }}>
<h1 className="helpHeader">Welcome to the {EnvironmentVars.DOT_NAME} CV Manager Website</h1>
<div className="spacer">
<p className="pHelp">
Expand Down Expand Up @@ -75,7 +75,7 @@ const Help = () => {
</p>
</div>
<BorderedImage src={configure} alt="CV Manager Configuration Page" />
<div id="supportMenuParent" style={{ backgroundColor: alpha(theme.palette.background.default, 0.5) }}>
<div id="supportMenuParent" style={{ backgroundColor: alpha(theme.palette.background.paper, 0.8) }}>
<div id="supportMenuContainer">
<ContactSupportMenu />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,6 @@ exports[`should take a snapshot 1`] = `
tabindex="0"
type="button"
>
<span
class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium css-mocked-MuiButton-startIcon"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mocked-MuiSvgIcon-root"
data-testid="ContactSupportIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M11.5 2C6.81 2 3 5.81 3 10.5S6.81 19 11.5 19h.5v3c4.86-2.34 8-7 8-11.5C20 5.81 16.19 2 11.5 2m1 14.5h-2v-2h2zm0-3.5h-2c0-3.25 3-3 3-5 0-1.1-.9-2-2-2s-2 .9-2 2h-2c0-2.21 1.79-4 4-4s4 1.79 4 4c0 2.5-3 2.75-3 5"
/>
</svg>
</span>
Contact Support
</button>
</div>
Expand Down
30 changes: 0 additions & 30 deletions webapp/src/components/__snapshots__/Header.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,6 @@ exports[`<Header /> should take a snapshot 1`] = `
tabindex="0"
type="button"
>
<span
class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium css-mocked-MuiButton-startIcon"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mocked-MuiSvgIcon-root"
data-testid="ContactSupportIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M11.5 2C6.81 2 3 5.81 3 10.5S6.81 19 11.5 19h.5v3c4.86-2.34 8-7 8-11.5C20 5.81 16.19 2 11.5 2m1 14.5h-2v-2h2zm0-3.5h-2c0-3.25 3-3 3-5 0-1.1-.9-2-2-2s-2 .9-2 2h-2c0-2.21 1.79-4 4-4s4 1.79 4 4c0 2.5-3 2.75-3 5"
/>
</svg>
</span>
Contact Support
</button>
</div>
Expand All @@ -78,21 +63,6 @@ exports[`<Header /> should take a snapshot 1`] = `
tabindex="0"
type="button"
>
<span
class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium css-mocked-MuiButton-startIcon"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mocked-MuiSvgIcon-root"
data-testid="ContactSupportIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M11.5 2C6.81 2 3 5.81 3 10.5S6.81 19 11.5 19h.5v3c4.86-2.34 8-7 8-11.5C20 5.81 16.19 2 11.5 2m1 14.5h-2v-2h2zm0-3.5h-2c0-3.25 3-3 3-5 0-1.1-.9-2-2-2s-2 .9-2 2h-2c0-2.21 1.79-4 4-4s4 1.79 4 4c0 2.5-3 2.75-3 5"
/>
</svg>
</span>
Contact Support
</button>
</div>
Expand Down
18 changes: 2 additions & 16 deletions webapp/src/components/__snapshots__/Help.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ exports[`should take a snapshot 1`] = `
<div>
<div
id="help"
style="background-color: rgb(255, 255, 255); text-align: left;"
>
<h1
class="helpHeader"
Expand Down Expand Up @@ -106,7 +107,7 @@ exports[`should take a snapshot 1`] = `
/>
<div
id="supportMenuParent"
style="background-color: rgba(255, 255, 255, 0.5);"
style="background-color: rgba(255, 255, 255, 0.8);"
>
<div
id="supportMenuContainer"
Expand All @@ -117,21 +118,6 @@ exports[`should take a snapshot 1`] = `
tabindex="0"
type="button"
>
<span
class="MuiButton-icon MuiButton-startIcon MuiButton-iconSizeMedium css-mocked-MuiButton-startIcon"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mocked-MuiSvgIcon-root"
data-testid="ContactSupportIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M11.5 2C6.81 2 3 5.81 3 10.5S6.81 19 11.5 19h.5v3c4.86-2.34 8-7 8-11.5C20 5.81 16.19 2 11.5 2m1 14.5h-2v-2h2zm0-3.5h-2c0-3.25 3-3 3-5 0-1.1-.9-2-2-2s-2 .9-2 2h-2c0-2.21 1.79-4 4-4s4 1.79 4 4c0 2.5-3 2.75-3 5"
/>
</svg>
</span>
Contact Support
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/css/Help.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
.helpHeader {
padding-top: 3vh;
padding-bottom: 1vh;
text-align: center;
font-family: sans-serif;
margin-left: 2rem;
}

.spacer {
Expand Down
Loading