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

Re-design of AuthLogin Page #2364

Merged
merged 56 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
0224d98
Created AuthLoginOld
courtneyc1 Nov 1, 2023
5f986eb
added space to platform notification
courtneyc1 Nov 3, 2023
b31ba02
Updated Footer, Notification, & Warning
courtneyc1 Nov 6, 2023
d5c2b14
updated notifications
courtneyc1 Nov 6, 2023
d65eba1
updated cisa logo
courtneyc1 Nov 7, 2023
6c11a68
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 7, 2023
349f8ed
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 8, 2023
874bf6d
updated notification and footer
courtneyc1 Nov 8, 2023
89254f1
Merge branch '2323-update-notification-with-new-messaging' of https:/…
courtneyc1 Nov 8, 2023
019ed0a
warning Banner position change below themeProvider
courtneyc1 Nov 9, 2023
83df8b2
updated styles.scss for warning banner
courtneyc1 Nov 9, 2023
76e87e1
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 14, 2023
c333626
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 14, 2023
6ea6fbd
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 20, 2023
a2b6528
Warning Banner Standalone completed
courtneyc1 Nov 20, 2023
29751fa
Merge branch '2323-update-notification-with-new-messaging' of https:/…
courtneyc1 Nov 20, 2023
da2740d
created new footer issue with old one still being there
courtneyc1 Nov 20, 2023
476d650
updated the alert section
courtneyc1 Nov 21, 2023
0351c02
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 27, 2023
ad418f6
updated warning banner and vuln. checks and tests
courtneyc1 Nov 27, 2023
cbfa8d3
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Nov 30, 2023
040b40e
Updated Footer
courtneyc1 Dec 1, 2023
37cbcba
updated backend Json file
courtneyc1 Dec 6, 2023
bc22e6c
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Dec 6, 2023
fb60751
merge changes for AuthLogin with master
courtneyc1 Dec 6, 2023
1fe9009
updated new authlogin
courtneyc1 Dec 6, 2023
cf55b0a
updated imports for authlogin page
courtneyc1 Dec 12, 2023
071ce49
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Dec 12, 2023
c1f872d
json file update
courtneyc1 Dec 13, 2023
b577d76
missing code for registration form on Login page
courtneyc1 Dec 14, 2023
37f76af
removed additional space
courtneyc1 Dec 14, 2023
7498df9
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Dec 18, 2023
8009106
Merge branch 'master' of https://github.com/cisagov/crossfeed into 23…
ameliav Dec 26, 2023
c3fcd8a
Add MUI theme and remove amplify theme from AuthLogin.tsx
ameliav Dec 28, 2023
f68a25f
Update CISA_LOGO with high definition version
ameliav Dec 29, 2023
7a15f31
Update Warning.tsx styling to only have MUI
ameliav Dec 29, 2023
a34b638
Merge branch 'master' into 2323-update-notification-with-new-messaging
ameliav Dec 29, 2023
f5a9913
Merge branch master into 2323-update-notification-with-new-messaging
ameliav Jan 2, 2024
46e3cc4
Merge branch 'master' into 2323-update-notification-with-new-messaging
courtneyc1 Jan 3, 2024
0dea5b0
Merge branch '2323-update-notification-with-new-messaging' of https:/…
courtneyc1 Jan 3, 2024
8464359
Sync front-end package-lock.json
ameliav Jan 3, 2024
2e10891
Merge branch 'master' into 2323-update-notification-with-new-messaging
ameliav Jan 3, 2024
1a5818e
Add frontend/jest.config.js
ameliav Jan 3, 2024
7d9e44d
Merge branch '2323-update-notification-with-new-messaging' of https:/…
ameliav Jan 3, 2024
64a4c46
Update frontend/jest.config.js
ameliav Jan 3, 2024
ab65425
Remove x from Alert in AuthLogin.tsx
ameliav Jan 4, 2024
d0f68ca
Update footer with conditions for logged in users
ameliav Jan 4, 2024
40ebf7e
Remove unneeded ModFooter.tsx code
ameliav Jan 4, 2024
01205ef
Rollback jest.config.js file
ameliav Jan 4, 2024
560aab3
Merge branch 'master' into 2323-update-notification-with-new-messaging
ameliav Jan 4, 2024
f1894ce
Merge branch 'master' into 2323-update-notification-with-new-messaging
ameliav Jan 8, 2024
f95791b
Update Authogin.tsx to toggle platform notification
ameliav Jan 30, 2024
1a4a1bd
Merge branch 'master' into 2323-update-notification-with-new-messaging
ameliav Jan 30, 2024
ad24ac6
Comment platformNotification in AuthLogin.tsx since an unused warning…
ameliav Jan 30, 2024
f9177b3
Merge branch '2323-update-notification-with-new-messaging' of https:/…
ameliav Jan 30, 2024
e3b6735
Comment unused imports from AuthLogin.tsx
ameliav Jan 30, 2024
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
11 changes: 1 addition & 10 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

310 changes: 164 additions & 146 deletions frontend/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions frontend/src/components/AuthForm/styles.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.root {
width: 100%;
height: 100%;
//height: 100%;
position: absolute;
padding: 0;

Expand All @@ -23,7 +23,7 @@
background-color: #fff;
border-radius: 5px;
width: 100%;
height: 100%;
//height: 100%;
max-width: 32rem;
padding: 3rem 1rem;
display: flex;
Expand Down
34 changes: 18 additions & 16 deletions frontend/src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import logo from '../../assets/crossfeed.svg';
import * as FooterStyles from './styleFooter';

export const CrossfeedFooter: React.FC = (props) => {
const { logout } = useAuthContext();
const { logout, user } = useAuthContext();
const FooterRoot = FooterStyles.FooterRoot;
const footerClasses = FooterStyles.footerClasses;
return (
Expand All @@ -17,13 +17,13 @@ export const CrossfeedFooter: React.FC = (props) => {
<img src={logo} alt="Crossfeed Icon Navigate Home" />
</Link>
</Grid>
<Grid className={footerClasses.footerNavItem} item xs={12} sm={2}>
<p>
{user && (
<Grid className={footerClasses.footerNavItem} item xs={12} sm={2}>
<Link className={footerClasses.footerNavLink} href="/">
Home
</Link>
</p>
</Grid>
</Grid>
)}
<Grid className={footerClasses.footerNavItem} item xs={12} sm={2}>
<p>
<Link
Expand Down Expand Up @@ -54,17 +54,19 @@ export const CrossfeedFooter: React.FC = (props) => {
</Link>
</p>
</Grid>
<Grid className={footerClasses.footerNavItem} item xs={12} sm={2}>
<p>
<Link
className={footerClasses.footerNavLink}
href="/"
onClick={logout}
>
Logout
</Link>
</p>
</Grid>
{user && (
<Grid className={footerClasses.footerNavItem} item xs={12} sm={2}>
<p>
<Link
className={footerClasses.footerNavLink}
href="/"
onClick={logout}
>
Logout
</Link>
</p>
</Grid>
)}
</Grid>
</Box>
</FooterRoot>
Expand Down
60 changes: 60 additions & 0 deletions frontend/src/components/WarningBanner/Warning.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import React from 'react';
import { Box, Grid, Paper, Typography } from '@mui/material';
import { styled } from '@mui/material/styles';
import cisa_logo from '../../pages/AuthLogin/img/CISA_LOGO.png';

export const CrossfeedWarning: React.FC = (props) => {
const BackgroundPaper = styled(Paper)(({ theme }) => ({
width: 900,
borderColor: '#047d95',
borderWidth: 2,
padding: theme.spacing(1),
backgroundColor: 'inherit'
}));
return (
<Box sx={{ display: 'flex', justifyContent: 'center', py: 5, px: 1 }}>
<BackgroundPaper variant="outlined">
<Grid container spacing={1}>
<Grid item xs={12} sm={3} display="flex" justifyContent="end">
<Box m="auto">
<img alt="CISA LOGO" src={cisa_logo} width="140px" />
</Box>
</Grid>
<Grid item xs={12} sm={9}>
<Typography variant="h6" textAlign="center">
WARNING
</Typography>
<Typography
variant="caption"
component="div"
fontSize={11}
lineHeight={1}
>
Crossfeed is hosted by Department of Homeland Security (DHS)
Cybersecurity and Infrastructure Security Agency (CISA)
Cybersecurity Division (CSD) Vulnerability Management (VM) Attack
Attack Attack Surface Management (ASM) Automation is computer
systems systems may systems may be monitored for all unlawful
unlawful purposes, including to ensure their use is authorized,
for management of the system, to protection against security
procedures, survivability, and operational operational operational
operational security. All information, information, including
information, placed or sent this system may be monitored.
Monitoring includes actives attacks by authorized US Government
entities to test or verify the security of this system.
<br />
<br />
Use of the computer system, authorized or unauthorized,
constitutes consent to monitoring of this system. Unauthorized
subject you to criminal prosecution. Evidence of unauthorized
collected during monitoring may be used for administrivia,
criminal, or other adverse action. Use of this system constitutes
to monitoring for these purposes. Use of this system implies
understanding of these items and conditions.
</Typography>
</Grid>
</Grid>
</BackgroundPaper>
</Box>
);
};
1 change: 1 addition & 0 deletions frontend/src/components/WarningBanner/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './Warning';
29 changes: 29 additions & 0 deletions frontend/src/components/WarningBanner/styleWarning.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { styled } from '@mui/material/styles';

const PREFIX = 'Warning';

export const warningClasses = {
warningBox: `${PREFIX}-warningBox`,
warningContainer: `${PREFIX}-footerContainer`,
warning_logo: `${PREFIX}-warning_logo`
};
export const WarningRoot = styled('div')(({ theme }) => ({
[`& .${warningClasses.warningBox}`]: {
position: 'relative',
top: '20px',
bottom: 0,
width: '100%'
},
[`& .${warningClasses.warningContainer}`]: {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
margin: '0 auto',
maxWidth: '1444px'
},
[`& .${warningClasses.warning_logo}`]: {
display: 'flex',
justifyContent: 'center',
height: '100%'
}
}));
Loading
Loading