Skip to content
Snippets Groups Projects
Commit ed69ad60 authored by Saket Agrahari's avatar Saket Agrahari
Browse files

change log and bundle

parent 30cc8a6d
No related branches found
No related tags found
1 merge request!32COMP-184:Funding Source Issue
...@@ -2,6 +2,15 @@ ...@@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [0.17] - 2023-05-24
- COMP-184 Funding Source UI upgrade
- COMP-188 Nren Name correction
- COMP-186 Fixed Graph Size
- country to nren filterbo
- Fixing side bars and banner
- Collapsible box
- clean up
## [0.16] - 2023-05-17 ## [0.16] - 2023-05-17
- COMP-143 Policy Page UI changes - COMP-143 Policy Page UI changes
- COMP-180 Year selection UI chnages - COMP-180 Year selection UI chnages
......
This diff is collapsed.
...@@ -6,7 +6,7 @@ function ColorBadge({ index: index, active=true }) { ...@@ -6,7 +6,7 @@ function ColorBadge({ index: index, active=true }) {
{active ? ( {active ? (
<div <div
className={`color-of-badge-${index % 5}`} className={`color-of-badge-${index % 5}`}
style={{ width: "15px", height: "30px", margin: "2px" }} style={{ width: "20px", height: "35px", margin: "2px" }}
></div> ></div>
) : ( ) : (
<div <div
......
...@@ -47,6 +47,11 @@ export const chartOptions = { ...@@ -47,6 +47,11 @@ export const chartOptions = {
position: 'top' as const, position: 'top' as const,
stacked: true, stacked: true,
ticks: { ticks: {
font:{
size: 20,
family: 'Open Sans, sans-serif',
weight: 'bold',
},
callback: (value: string | number) => { callback: (value: string | number) => {
if (typeof value === 'number') { if (typeof value === 'number') {
return `${value}%`; return `${value}%`;
...@@ -54,11 +59,7 @@ export const chartOptions = { ...@@ -54,11 +59,7 @@ export const chartOptions = {
return value; return value;
}, },
}, },
font: {
size: 29,
family: 'Roboto',
weight: 'bold',
}
}, },
x2: { x2: {
stacked: true, stacked: true,
...@@ -69,12 +70,30 @@ export const chartOptions = { ...@@ -69,12 +70,30 @@ export const chartOptions = {
} }
return value; return value;
}, },
font: {
size: 20,
family: 'Open Sans, sans-serif',
weight: 'bold',
}
},
grid: {
display: false,
drawTicks: false,
drawBorder: false,
}, },
min : 0,
max : 100
}, },
y: { y: {
stacked: true, stacked: true,
ticks: { ticks: {
autoSkip: false, autoSkip: false,
font: {
size: 20,
family: 'Open Sans, sans-serif',
weight: 'bold',
}
}, },
}, },
}, },
...@@ -128,23 +147,24 @@ function FundingSourcePage({ filterSelection, setFilterSelection }: inputProps) ...@@ -128,23 +147,24 @@ function FundingSourcePage({ filterSelection, setFilterSelection }: inputProps)
return ( return (
<DataPage title="Funding Source" category={Sections.Organisation} filter={filterNode}> <DataPage title="Funding Source" category={Sections.Organisation} filter={filterNode}>
<div> <div>
<Container className=" border border-dark chart-Legend"> <Container className=" border rounded-3 border-1 funding-chart-Legend"
<Row > style={{ marginTop: '20px', marginBottom: '20px', padding: '10px'}}>
<Col> <Row fluid className="justify-content-center">
<Col className="d-flex align-items-center">
<ColorBadge key={0} index={0}/> <ColorBadge key={0} index={0}/>
<span>CLIENT INSTITUTIONS</span></Col> <span className='bold-caps-16pt'>CLIENT INSTITUTIONS</span></Col>
<Col> <Col className="d-flex align-items-center" >
<ColorBadge key={1} index={1}/> <ColorBadge key={1} index={1}/>
<span>COMMERCIAL</span></Col> <span className='bold-caps-16pt'>COMMERCIAL</span></Col>
<Col> <Col className="d-flex align-items-center" >
<ColorBadge key={2} index={2}/> <ColorBadge key={2} index={2}/>
<span>EUROPEAN FUNDING</span></Col> <span className='bold-caps-16pt'>EUROPEAN FUNDING</span></Col>
<Col> <Col className="d-flex align-items-center" >
<ColorBadge key={3} index={3}/> <ColorBadge key={3} index={3}/>
<span>GOV/PUBLIC_BODIES</span></Col> <span className='bold-caps-16pt'>GOV/PUBLIC BODIES</span></Col>
<Col> <Col className="d-flex align-items-center" >
<ColorBadge key={4} index={4}/> <ColorBadge key={4} index={4}/>
<span>OTHER</span></Col> <span className='bold-caps-16pt dark-teal'>OTHER</span></Col>
</Row> </Row>
</Container> </Container>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment