Skip to content

Commit

Permalink
Updated list headers
Browse files Browse the repository at this point in the history
  • Loading branch information
FuriousLlama committed Dec 13, 2024
1 parent 2183180 commit c530a70
Show file tree
Hide file tree
Showing 19 changed files with 117 additions and 649 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { toast } from 'react-toastify';

import { StyledIconButton } from '@/components/common/buttons/IconButton';
import { StyledAddButton } from '@/components/common/styles';
import * as CommonStyled from '@/components/common/styles';
import TooltipWrapper from '@/components/common/TooltipWrapper';
import Claims from '@/constants/claims';
import { useApiAcquisitionFile } from '@/hooks/pims-api/useApiAcquisitionFile';
Expand Down Expand Up @@ -95,7 +96,7 @@ export const AcquisitionListView: React.FunctionComponent<
return (
<Styled.ListPage>
<Styled.Scrollable>
<Styled.PageHeader>Acquisition Files</Styled.PageHeader>
<CommonStyled.H1>Acquistion Files</CommonStyled.H1>
<Styled.PageToolbar>
<Row>
<Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useCallback, useEffect } from 'react';
import { toast } from 'react-toastify';
import styled from 'styled-components';

import * as CommonStyled from '@/components/common/styles';
import { Table } from '@/components/Table';
import { useApiAccessRequests } from '@/hooks/pims-api/useApiAccessRequests';
import { useSearch } from '@/hooks/useSearch';
Expand Down Expand Up @@ -48,7 +49,7 @@ const ManageAccessRequestsPage = () => {

return (
<StyledContainer>
<StyledPageHeader>PIMS User Access Requests</StyledPageHeader>
<CommonStyled.H1>PIMS User Access Requests</CommonStyled.H1>
<AccessRequestFilter
initialValues={filter}
applyFilter={accessRequestfilter => setFilter(accessRequestfilter)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ exports[`Manage access requests > Snapshot matches 1`] = `
background: white;
}
.c2 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c0 {
padding: 1.6rem 3.2rem;
-webkit-box-flex: 1;
Expand All @@ -251,18 +261,14 @@ exports[`Manage access requests > Snapshot matches 1`] = `
height: 100%;
}
.c2 {
text-align: left;
}
<div
class="c0 c1"
>
<h3
<h1
class="c2"
>
PIMS User Access Requests
</h3>
</h1>
<form
class="c3 p-3"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import styled from 'styled-components';
import LoadingBackdrop from '@/components/common/LoadingBackdrop';
import { Scrollable as ScrollableBase } from '@/components/common/Scrollable/Scrollable';
import { Section } from '@/components/common/Section/Section';
import * as CommonStyled from '@/components/common/styles';
import DocumentListContainer from '@/features/documents/list/DocumentListContainer';
import { ApiGen_CodeTypes_DocumentRelationType } from '@/models/api/generated/ApiGen_CodeTypes_DocumentRelationType';
import { ApiGen_Concepts_FormDocumentType } from '@/models/api/generated/ApiGen_Concepts_FormDocumentType';
Expand All @@ -29,7 +30,7 @@ export const DocumentTemplateManagementView: React.FunctionComponent<
<Scrollable>
<LoadingBackdrop show={props.isLoading} />

<StyledPageHeader>PIMS Document Template Management</StyledPageHeader>
<CommonStyled.H1>PIMS Document Template Management</CommonStyled.H1>
<Section>
<Row>
<Col xs="auto">Form Type:</Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@ exports[`DocumentTemplateManagementContainer component > matches snapshot 1`] =
class="Toastify"
/>
<div />
.c1 {
.c3 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c1 {
width: 100%;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
Expand All @@ -23,10 +33,6 @@ exports[`DocumentTemplateManagementContainer component > matches snapshot 1`] =
border-radius: 0.5rem;
}
.c3 {
text-align: left;
}
.c0 {
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -55,11 +61,11 @@ exports[`DocumentTemplateManagementContainer component > matches snapshot 1`] =
<div
class="c1 c2"
>
<h3
<h1
class="c3"
>
PIMS Document Template Management
</h3>
</h1>
<div
class="c4 form-section"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Col, Row } from 'react-bootstrap';
import { FaPlus } from 'react-icons/fa';
import { useHistory } from 'react-router';

import * as CommonStyled from '@/components/common/styles';
import { StyledAddButton } from '@/components/common/styles';
import { TableSort } from '@/components/Table/TableSort';
import { Roles } from '@/constants/roles';
Expand Down Expand Up @@ -97,7 +98,7 @@ export const FinancialCodeListView: React.FC = () => {
return (
<Styled.ListPage>
<Styled.Scrollable>
<Styled.PageHeader>Financial Codes</Styled.PageHeader>
<CommonStyled.H1>Financial Codes</CommonStyled.H1>
<Styled.PageToolbar>
<Row>
<Col>
Expand Down
3 changes: 2 additions & 1 deletion source/frontend/src/features/admin/users/ManageUsersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { FaFileExcel } from 'react-icons/fa';
import styled from 'styled-components';

import { StyledIconButton } from '@/components/common/buttons';
import * as CommonStyled from '@/components/common/styles';
import TooltipWrapper from '@/components/common/TooltipWrapper';
import { Table } from '@/components/Table';
import { useApiUsers } from '@/hooks/pims-api/useApiUsers';
Expand Down Expand Up @@ -75,7 +76,7 @@ export const ManageUsersPage = () => {

return (
<StyledPage fluid className="users-management-page">
<StyledPageHeader>User Management</StyledPageHeader>
<CommonStyled.H1>User Management</CommonStyled.H1>
<Row>
<Col md={8}>
<UsersFilterBar values={filter} onChange={setFilter} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,16 @@ exports[`Manage Users Component > Snapshot matches 1`] = `
background: white;
}
.c2 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c3 {
background-color: #d9eaf7;
border-radius: 0.5rem;
Expand Down Expand Up @@ -346,18 +356,14 @@ exports[`Manage Users Component > Snapshot matches 1`] = `
padding: 1rem 2rem;
}
.c2 {
text-align: left;
}
<div
class="c0 c1 users-management-page container-fluid"
>
<h3
<h1
class="c2"
>
User Management
</h3>
</h1>
<div
class="row"
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import styled from 'styled-components';

import { Scrollable as ScrollableBase } from '@/components/common/Scrollable/Scrollable';
import * as CommonStyled from '@/components/common/styles';
import ContactManagerView from '@/components/contact/ContactManagerView/ContactManagerView';

/**
Expand All @@ -10,7 +11,7 @@ export const ContactListPage = () => {
return (
<StyledListPage>
<StyledScrollable>
<StyledPageHeader>Contacts</StyledPageHeader>
<CommonStyled.H1>Contacts</CommonStyled.H1>
<ContactManagerView showActiveSelector showAddButton />
</StyledScrollable>
</StyledListPage>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,16 @@ exports[`Contact List View > matches snapshot 1`] = `
flex-wrap: nowrap;
}
.c3 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c5.form-group {
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -478,10 +488,6 @@ exports[`Contact List View > matches snapshot 1`] = `
width: 100%;
}
.c3 {
text-align: left;
}
@media only screen and (max-width:1199px) {
.c4 {
max-width: 50%;
Expand All @@ -494,11 +500,11 @@ exports[`Contact List View > matches snapshot 1`] = `
<div
class="c1 c2"
>
<h3
<h1
class="c3"
>
Contacts
</h3>
</h1>
<div>
<div
class="row"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useHistory } from 'react-router-dom';
import { toast } from 'react-toastify';

import { StyledIconButton } from '@/components/common/buttons';
import * as CommonStyled from '@/components/common/styles';
import { StyledAddButton } from '@/components/common/styles';
import TooltipWrapper from '@/components/common/TooltipWrapper';
import { Claims } from '@/constants';
Expand Down Expand Up @@ -115,7 +116,7 @@ export const DispositionListView: React.FC<unknown> = () => {
return (
<S.ListPage>
<S.Scrollable>
<S.PageHeader>Disposition Files</S.PageHeader>
<CommonStyled.H1>Disposition Files</CommonStyled.H1>
<S.PageToolbar>
<Row>
<Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,16 @@ exports[`Disposition List View > matches snapshot 1`] = `
font-size: 2.4rem;
}
.c3 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c5 {
background-color: #d9eaf7;
border-radius: 0.5rem;
Expand Down Expand Up @@ -365,10 +375,6 @@ exports[`Disposition List View > matches snapshot 1`] = `
width: 100%;
}
.c3 {
text-align: left;
}
.c4 {
-webkit-align-items: center;
-webkit-box-align: center;
Expand All @@ -388,11 +394,11 @@ exports[`Disposition List View > matches snapshot 1`] = `
<div
class="c1 c2"
>
<h3
<h1
class="c3"
>
Disposition Files
</h3>
</h1>
<div
class="c4"
>
Expand Down
3 changes: 2 additions & 1 deletion source/frontend/src/features/leases/list/LeaseListView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useHistory } from 'react-router';
import { toast } from 'react-toastify';

import { StyledIconButton } from '@/components/common/buttons';
import * as CommonStyled from '@/components/common/styles';
import { StyledAddButton } from '@/components/common/styles';
import TooltipWrapper from '@/components/common/TooltipWrapper';
import Claims from '@/constants/claims';
Expand Down Expand Up @@ -80,7 +81,7 @@ export const LeaseListView: React.FunctionComponent<React.PropsWithChildren<unkn
return (
<Styled.ListPage>
<Styled.Scrollable>
<Styled.PageHeader>Leases &amp; Licences</Styled.PageHeader>
<CommonStyled.H1>Leases &amp; Licences</CommonStyled.H1>
<Styled.PageToolbar>
<Row>
<Col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,16 @@ exports[`Lease and License List View > matches snapshot 1`] = `
height: 1.6rem;
}
.c3 {
color: #474543;
font-family: 'BCSans-Bold';
font-size: 3.2rem;
border-bottom: solid 0.5rem var(--theme-blue-90);
width: 100%;
text-align: left;
margin-bottom: 2.4rem;
}
.c5 {
background-color: #d9eaf7;
border-radius: 0.5rem;
Expand Down Expand Up @@ -385,10 +395,6 @@ exports[`Lease and License List View > matches snapshot 1`] = `
width: 100%;
}
.c3 {
text-align: left;
}
.c4 {
-webkit-align-items: center;
-webkit-box-align: center;
Expand All @@ -404,11 +410,11 @@ exports[`Lease and License List View > matches snapshot 1`] = `
<div
class="c1 c2"
>
<h3
<h1
class="c3"
>
Leases & Licences
</h3>
</h1>
<div
class="c4"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Col, Row } from 'react-bootstrap';
import { FaPlus } from 'react-icons/fa';
import { useHistory } from 'react-router-dom';

import * as CommonStyled from '@/components/common/styles';
import { StyledAddButton } from '@/components/common/styles';
import { Claims } from '@/constants/claims';
import { useApiProjects } from '@/hooks/pims-api/useApiProjects';
Expand Down Expand Up @@ -54,7 +55,7 @@ export const ProjectListView: React.FunctionComponent<React.PropsWithChildren<un
return (
<Styled.ListPage>
<Styled.Scrollable>
<Styled.PageHeader>Projects</Styled.PageHeader>
<CommonStyled.H1>Projects</CommonStyled.H1>
<Styled.PageToolbar>
<Row>
<Col>
Expand Down
Loading

0 comments on commit c530a70

Please sign in to comment.