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

#2209 Footer cutting off Export Users on User page #2239

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3bd72f1
updated footer
courtneyc1 Sep 13, 2023
f25c21c
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
Matthew-Grayson Sep 19, 2023
adb3443
changed footer root position to 'fixed' and reinstalled package json …
Sep 22, 2023
b233791
changed position on 'Footer' file from 'sticky' to 'fixed'
Sep 22, 2023
b0aa1f9
added zIndex to keep footer on top of other page elements
Sep 22, 2023
a4ac2b5
fixed cutoff content on 'scans' page
Sep 26, 2023
9dcb263
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
Sep 26, 2023
d945487
ran 'npm test -u' locally
Sep 27, 2023
3e14b86
updated modules and dependencies on 'docs'
Sep 27, 2023
29aef9f
Merge branch 'master' of github.com:cisagov/crossfeed into 2209-foote…
Sep 28, 2023
31be255
deleted backend package-json due to merge conflicts
Sep 28, 2023
922d47a
installed merged package json files for 'docs' and 'backend'
Sep 28, 2023
8f09d7d
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
courtneyc1 Sep 29, 2023
e046405
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
courtneyc1 Oct 2, 2023
9ca8953
Testing this
courtneyc1 Oct 13, 2023
3cff819
npm test -u
courtneyc1 Oct 13, 2023
9970d6b
npm audit fix for frontend push
courtneyc1 Oct 13, 2023
2b28d8d
npm audit fix for docs
courtneyc1 Oct 13, 2023
576c367
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
courtneyc1 Oct 13, 2023
598ae3a
Merge branch 'master' into 2209-footer-cutting-off-export-users-page
courtneyc1 Oct 16, 2023
b9d2f25
docs/package-lock.json updated
courtneyc1 Oct 16, 2023
ffa26c1
Updated Footer 'absolute' to 'relative'
courtneyc1 Oct 16, 2023
5614683
npm audit fix for frontend/vunerabilities
courtneyc1 Oct 18, 2023
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
3,427 changes: 1,328 additions & 2,099 deletions backend/package-lock.json

Large diffs are not rendered by default.

1,568 changes: 810 additions & 758 deletions docs/package-lock.json

Large diffs are not rendered by default.

10,194 changes: 3,900 additions & 6,294 deletions frontend/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/src/components/Footer/styleFooter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const footerClasses = {
};
export const FooterRoot = styled('div')(({ theme }) => ({
[`& .${footerClasses.footerBox}`]: {
position: 'absolute',
position: 'relative',
bottom: 0,
width: '100%',
backgroundColor: theme.palette.primary.main
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/FooterOriginal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const CrossfeedFooter: React.FC = () => {
alignItems={'center'}
justifyContent={'center'}
style={{
position: 'fixed',
margin: '0 auto',
marginTop: '1rem',
maxWidth: '1444px'
Expand Down
26 changes: 16 additions & 10 deletions frontend/src/components/ImportExport/ImportExport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { FileInput } from 'components';
import { useAuthContext } from 'context';
import Papa from 'papaparse';
import * as FileSaver from 'file-saver';
import * as FormStyles from './style';

interface ImportProps<T> {
// Plural name of the model.
Expand All @@ -26,6 +27,9 @@ export interface ExportProps<T> {

interface ImportExportProps<T> extends ImportProps<T>, ExportProps<T> {}

const FormRoot = FormStyles.FormRoot;
const importExportClasses = FormStyles.importExportClasses;

export const Import = <T extends object>(props: ImportProps<T>) => {
const { setLoading } = useAuthContext();
const { name, onImport } = props;
Expand Down Expand Up @@ -83,16 +87,18 @@ export const exportCSV = async <T extends object>(
export const Export = <T extends object>(props: ExportProps<T>) => {
const { setLoading } = useAuthContext();
return (
<form>
<h2>Export {props.name}</h2>
<Button
type="button"
outline
onClick={() => exportCSV(props, setLoading)}
>
Export as CSV
</Button>
</form>
<FormRoot>
<form className={importExportClasses.formExport}>
<h2>Export {props.name}</h2>
<Button
type="button"
outline
onClick={() => exportCSV(props, setLoading)}
>
Export as CSV
</Button>
</form>
</FormRoot>
);
};

Expand Down
14 changes: 14 additions & 0 deletions frontend/src/components/ImportExport/style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { styled } from '@mui/material/styles';

const PREFIX = 'ImportExport';

export const importExportClasses = {
formImport: `${PREFIX}-formImport`,
formExport: `${PREFIX}-formExport`
};

export const FormRoot = styled('form')(({ theme }) => ({
[`& .${importExportClasses.formExport}`]: {
marginBottom: '6rem'
}
}));
Loading
Loading