Skip to content

Commit 7c339a9

Browse files
barshathakurisamshara
barshathakuri
authored and
samshara
committed
Remove filters from ongoing emergencies
1 parent 001f740 commit 7c339a9

File tree

19 files changed

+1072
-190
lines changed

19 files changed

+1072
-190
lines changed

‎app/src/views/CountryNsOverviewActivities/index.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,8 @@ export function Component() {
310310

311311
return (
312312
<Container
313+
className={styles.nsActivity}
313314
childrenContainerClassName={styles.countryThreeWNationalSocietyProjects}
314-
headerDescription={strings.nSActivityDescription}
315-
headerDescriptionContainerClassName={styles.nsActivityDescription}
316315
actions={(
317316
<Link
318317
to="newThreeWActivity"
@@ -323,6 +322,14 @@ export function Component() {
323322
</Link>
324323
)}
325324
>
325+
{/* // FIXME: This should be handle by Container */}
326+
<div className={styles.nsActivityHeader}>
327+
<div className={styles.dummy} />
328+
<div className={styles.nsActivityDescription}>
329+
{strings.nSActivityDescription}
330+
</div>
331+
<div className={styles.dummy} />
332+
</div>
326333
{projectListPending && <BlockLoading />}
327334
{!projectListPending && showCardsSection && (
328335
<div className={styles.keyFigureCardList}>

‎app/src/views/CountryNsOverviewActivities/styles.module.css‎

Lines changed: 78 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,105 @@
1-
.country-three-w-national-society-projects {
2-
display: flex;
3-
flex-direction: column;
4-
gap: var(--go-ui-spacing-2xl);
5-
6-
.key-figure-card-list {
7-
display: grid;
8-
grid-gap: var(--go-ui-spacing-md);
9-
grid-template-columns: repeat(auto-fill, minmax(22rem, 1fr));
10-
11-
@media screen and (max-width: 30rem) {
12-
grid-template-columns: repeat(auto-fit, minmax(16rem, 1fr));
13-
}
1+
.ns-activity {
2+
.country-three-w-national-society-projects {
3+
display: flex;
4+
flex-direction: column;
5+
gap: var(--go-ui-spacing-2xl);
146

15-
.key-figure-card {
7+
.ns-activity-header {
168
display: flex;
17-
gap: var(--go-ui-spacing-md);
18-
border-radius: var(--go-ui-border-radius-lg);
19-
box-shadow: var(--go-ui-box-shadow-md);
20-
background-color: var(--go-ui-color-white);
21-
padding: var(--go-ui-spacing-md);
22-
23-
.separator {
24-
flex-shrink: 0;
25-
border-left: var(--go-ui-width-separator-sm) solid var(--go-ui-color-separator);
26-
}
9+
align-items: center;
10+
flex-direction: column;
2711

28-
.pie-chart-container {
29-
flex-basis: 0;
12+
.dummy {
3013
flex-grow: 1;
14+
width: var(--go-ui-spacing-xs);
15+
}
3116

32-
.pie-chart {
33-
flex-wrap: wrap;
34-
justify-content: center;
35-
}
17+
.ns-activity-description {
18+
max-width: var(--go-ui-page-header-description-width-max);
19+
text-align: center;
3620
}
21+
}
3722

38-
.key-figure {
39-
flex-basis: 0;
40-
flex-grow: 1;
41-
padding: 0;
23+
.key-figure-card-list {
24+
display: grid;
25+
grid-gap: var(--go-ui-spacing-md);
26+
grid-template-columns: repeat(auto-fill, minmax(22rem, 1fr));
4227

43-
.key-figure-description {
44-
font-size: var(--go-ui-font-size-sm);
45-
}
28+
@media screen and (max-width: 30rem) {
29+
grid-template-columns: repeat(auto-fit, minmax(16rem, 1fr));
4630
}
47-
}
48-
}
4931

50-
.ongoing-projects {
51-
overflow: auto;
32+
.key-figure-card {
33+
display: flex;
34+
gap: var(--go-ui-spacing-md);
35+
border-radius: var(--go-ui-border-radius-lg);
36+
box-shadow: var(--go-ui-box-shadow-md);
37+
background-color: var(--go-ui-color-white);
38+
padding: var(--go-ui-spacing-md);
39+
40+
.separator {
41+
flex-shrink: 0;
42+
border-left: var(--go-ui-width-separator-sm) solid var(--go-ui-color-separator);
43+
}
5244

53-
.content {
54-
display: flex;
55-
flex-direction: column;
56-
gap: var(--go-ui-spacing-xl);
45+
.pie-chart-container {
46+
flex-basis: 0;
47+
flex-grow: 1;
48+
49+
.pie-chart {
50+
flex-wrap: wrap;
51+
justify-content: center;
52+
}
53+
}
54+
55+
.key-figure {
56+
flex-basis: 0;
57+
flex-grow: 1;
58+
padding: 0;
59+
60+
.key-figure-description {
61+
font-size: var(--go-ui-font-size-sm);
62+
}
63+
}
64+
}
5765
}
5866

59-
.sidebar {
60-
height: 100%;
67+
.ongoing-projects {
6168
overflow: auto;
6269

63-
.sidebar-content {
70+
.content {
71+
display: flex;
72+
flex-direction: column;
73+
gap: var(--go-ui-spacing-xl);
74+
}
75+
76+
.sidebar {
77+
height: 100%;
6478
overflow: auto;
6579

66-
.projects-in-country {
67-
display: flex;
68-
flex-direction: column;
69-
gap: var(--go-ui-spacing-sm);
80+
.sidebar-content {
81+
overflow: auto;
7082

71-
.project-in-country-item {
83+
.projects-in-country {
7284
display: flex;
85+
flex-direction: column;
86+
gap: var(--go-ui-spacing-sm);
7387

74-
.name {
75-
flex-grow: 1;
76-
}
88+
.project-in-country-item {
89+
display: flex;
90+
91+
.name {
92+
flex-grow: 1;
93+
}
7794

78-
.action {
79-
flex-shrink: 0;
80-
font-size: var(--go-ui-height-icon-multiplier);
95+
.action {
96+
flex-shrink: 0;
97+
font-size: var(--go-ui-height-icon-multiplier);
98+
}
8199
}
82100
}
83101
}
84102
}
85103
}
86104
}
87-
}
105+
}

‎app/src/views/CountryNsOverviewCapacity/index.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ export function Component() {
4747

4848
return (
4949
<Container
50+
className={styles.nsOverviewCapacity}
5051
childrenContainerClassName={styles.countryNsOverviewCapacity}
5152
headerDescription={strings.nSOverviewCapacityDescription}
52-
headerDescriptionContainerClassName={styles.nsOverviewCapacity}
53+
headerDescriptionContainerClassName={styles.nsOverviewCapacityDescription}
5354
actions={(
5455
<Link
5556
href="https://www.ifrc.org/evaluations/"

‎app/src/views/CountryNsOverviewCapacity/styles.module.css‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
.country-ns-overview-capacity {
2-
display: flex;
3-
flex-direction: column;
4-
gap: var(--go-ui-spacing-2xl);
5-
6-
.loading {
7-
position: absolute;
8-
top: 0;
9-
left: 0;
10-
width: 100%;
11-
height: 100%;
1+
.ns-overview-capacity {
2+
.ns-overview-capacity-description {
3+
display: flex;
4+
align-items: center;
5+
flex-direction: column;
126
}
137

14-
.empty-message {
15-
grid-column: -1 / 1;
16-
}
8+
.country-ns-overview-capacity {
9+
display: flex;
10+
flex-direction: column;
11+
gap: var(--go-ui-spacing-2xl);
12+
13+
.loading {
14+
position: absolute;
15+
top: 0;
16+
left: 0;
17+
width: 100%;
18+
height: 100%;
19+
}
20+
21+
.empty-message {
22+
grid-column: -1 / 1;
23+
}
1724

18-
.per-cycle-item {
19-
border-radius: var(--go-ui-box-shadow-lg);
20-
box-shadow: var(--go-ui-box-shadow-md);
25+
.per-cycle-item {
26+
border-radius: var(--go-ui-box-shadow-lg);
27+
box-shadow: var(--go-ui-box-shadow-md);
28+
}
2129
}
2230
}

‎app/src/views/CountryNsOverviewContextAndStructure/i18n.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"namespace": "countryNsOverviewContextAndStructure",
33
"strings": {
44
"keyLinksHeading": "Key Links",
5-
"nationalSocietyPageOnFDRS": "National Society Page on FRDS",
5+
"nationalSocietyPageOnFDRS": "National Society Page on FDRS",
66
"countryOnIFRC": "{countryName} on IFRC.org",
77
"countryOnReliefWeb": "{countryName} on reliefweb.int",
88
"countryRCHomepage": "{countryName} RC Homepage",

‎app/src/views/CountryNsOverviewStrategicPriorities/index.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ export function Component() {
173173

174174
return (
175175
<Container
176+
className={styles.strategicPriorities}
176177
childrenContainerClassName={styles.countryNsOverviewStrategicPriorities}
178+
headerDescriptionContainerClassName={styles.strategicPrioritiesHeader}
177179
headerDescription={strings.strategicPrioritiesDescription}
178180
>
179181
{(perPending || countryPlanPending) && (

0 commit comments

Comments
 (0)