Skip to content

Commit 27247ec

Browse files
Merge branch 'PROD-1529_page-footer' into PROD-1573_work-details-solutions
2 parents 84157f4 + 7069e8a commit 27247ec

File tree

12 files changed

+130
-123
lines changed

12 files changed

+130
-123
lines changed

src-ts/lib/tabs-navbar/TabsNavbar.module.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,27 @@
1515
gap: 4px;
1616

1717
padding: $pad-md $pad-lg calc($pad-md - 2px);
18+
color: $black-80;
1819
cursor: pointer;
19-
20+
2021
&:global(.active) {
22+
color: $black-100;
2123
.tab-label {
22-
color: $black-100;
24+
@include font-weight-bold;
25+
}
26+
}
27+
28+
&:hover {
29+
color: $black-100;
30+
background-color: $blue-25;
31+
&:global(.active) ~ .active-icon > svg path:last-child {
32+
fill: $blue-25;
2333
}
2434
}
2535
}
2636

2737
.tab-label {
2838
@extend .medium-tab;
29-
color: $black-80;
3039
}
3140

3241
.tab-badge {

src-ts/tools/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export { default as ToolsRoutes } from './tools.routes'
2-
export { WorkFeedback, WorkDetailHeader, WorkDetailSummary, WorkDetailSolutions } from './work'
2+
export { WorkFeedback, WorkDetailDetails, WorkDetailHeader, WorkDetailSummary, WorkDetailSolutions } from './work'

src-ts/tools/work/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
export * from './work-detail-details'
12
export * from './work-detail-header'
23
export * from './work-detail-solutions'
34
export * from './work-detail-summary'
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@import "../../../lib/styles";
2+
3+
.wrap {
4+
display: flex;
5+
padding-bottom: 32px;
6+
}
7+
8+
.details-content {
9+
flex-grow: 2;
10+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { FC } from 'react'
2+
3+
import { WorkDetailDetailsSidebar } from './work-detail-details-sidebar'
4+
import styles from './WorkDetailDetails.module.scss'
5+
6+
interface WorkDetailDetailsProps {
7+
children: JSX.Element
8+
}
9+
10+
const WorkDetailDetails: FC<WorkDetailDetailsProps> = (props: WorkDetailDetailsProps) => {
11+
12+
return (
13+
<div className={styles['wrap']}>
14+
<div className={styles['details-content']}>
15+
{props.children}
16+
</div>
17+
<WorkDetailDetailsSidebar />
18+
</div>
19+
)
20+
}
21+
22+
export default WorkDetailDetails
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as WorkDetailDetails } from './WorkDetailDetails'
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@import '../../../../lib/styles';
2+
3+
.wrap {
4+
min-width: 323px;
5+
padding-left: $pad-xxxxl;
6+
7+
border-left: $border-xs solid $black-10;
8+
margin-left: $pad-xxxxl;
9+
color: $black-100;
10+
}
11+
12+
.link {
13+
display: block;
14+
@include font-roboto;
15+
@include font-weight-bold;
16+
font-size: 14px;
17+
line-height: 14px;
18+
color: $turq-160;
19+
margin-top: $pad-lg;
20+
cursor: pointer;
21+
text-transform: uppercase;
22+
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import { Dispatch, FC, SetStateAction, useState } from 'react'
2+
3+
import { OrderContractModal, PrivacyPolicyModal, TermsModal } from '../../../../lib'
4+
5+
import styles from './WorkDetailDetailsSidebar.module.scss'
6+
7+
interface WorkDetailDetailsSidebarProps {
8+
}
9+
10+
const WorkDetailDetailsSidebar: FC<WorkDetailDetailsSidebarProps> = (props: WorkDetailDetailsSidebarProps) => {
11+
const [isOrderContractModalOpen, setIsOrderContractModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
12+
const [isPrivacyPolicyModalOpen, setIsPrivacyPolicyModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
13+
const [isTermsModalOpne, setIsTermsModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>] = useState<boolean>(false)
14+
15+
return (
16+
<>
17+
<OrderContractModal isOpen={isOrderContractModalOpen} onClose={() => setIsOrderContractModalOpen(false)} />
18+
<PrivacyPolicyModal isOpen={isPrivacyPolicyModalOpen} onClose={() => setIsPrivacyPolicyModalOpen(false)} />
19+
<TermsModal isOpen={isTermsModalOpne} onClose={() => setIsTermsModalOpen(false)} />
20+
21+
<div className={styles['wrap']}>
22+
<h4>supporting information</h4>
23+
<a
24+
className={styles['link']}
25+
role='button'
26+
tabIndex={0}
27+
onClick={() => setIsOrderContractModalOpen(true)}
28+
rel='noopener noreferrer'
29+
>
30+
ORDER CONTRACT
31+
</a>
32+
<a
33+
className={styles['link']}
34+
role='button'
35+
tabIndex={0}
36+
onClick={() => setIsPrivacyPolicyModalOpen(true)}
37+
rel='noopener noreferrer'
38+
>
39+
PRIVACY POLICY
40+
</a>
41+
<a
42+
className={styles['link']}
43+
role='button'
44+
tabIndex={0}
45+
onClick={() => setIsTermsModalOpen(true)}
46+
rel='noopener noreferrer'
47+
>
48+
TERMS
49+
</a>
50+
</div>
51+
</>
52+
)
53+
}
54+
55+
export default WorkDetailDetailsSidebar
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as WorkDetailDetailsSidebar } from './WorkDetailDetailsSidebar'

src/routes/WorkItems/components/Details/index.jsx

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)