From 7e8d5b043542f71c018ed6b7732637b8ff91bf24 Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:05:33 +0300 Subject: [PATCH 01/24] update no image design --- .../topicbox/topicbox.component.html | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index 9e8fd6e16..f4ded1471 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,27 +106,25 @@
- - -
+
-
- - -
- - - -
- - +
+ + +
+ + + +
+
From b2dd944b6b5a7a7e6c2c81618a6afb7be5cce8e1 Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:07:16 +0300 Subject: [PATCH 02/24] Revert "update no image design" This reverts commit a2109cc3cdc8f44352431324be6bd1ea0b4f9b2e. --- .../topicbox/topicbox.component.html | 30 +++++-------------- .../topicbox/topicbox.component.scss | 22 ++------------ src/assets/imgs/no_image_discussion.svg | 30 ------------------- src/assets/imgs/no_image_follow_up.svg | 30 ------------------- src/assets/imgs/no_image_ideation.svg | 30 ------------------- src/assets/imgs/no_image_voting.svg | 30 ------------------- 6 files changed, 10 insertions(+), 162 deletions(-) delete mode 100644 src/assets/imgs/no_image_discussion.svg delete mode 100644 src/assets/imgs/no_image_follow_up.svg delete mode 100644 src/assets/imgs/no_image_ideation.svg delete mode 100644 src/assets/imgs/no_image_voting.svg diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index f4ded1471..f26d7cb17 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,25 +106,13 @@
- -
-
- - -
- - - -
- +
+ + + +
@@ -174,9 +162,7 @@
- + {{topic.lastActivity | amTimeAgo}}
diff --git a/src/app/public-topics/components/topicbox/topicbox.component.scss b/src/app/public-topics/components/topicbox/topicbox.component.scss index 9017f5b03..15b6a23bb 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.scss +++ b/src/app/public-topics/components/topicbox/topicbox.component.scss @@ -135,25 +135,6 @@ align-items: center; justify-content: center; background-color: var(--color-border); - background-position: center; - background-repeat: no-repeat; - background-size: cover; - - &.discussion { - background-image: url("/assets/imgs/no_image_discussion.svg"); - } - - &.voting { - background-image: url("/assets/imgs/no_image_voting.svg"); - } - - &.ideation { - background-image: url("/assets/imgs/no_image_ideation.svg"); - } - - &.follow_up { - background-image: url("/assets/imgs/no_image_follow_up.svg"); - } } .image_overlay { @@ -287,10 +268,11 @@ height: 100%; align-items: center; justify-content: center; - background-color: rgba(255, 255, 255, 0.5); + background-color: rgba(255,255,255, 0.5); button { z-index: 99; gap: 8px; } } + diff --git a/src/assets/imgs/no_image_discussion.svg b/src/assets/imgs/no_image_discussion.svg deleted file mode 100644 index 5ec6f827e..000000000 --- a/src/assets/imgs/no_image_discussion.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_follow_up.svg b/src/assets/imgs/no_image_follow_up.svg deleted file mode 100644 index b793672c0..000000000 --- a/src/assets/imgs/no_image_follow_up.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_ideation.svg b/src/assets/imgs/no_image_ideation.svg deleted file mode 100644 index ce01440da..000000000 --- a/src/assets/imgs/no_image_ideation.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_voting.svg b/src/assets/imgs/no_image_voting.svg deleted file mode 100644 index 394441346..000000000 --- a/src/assets/imgs/no_image_voting.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 2da42cc6d918f7b82873e717614a980dc2957efe Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:12:32 +0300 Subject: [PATCH 03/24] update no image design --- .../topicbox/topicbox.component.html | 30 ++++++++++++++----- .../topicbox/topicbox.component.scss | 22 ++++++++++++-- src/assets/imgs/no_image_discussion.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_follow_up.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_ideation.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_voting.svg | 30 +++++++++++++++++++ 6 files changed, 162 insertions(+), 10 deletions(-) create mode 100644 src/assets/imgs/no_image_discussion.svg create mode 100644 src/assets/imgs/no_image_follow_up.svg create mode 100644 src/assets/imgs/no_image_ideation.svg create mode 100644 src/assets/imgs/no_image_voting.svg diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index f26d7cb17..4f6b6c918 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,13 +106,25 @@
-
- - - -
+ +
+
+ + +
+ + + +
+
@@ -162,7 +174,9 @@
- + {{topic.lastActivity | amTimeAgo}}
diff --git a/src/app/public-topics/components/topicbox/topicbox.component.scss b/src/app/public-topics/components/topicbox/topicbox.component.scss index 15b6a23bb..9017f5b03 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.scss +++ b/src/app/public-topics/components/topicbox/topicbox.component.scss @@ -135,6 +135,25 @@ align-items: center; justify-content: center; background-color: var(--color-border); + background-position: center; + background-repeat: no-repeat; + background-size: cover; + + &.discussion { + background-image: url("/assets/imgs/no_image_discussion.svg"); + } + + &.voting { + background-image: url("/assets/imgs/no_image_voting.svg"); + } + + &.ideation { + background-image: url("/assets/imgs/no_image_ideation.svg"); + } + + &.follow_up { + background-image: url("/assets/imgs/no_image_follow_up.svg"); + } } .image_overlay { @@ -268,11 +287,10 @@ height: 100%; align-items: center; justify-content: center; - background-color: rgba(255,255,255, 0.5); + background-color: rgba(255, 255, 255, 0.5); button { z-index: 99; gap: 8px; } } - diff --git a/src/assets/imgs/no_image_discussion.svg b/src/assets/imgs/no_image_discussion.svg new file mode 100644 index 000000000..5ec6f827e --- /dev/null +++ b/src/assets/imgs/no_image_discussion.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_follow_up.svg b/src/assets/imgs/no_image_follow_up.svg new file mode 100644 index 000000000..b793672c0 --- /dev/null +++ b/src/assets/imgs/no_image_follow_up.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_ideation.svg b/src/assets/imgs/no_image_ideation.svg new file mode 100644 index 000000000..ce01440da --- /dev/null +++ b/src/assets/imgs/no_image_ideation.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_voting.svg b/src/assets/imgs/no_image_voting.svg new file mode 100644 index 000000000..394441346 --- /dev/null +++ b/src/assets/imgs/no_image_voting.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 92bc3c7b9ee801d33997bdef261ed7b37136d7b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 27 May 2025 23:02:20 +0300 Subject: [PATCH 04/24] fix: Default overlay when topic had image --- .../topicbox/topicbox.component.html | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index 4f6b6c918..9e8fd6e16 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,25 +106,27 @@
- -
-
- - -
- - - -
- + + +
+
+ + +
+ + + +
+ +
From 898c517132fe7b9376274a393585e9efcebda5fe Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sat, 14 Jun 2025 23:25:31 +0200 Subject: [PATCH 05/24] update with multiple ages --- .../topic-ideation.component.html | 8 ----- .../topic-ideation.component.ts | 36 ++++--------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index b6f75f1fd..29b3095ca 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -878,13 +878,6 @@
- - diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index ee996e44d..6cf7e4e33 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -284,12 +284,10 @@ export class TopicIdeationComponent { this.ideaFilters.type = type; } - setAge(_age: number | string, withRequest = true) { + setAge(_age: number | string) { const age = _age.toString(); if (age === 'all' || age === '') { - if (withRequest) { - this.ageFilter$.next([]); - } + this.ageFilter$.next([]); this.ideaFilters.age = []; return; } @@ -300,29 +298,7 @@ export class TopicIdeationComponent { } else { this.ideaFilters.age.push(age); } - if (withRequest) { - this.ageFilter$.next([...this.ideaFilters.age]); - } - } - - setMobileAges(_age: number | string) { - const age = _age.toString(); - if (age === 'all' || age === '') { - this.mobileAges = []; - return; - } - - const idx = this.mobileAges.indexOf(age); - if (idx > -1) { - this.mobileAges.splice(idx, 1); - } else { - this.mobileAges.push(age); - } - } - - applyAgeFilter() { - this.ageFilter$.next([...this.mobileAges]); - this.ideaFilters.age = [...this.mobileAges]; + this.ageFilter$.next([...this.ideaFilters.age]); } setMobileAge(_age: number | string) { @@ -612,9 +588,9 @@ export class TopicIdeationComponent { } showMobileOverlay() { - const filtersShow = Object.entries(this.mobileIdeaFilters).find( - ([key, value]) => { - return !!value; + const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { + if (key === 'age') { + return Array.isArray(value) && value.length > 0; } ); From b00c7b533402d3870163461faeb3c4169334ac3c Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sun, 15 Jun 2025 00:08:55 +0200 Subject: [PATCH 06/24] wip mobile --- .../topic-ideation/topic-ideation.component.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 6cf7e4e33..d56acd0d5 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -284,10 +284,12 @@ export class TopicIdeationComponent { this.ideaFilters.type = type; } - setAge(_age: number | string) { + setAge(_age: number | string, withRequest = true) { const age = _age.toString(); if (age === 'all' || age === '') { - this.ageFilter$.next([]); + if (withRequest) { + this.ageFilter$.next([]); + } this.ideaFilters.age = []; return; } @@ -298,6 +300,12 @@ export class TopicIdeationComponent { } else { this.ideaFilters.age.push(age); } + if (withRequest) { + this.ageFilter$.next([...this.ideaFilters.age]); + } + } + + applyAgeFilter() { this.ageFilter$.next([...this.ideaFilters.age]); } @@ -590,7 +598,7 @@ export class TopicIdeationComponent { showMobileOverlay() { const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { if (key === 'age') { - return Array.isArray(value) && value.length > 0; + return value === true; } ); From eaf556ee856ce62dd0a0884a5461692f6a4d029c Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sun, 15 Jun 2025 00:31:59 +0200 Subject: [PATCH 07/24] update age filter --- .../topic-ideation.component.ts | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index d56acd0d5..0cba74b2e 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -305,25 +305,26 @@ export class TopicIdeationComponent { } } - applyAgeFilter() { - this.ageFilter$.next([...this.ideaFilters.age]); - } - - setMobileAge(_age: number | string) { + setMobileAges(_age: number | string) { const age = _age.toString(); if (age === 'all' || age === '') { - this.mobileIdeaFilters.age = []; + this.mobileAges = []; return; } - const idx = this.mobileIdeaFilters.age.indexOf(age); + const idx = this.mobileAges.indexOf(age); if (idx > -1) { - this.mobileIdeaFilters.age.splice(idx, 1); + this.mobileAges.splice(idx, 1); } else { - this.mobileIdeaFilters.age.push(age); + this.mobileAges.push(age); } } + applyAgeFilter() { + this.ageFilter$.next([...this.mobileAges]); + this.ideaFilters.age = [...this.mobileAges]; + } + setGender(value: string) { if (value === 'all') value = ''; this.genderFilter$.next(value); @@ -597,10 +598,8 @@ export class TopicIdeationComponent { showMobileOverlay() { const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { - if (key === 'age') { - return value === true; - } - ); + return !!value; + }); if (filtersShow) return true; From 237472a365a0e41c2fa73d67ff0c68550b896601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Sat, 21 Jun 2025 00:21:00 +0300 Subject: [PATCH 08/24] #2053 (#2325) update joined group design Co-authored-by: Dzmitry Zimnitski --- .../components/groups/groups.component.html | 54 +++---- .../publicgroupbox.component.html | 135 +++++------------- .../publicgroupbox.component.scss | 18 ++- 3 files changed, 70 insertions(+), 137 deletions(-) diff --git a/src/app/public-groups/components/groups/groups.component.html b/src/app/public-groups/components/groups/groups.component.html index d7c269447..b52372c4a 100644 --- a/src/app/public-groups/components/groups/groups.component.html +++ b/src/app/public-groups/components/groups/groups.component.html @@ -24,8 +24,10 @@
- {{ getActiveFilterText("visibility", filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} - {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | translate }} + {{ getActiveFilterText("visibility", + filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} + {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | + translate }}
@@ -216,14 +214,8 @@
- - - - - - - - + +
diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html index 3fa985e28..ef62e79dc 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html @@ -3,68 +3,36 @@
- +
- - + + fill="#2C3B47" />
- + + fill="#2C3B47" />
- - + - + + fill="#2C3B47" /> {{ group.members?.users?.count || 1 - }} + }}
@@ -74,88 +42,53 @@
- + + fill="#1168A8" /> + fill="#1168A8" /> {{ group.members?.topics.count?.inProgress || 0 - }} + }}
- - + + fill="#E4B722" /> {{ group.members?.topics.count?.ideation || 0 }}
- - + + fill="#5AB467" /> {{ group.members?.topics.count?.voting || 0 }}
- + + fill="white" /> {{ group.members?.topics.count?.followUp || 0 }}
- - + + + diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss index 89dd4a309..3c0c90e8c 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss @@ -21,12 +21,12 @@ } &:hover { - box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.30), 0px 12px 16px 0px rgba(50, 85, 112, 0.10); + box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.3), + 0px 12px 16px 0px rgba(50, 85, 112, 0.1); text-decoration: none; .group_title { color: var(--color-link); } - } .group_header { display: flex; @@ -127,8 +127,16 @@ } } - .btn_big_secondary { - font-size: 14px; - line-height: 16px; + .btn_medium_secondary.disabled { + background: var(--color-surface-contrast); + opacity: 1; + + path { + fill: var(--color-text) !important; + } + + span { + color: var(--color-text); + } } } From cefb58a45fdb2ce3c39e681f776cfe1eeeb924dc Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Jun 2025 21:00:17 +0200 Subject: [PATCH 09/24] Feature: Add search function to ideas [#1528] (#2326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * New Crowdin updates (#2289) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * add search field * clean * update filters * add mobile field * add icon --------- Co-authored-by: Ilmar Türk --- .../topic-ideation.component.html | 8 +++++ .../topic-ideation.component.ts | 33 ++++++++++--------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index 29b3095ca..b6f75f1fd 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -878,6 +878,13 @@
+ + diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 0cba74b2e..2880fd9a0 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -29,7 +29,6 @@ import { LocationService } from '@services/location.service'; selector: 'topic-ideation', templateUrl: './topic-ideation.component.html', styleUrls: ['./topic-ideation.component.scss'], - standalone: false }) export class TopicIdeationComponent { @Input() ideation!: any; @@ -247,6 +246,18 @@ export class TopicIdeationComponent { }); } + get isCountryEstonia() { + return this.topic.country === 'Estonia'; + } + + get hasDemograficsField() { + return { + age: this.ideation.demographicsConfig?.age, + gender: this.ideation.demographicsConfig?.gender, + residence: this.ideation.demographicsConfig?.residence, + }; + } + get sortedSelectedAges() { return this.ideaFilters.age .sort((a, b) => { @@ -266,18 +277,6 @@ export class TopicIdeationComponent { this.ideaFilters.search = value; } - get isCountryEstonia() { - return this.topic.country === 'Estonia'; - } - - get hasDemograficsField() { - return { - age: this.ideation.demographicsConfig?.age, - gender: this.ideation.demographicsConfig?.gender, - residence: this.ideation.demographicsConfig?.residence - }; - } - setType(type: string) { if (type === 'all' || typeof type !== 'string') type = ''; this.ideaTypeFilter$.next(type); @@ -597,9 +596,11 @@ export class TopicIdeationComponent { } showMobileOverlay() { - const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { - return !!value; - }); + const filtersShow = Object.entries(this.mobileIdeaFilters).find( + ([key, value]) => { + return !!value; + } + ); if (filtersShow) return true; From 43c2ffc34b4f7031243a2ec394784645d213700d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Fri, 11 Jul 2025 23:56:09 +0300 Subject: [PATCH 10/24] fix: topic-ideation.components.ts --- .../components/topic-ideation/topic-ideation.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 2880fd9a0..0fbc105a0 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -29,6 +29,7 @@ import { LocationService } from '@services/location.service'; selector: 'topic-ideation', templateUrl: './topic-ideation.component.html', styleUrls: ['./topic-ideation.component.scss'], + standalone: false }) export class TopicIdeationComponent { @Input() ideation!: any; From 0286521380c117e3ffaea306cb6e1e624124d080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Fri, 18 Jul 2025 17:26:12 +0300 Subject: [PATCH 11/24] chore:rebase on master --- .../topic-ideation.component.ts | 39 +++-- .../components/groups/groups.component.html | 54 ++++--- .../publicgroupbox.component.html | 135 +++++++++++++----- .../publicgroupbox.component.scss | 18 +-- 4 files changed, 164 insertions(+), 82 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 0fbc105a0..ee996e44d 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -247,18 +247,6 @@ export class TopicIdeationComponent { }); } - get isCountryEstonia() { - return this.topic.country === 'Estonia'; - } - - get hasDemograficsField() { - return { - age: this.ideation.demographicsConfig?.age, - gender: this.ideation.demographicsConfig?.gender, - residence: this.ideation.demographicsConfig?.residence, - }; - } - get sortedSelectedAges() { return this.ideaFilters.age .sort((a, b) => { @@ -278,6 +266,18 @@ export class TopicIdeationComponent { this.ideaFilters.search = value; } + get isCountryEstonia() { + return this.topic.country === 'Estonia'; + } + + get hasDemograficsField() { + return { + age: this.ideation.demographicsConfig?.age, + gender: this.ideation.demographicsConfig?.gender, + residence: this.ideation.demographicsConfig?.residence + }; + } + setType(type: string) { if (type === 'all' || typeof type !== 'string') type = ''; this.ideaTypeFilter$.next(type); @@ -325,6 +325,21 @@ export class TopicIdeationComponent { this.ideaFilters.age = [...this.mobileAges]; } + setMobileAge(_age: number | string) { + const age = _age.toString(); + if (age === 'all' || age === '') { + this.mobileIdeaFilters.age = []; + return; + } + + const idx = this.mobileIdeaFilters.age.indexOf(age); + if (idx > -1) { + this.mobileIdeaFilters.age.splice(idx, 1); + } else { + this.mobileIdeaFilters.age.push(age); + } + } + setGender(value: string) { if (value === 'all') value = ''; this.genderFilter$.next(value); diff --git a/src/app/public-groups/components/groups/groups.component.html b/src/app/public-groups/components/groups/groups.component.html index b52372c4a..d7c269447 100644 --- a/src/app/public-groups/components/groups/groups.component.html +++ b/src/app/public-groups/components/groups/groups.component.html @@ -24,10 +24,8 @@
- {{ getActiveFilterText("visibility", - filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} - {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | - translate }} + {{ getActiveFilterText("visibility", filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} + {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | translate }}
@@ -214,8 +216,14 @@
- - + + + + + + + +
diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html index ef62e79dc..3fa985e28 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html @@ -3,36 +3,68 @@
- +
- - + + fill="#2C3B47" + />
- + + fill="#2C3B47" + />
- - + - + + fill="#2C3B47" + /> {{ group.members?.users?.count || 1 - }} + }}
@@ -42,53 +74,88 @@
- + + fill="#1168A8" + /> + fill="#1168A8" + /> {{ group.members?.topics.count?.inProgress || 0 - }} + }}
- - + + fill="#E4B722" + /> {{ group.members?.topics.count?.ideation || 0 }}
- - + + fill="#5AB467" + /> {{ group.members?.topics.count?.voting || 0 }}
- + + fill="white" + /> {{ group.members?.topics.count?.followUp || 0 }}
- - - + + diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss index 3c0c90e8c..89dd4a309 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss @@ -21,12 +21,12 @@ } &:hover { - box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.3), - 0px 12px 16px 0px rgba(50, 85, 112, 0.1); + box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.30), 0px 12px 16px 0px rgba(50, 85, 112, 0.10); text-decoration: none; .group_title { color: var(--color-link); } + } .group_header { display: flex; @@ -127,16 +127,8 @@ } } - .btn_medium_secondary.disabled { - background: var(--color-surface-contrast); - opacity: 1; - - path { - fill: var(--color-text) !important; - } - - span { - color: var(--color-text); - } + .btn_big_secondary { + font-size: 14px; + line-height: 16px; } } From 6b6527af9dc4ca900df3b6f028df6255f0422b78 Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:05:33 +0300 Subject: [PATCH 12/24] update no image design --- .../topicbox/topicbox.component.html | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index 9e8fd6e16..f4ded1471 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,27 +106,25 @@
- - -
+
-
- - -
- - - -
- - +
+ + +
+ + + +
+
From 23d0dd6fbde70b9a115ce132b8eb8c4553842094 Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:07:16 +0300 Subject: [PATCH 13/24] Revert "update no image design" This reverts commit a2109cc3cdc8f44352431324be6bd1ea0b4f9b2e. --- .../topicbox/topicbox.component.html | 30 +++++-------------- .../topicbox/topicbox.component.scss | 22 ++------------ src/assets/imgs/no_image_discussion.svg | 30 ------------------- src/assets/imgs/no_image_follow_up.svg | 30 ------------------- src/assets/imgs/no_image_ideation.svg | 30 ------------------- src/assets/imgs/no_image_voting.svg | 30 ------------------- 6 files changed, 10 insertions(+), 162 deletions(-) delete mode 100644 src/assets/imgs/no_image_discussion.svg delete mode 100644 src/assets/imgs/no_image_follow_up.svg delete mode 100644 src/assets/imgs/no_image_ideation.svg delete mode 100644 src/assets/imgs/no_image_voting.svg diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index f4ded1471..f26d7cb17 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,25 +106,13 @@
- -
-
- - -
- - - -
- +
+ + + +
@@ -174,9 +162,7 @@
- + {{topic.lastActivity | amTimeAgo}}
diff --git a/src/app/public-topics/components/topicbox/topicbox.component.scss b/src/app/public-topics/components/topicbox/topicbox.component.scss index 9017f5b03..15b6a23bb 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.scss +++ b/src/app/public-topics/components/topicbox/topicbox.component.scss @@ -135,25 +135,6 @@ align-items: center; justify-content: center; background-color: var(--color-border); - background-position: center; - background-repeat: no-repeat; - background-size: cover; - - &.discussion { - background-image: url("/assets/imgs/no_image_discussion.svg"); - } - - &.voting { - background-image: url("/assets/imgs/no_image_voting.svg"); - } - - &.ideation { - background-image: url("/assets/imgs/no_image_ideation.svg"); - } - - &.follow_up { - background-image: url("/assets/imgs/no_image_follow_up.svg"); - } } .image_overlay { @@ -287,10 +268,11 @@ height: 100%; align-items: center; justify-content: center; - background-color: rgba(255, 255, 255, 0.5); + background-color: rgba(255,255,255, 0.5); button { z-index: 99; gap: 8px; } } + diff --git a/src/assets/imgs/no_image_discussion.svg b/src/assets/imgs/no_image_discussion.svg deleted file mode 100644 index 5ec6f827e..000000000 --- a/src/assets/imgs/no_image_discussion.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_follow_up.svg b/src/assets/imgs/no_image_follow_up.svg deleted file mode 100644 index b793672c0..000000000 --- a/src/assets/imgs/no_image_follow_up.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_ideation.svg b/src/assets/imgs/no_image_ideation.svg deleted file mode 100644 index ce01440da..000000000 --- a/src/assets/imgs/no_image_ideation.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/imgs/no_image_voting.svg b/src/assets/imgs/no_image_voting.svg deleted file mode 100644 index 394441346..000000000 --- a/src/assets/imgs/no_image_voting.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 9408ba3670ef61f356dba69b96a1327a56b9ca28 Mon Sep 17 00:00:00 2001 From: Dzmitry Zimnitski Date: Tue, 6 May 2025 18:12:32 +0300 Subject: [PATCH 14/24] update no image design --- .../topicbox/topicbox.component.html | 30 ++++++++++++++----- .../topicbox/topicbox.component.scss | 22 ++++++++++++-- src/assets/imgs/no_image_discussion.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_follow_up.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_ideation.svg | 30 +++++++++++++++++++ src/assets/imgs/no_image_voting.svg | 30 +++++++++++++++++++ 6 files changed, 162 insertions(+), 10 deletions(-) create mode 100644 src/assets/imgs/no_image_discussion.svg create mode 100644 src/assets/imgs/no_image_follow_up.svg create mode 100644 src/assets/imgs/no_image_ideation.svg create mode 100644 src/assets/imgs/no_image_voting.svg diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index f26d7cb17..4f6b6c918 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,13 +106,25 @@
-
- - - -
+ +
+
+ + +
+ + + +
+
@@ -162,7 +174,9 @@
- + {{topic.lastActivity | amTimeAgo}}
diff --git a/src/app/public-topics/components/topicbox/topicbox.component.scss b/src/app/public-topics/components/topicbox/topicbox.component.scss index 15b6a23bb..9017f5b03 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.scss +++ b/src/app/public-topics/components/topicbox/topicbox.component.scss @@ -135,6 +135,25 @@ align-items: center; justify-content: center; background-color: var(--color-border); + background-position: center; + background-repeat: no-repeat; + background-size: cover; + + &.discussion { + background-image: url("/assets/imgs/no_image_discussion.svg"); + } + + &.voting { + background-image: url("/assets/imgs/no_image_voting.svg"); + } + + &.ideation { + background-image: url("/assets/imgs/no_image_ideation.svg"); + } + + &.follow_up { + background-image: url("/assets/imgs/no_image_follow_up.svg"); + } } .image_overlay { @@ -268,11 +287,10 @@ height: 100%; align-items: center; justify-content: center; - background-color: rgba(255,255,255, 0.5); + background-color: rgba(255, 255, 255, 0.5); button { z-index: 99; gap: 8px; } } - diff --git a/src/assets/imgs/no_image_discussion.svg b/src/assets/imgs/no_image_discussion.svg new file mode 100644 index 000000000..5ec6f827e --- /dev/null +++ b/src/assets/imgs/no_image_discussion.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_follow_up.svg b/src/assets/imgs/no_image_follow_up.svg new file mode 100644 index 000000000..b793672c0 --- /dev/null +++ b/src/assets/imgs/no_image_follow_up.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_ideation.svg b/src/assets/imgs/no_image_ideation.svg new file mode 100644 index 000000000..ce01440da --- /dev/null +++ b/src/assets/imgs/no_image_ideation.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/imgs/no_image_voting.svg b/src/assets/imgs/no_image_voting.svg new file mode 100644 index 000000000..394441346 --- /dev/null +++ b/src/assets/imgs/no_image_voting.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9c0fd6b46fc4d0ba2b34a0d6046b49d09cf608fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 27 May 2025 23:02:20 +0300 Subject: [PATCH 15/24] fix: Default overlay when topic had image --- .../topicbox/topicbox.component.html | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/app/public-topics/components/topicbox/topicbox.component.html b/src/app/public-topics/components/topicbox/topicbox.component.html index 4f6b6c918..9e8fd6e16 100644 --- a/src/app/public-topics/components/topicbox/topicbox.component.html +++ b/src/app/public-topics/components/topicbox/topicbox.component.html @@ -106,25 +106,27 @@
- -
-
- - -
- - - -
- + + +
+
+ + +
+ + + +
+ +
From 51b4ec79d03e222d5c1bb1a55e8211af838211f5 Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sat, 14 Jun 2025 23:25:31 +0200 Subject: [PATCH 16/24] update with multiple ages --- .../topic-ideation.component.html | 180 +++++++----------- .../topic-ideation.component.ts | 36 +--- 2 files changed, 79 insertions(+), 137 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index b6f75f1fd..debe85117 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -708,133 +708,107 @@
- + +
- + + + {{ideaFilters.age}} + +
+
+ + +
+
+
+ + +
+
+ + + +
+
+
+ - {{ - "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_MALE" - | translate - }} + {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_MALE' + | + translate}} - {{ - "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_FEMALE" - | translate - }} + {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_FEMALE' + | + translate}} - {{ - "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER" - | translate - }} + {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER' + | + translate}}
-
- - +
+
-
-
- {{ - "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_" + - (gender === "other" - ? gender + "_placeholder" - : gender - ).toUpperCase() | translate - }} +
+
+
+ {{ "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_" + (gender === "other" ? gender + "_placeholder" : gender).toUpperCase() | translate }}
- +
- + - {{ ideaFilters.residence | titlecase }} + {{ideaFilters.residence | titlecase}}
-
- - +
+
-
-
+
+
+
{{ residence.name }}
-
+
+
@@ -878,13 +852,6 @@
- - diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index ee996e44d..6cf7e4e33 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -284,12 +284,10 @@ export class TopicIdeationComponent { this.ideaFilters.type = type; } - setAge(_age: number | string, withRequest = true) { + setAge(_age: number | string) { const age = _age.toString(); if (age === 'all' || age === '') { - if (withRequest) { - this.ageFilter$.next([]); - } + this.ageFilter$.next([]); this.ideaFilters.age = []; return; } @@ -300,29 +298,7 @@ export class TopicIdeationComponent { } else { this.ideaFilters.age.push(age); } - if (withRequest) { - this.ageFilter$.next([...this.ideaFilters.age]); - } - } - - setMobileAges(_age: number | string) { - const age = _age.toString(); - if (age === 'all' || age === '') { - this.mobileAges = []; - return; - } - - const idx = this.mobileAges.indexOf(age); - if (idx > -1) { - this.mobileAges.splice(idx, 1); - } else { - this.mobileAges.push(age); - } - } - - applyAgeFilter() { - this.ageFilter$.next([...this.mobileAges]); - this.ideaFilters.age = [...this.mobileAges]; + this.ageFilter$.next([...this.ideaFilters.age]); } setMobileAge(_age: number | string) { @@ -612,9 +588,9 @@ export class TopicIdeationComponent { } showMobileOverlay() { - const filtersShow = Object.entries(this.mobileIdeaFilters).find( - ([key, value]) => { - return !!value; + const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { + if (key === 'age') { + return Array.isArray(value) && value.length > 0; } ); From 89e85b9814b5eb2d0007db472971018f09edf16e Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sun, 15 Jun 2025 00:08:55 +0200 Subject: [PATCH 17/24] wip mobile --- .../topic-ideation.component.html | 119 ++++++++++++++++-- .../topic-ideation.component.ts | 14 ++- 2 files changed, 120 insertions(+), 13 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index debe85117..f9b47ca9a 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -736,16 +736,16 @@ /> - +
@@ -1523,6 +1523,105 @@ translate="COMPONENTS.TOPIC_IDEATION.BTN_APPLY" >
+ +
+ + + + + + +
+ + +
+ + +
+ +
+ + + + + + +
+ + + +
+ + +
+ +
+ + + + + + +
+ + + + + +
+ + +
diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 6cf7e4e33..d56acd0d5 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -284,10 +284,12 @@ export class TopicIdeationComponent { this.ideaFilters.type = type; } - setAge(_age: number | string) { + setAge(_age: number | string, withRequest = true) { const age = _age.toString(); if (age === 'all' || age === '') { - this.ageFilter$.next([]); + if (withRequest) { + this.ageFilter$.next([]); + } this.ideaFilters.age = []; return; } @@ -298,6 +300,12 @@ export class TopicIdeationComponent { } else { this.ideaFilters.age.push(age); } + if (withRequest) { + this.ageFilter$.next([...this.ideaFilters.age]); + } + } + + applyAgeFilter() { this.ageFilter$.next([...this.ideaFilters.age]); } @@ -590,7 +598,7 @@ export class TopicIdeationComponent { showMobileOverlay() { const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { if (key === 'age') { - return Array.isArray(value) && value.length > 0; + return value === true; } ); From f12cfaa1c0cfb5b7fd40907799006096ab9b84a8 Mon Sep 17 00:00:00 2001 From: Viktar Maslouski Date: Sun, 15 Jun 2025 00:31:59 +0200 Subject: [PATCH 18/24] update age filter --- .../topic-ideation.component.html | 40 +++++++++---------- .../topic-ideation.component.ts | 25 ++++++------ 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index f9b47ca9a..941b25204 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -1534,26 +1534,26 @@
- - + +
@@ -216,14 +214,8 @@
- - - - - - - - + +
diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html index 3fa985e28..ef62e79dc 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html @@ -3,68 +3,36 @@
- +
- - + + fill="#2C3B47" />
- + + fill="#2C3B47" />
- - + - + + fill="#2C3B47" /> {{ group.members?.users?.count || 1 - }} + }}
@@ -74,88 +42,53 @@
- + + fill="#1168A8" /> + fill="#1168A8" /> {{ group.members?.topics.count?.inProgress || 0 - }} + }}
- - + + fill="#E4B722" /> {{ group.members?.topics.count?.ideation || 0 }}
- - + + fill="#5AB467" /> {{ group.members?.topics.count?.voting || 0 }}
- + + fill="white" /> {{ group.members?.topics.count?.followUp || 0 }}
- - + + + diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss index 89dd4a309..3c0c90e8c 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss @@ -21,12 +21,12 @@ } &:hover { - box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.30), 0px 12px 16px 0px rgba(50, 85, 112, 0.10); + box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.3), + 0px 12px 16px 0px rgba(50, 85, 112, 0.1); text-decoration: none; .group_title { color: var(--color-link); } - } .group_header { display: flex; @@ -127,8 +127,16 @@ } } - .btn_big_secondary { - font-size: 14px; - line-height: 16px; + .btn_medium_secondary.disabled { + background: var(--color-surface-contrast); + opacity: 1; + + path { + fill: var(--color-text) !important; + } + + span { + color: var(--color-text); + } } } From 4cad684a04ebc04c5db7b65210d70ada9a4a4204 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Jun 2025 21:00:17 +0200 Subject: [PATCH 20/24] Feature: Add search function to ideas [#1528] (#2326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * New Crowdin updates (#2289) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * add search field * clean * update filters * add mobile field * add icon --------- Co-authored-by: Ilmar Türk --- .../topic-ideation.component.html | 279 +++++++----------- .../topic-ideation.component.ts | 33 ++- 2 files changed, 124 insertions(+), 188 deletions(-) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.html b/src/app/ideation/components/topic-ideation/topic-ideation.component.html index 941b25204..b6f75f1fd 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.html +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.html @@ -708,107 +708,133 @@
- - -
-
-
- - - {{ideaFilters.age}} - -
-
- - -
-
-
- - -
-
- - - +
- + - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_MALE' - | - translate}} + {{ + "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_MALE" + | translate + }} - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_FEMALE' - | - translate}} + {{ + "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_FEMALE" + | translate + }} - {{'VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER' - | - translate}} + {{ + "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_OTHER_PLACEHOLDER" + | translate + }}
-
- +
+ +
-
-
-
- {{ "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_" + (gender === "other" ? gender + "_placeholder" : gender).toUpperCase() | translate }} +
+
+ {{ + "VIEWS.IDEATION_CREATE.DEMOGRAPHICS_DATA_GENDER_" + + (gender === "other" + ? gender + "_placeholder" + : gender + ).toUpperCase() | translate + }}
- +
- + - {{ideaFilters.residence | titlecase}} + {{ ideaFilters.residence | titlecase }}
-
- +
+ +
-
-
-
+
+
{{ residence.name }}
-
-
+
@@ -852,6 +878,13 @@
+ + @@ -1523,105 +1557,6 @@ translate="COMPONENTS.TOPIC_IDEATION.BTN_APPLY" >
- -
- - - - - - -
- - -
- - -
- -
- - - - - - -
- - - -
- - -
- -
- - - - - - -
- - - - - -
- - -
diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 0cba74b2e..2880fd9a0 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -29,7 +29,6 @@ import { LocationService } from '@services/location.service'; selector: 'topic-ideation', templateUrl: './topic-ideation.component.html', styleUrls: ['./topic-ideation.component.scss'], - standalone: false }) export class TopicIdeationComponent { @Input() ideation!: any; @@ -247,6 +246,18 @@ export class TopicIdeationComponent { }); } + get isCountryEstonia() { + return this.topic.country === 'Estonia'; + } + + get hasDemograficsField() { + return { + age: this.ideation.demographicsConfig?.age, + gender: this.ideation.demographicsConfig?.gender, + residence: this.ideation.demographicsConfig?.residence, + }; + } + get sortedSelectedAges() { return this.ideaFilters.age .sort((a, b) => { @@ -266,18 +277,6 @@ export class TopicIdeationComponent { this.ideaFilters.search = value; } - get isCountryEstonia() { - return this.topic.country === 'Estonia'; - } - - get hasDemograficsField() { - return { - age: this.ideation.demographicsConfig?.age, - gender: this.ideation.demographicsConfig?.gender, - residence: this.ideation.demographicsConfig?.residence - }; - } - setType(type: string) { if (type === 'all' || typeof type !== 'string') type = ''; this.ideaTypeFilter$.next(type); @@ -597,9 +596,11 @@ export class TopicIdeationComponent { } showMobileOverlay() { - const filtersShow = Object.entries(this.mobileIdeaFilters).find(([key, value]) => { - return !!value; - }); + const filtersShow = Object.entries(this.mobileIdeaFilters).find( + ([key, value]) => { + return !!value; + } + ); if (filtersShow) return true; From 407ad8892942a35e7611e4fc4602d62a85612443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Fri, 11 Jul 2025 23:56:09 +0300 Subject: [PATCH 21/24] fix: topic-ideation.components.ts --- .../components/topic-ideation/topic-ideation.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 2880fd9a0..0fbc105a0 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -29,6 +29,7 @@ import { LocationService } from '@services/location.service'; selector: 'topic-ideation', templateUrl: './topic-ideation.component.html', styleUrls: ['./topic-ideation.component.scss'], + standalone: false }) export class TopicIdeationComponent { @Input() ideation!: any; From b0bd4bda9790c97952bba425d7c93c662257ad92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Thu, 17 Jul 2025 18:20:03 +0300 Subject: [PATCH 22/24] Master (#2351) * #2331 (#2348) * chore: build update * chore: update code and fix 2331 * fix: duplicate filters * chore: Update CHANGELOG.md * 1.3.10 * chore: release 1.3.11 * New Crowdin updates (#2335) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (Czech) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (Czech) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Czech) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Bulgarian) * New translations en.json (German) * New translations en.json (Dutch) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Albanian) * New translations en.json (Ukrainian) * New translations en.json (Indonesian) * New translations en.json (Estonian) * New translations en.json (Swahili) * New translations en.json (Somali) * New translations en.json (Estonian) * New translations en.json (Russian) (#2350) --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 74673f4df..32d38286e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "citizenos-fe", - "version": "1.3.11", + "version": "1.3.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "citizenos-fe", - "version": "1.3.11", + "version": "1.3.10", "dependencies": { "@angular/animations": "^20.0.4", "@angular/cdk": "^20.0.3", From ca4ad0f200449c0fc9b3e44334c0c99f1585f344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Tue, 22 Jul 2025 22:33:53 +0300 Subject: [PATCH 23/24] chore: fix sync with master --- package-lock.json | 4 +- .../topic-ideation.component.ts | 39 +++-- .../components/groups/groups.component.html | 54 ++++--- .../publicgroupbox.component.html | 135 +++++++++++++----- .../publicgroupbox.component.scss | 18 +-- 5 files changed, 166 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32d38286e..74673f4df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "citizenos-fe", - "version": "1.3.10", + "version": "1.3.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "citizenos-fe", - "version": "1.3.10", + "version": "1.3.11", "dependencies": { "@angular/animations": "^20.0.4", "@angular/cdk": "^20.0.3", diff --git a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts index 0fbc105a0..ee996e44d 100644 --- a/src/app/ideation/components/topic-ideation/topic-ideation.component.ts +++ b/src/app/ideation/components/topic-ideation/topic-ideation.component.ts @@ -247,18 +247,6 @@ export class TopicIdeationComponent { }); } - get isCountryEstonia() { - return this.topic.country === 'Estonia'; - } - - get hasDemograficsField() { - return { - age: this.ideation.demographicsConfig?.age, - gender: this.ideation.demographicsConfig?.gender, - residence: this.ideation.demographicsConfig?.residence, - }; - } - get sortedSelectedAges() { return this.ideaFilters.age .sort((a, b) => { @@ -278,6 +266,18 @@ export class TopicIdeationComponent { this.ideaFilters.search = value; } + get isCountryEstonia() { + return this.topic.country === 'Estonia'; + } + + get hasDemograficsField() { + return { + age: this.ideation.demographicsConfig?.age, + gender: this.ideation.demographicsConfig?.gender, + residence: this.ideation.demographicsConfig?.residence + }; + } + setType(type: string) { if (type === 'all' || typeof type !== 'string') type = ''; this.ideaTypeFilter$.next(type); @@ -325,6 +325,21 @@ export class TopicIdeationComponent { this.ideaFilters.age = [...this.mobileAges]; } + setMobileAge(_age: number | string) { + const age = _age.toString(); + if (age === 'all' || age === '') { + this.mobileIdeaFilters.age = []; + return; + } + + const idx = this.mobileIdeaFilters.age.indexOf(age); + if (idx > -1) { + this.mobileIdeaFilters.age.splice(idx, 1); + } else { + this.mobileIdeaFilters.age.push(age); + } + } + setGender(value: string) { if (value === 'all') value = ''; this.genderFilter$.next(value); diff --git a/src/app/public-groups/components/groups/groups.component.html b/src/app/public-groups/components/groups/groups.component.html index b52372c4a..d7c269447 100644 --- a/src/app/public-groups/components/groups/groups.component.html +++ b/src/app/public-groups/components/groups/groups.component.html @@ -24,10 +24,8 @@
- {{ getActiveFilterText("visibility", - filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} - {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | - translate }} + {{ getActiveFilterText("visibility", filtersData.visibility.selectedValue) | uppercase | translate | titlecase }} + {{ getActiveFilterText(filterKey, filtersData[filterKey].selectedValue) | translate }}
@@ -214,8 +216,14 @@
- - + + + + + + + +
diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html index ef62e79dc..3fa985e28 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.html @@ -3,36 +3,68 @@
- +
- - + + fill="#2C3B47" + />
- + + fill="#2C3B47" + />
- - + - + + fill="#2C3B47" + /> {{ group.members?.users?.count || 1 - }} + }}
@@ -42,53 +74,88 @@
- + + fill="#1168A8" + /> + fill="#1168A8" + /> {{ group.members?.topics.count?.inProgress || 0 - }} + }}
- - + + fill="#E4B722" + /> {{ group.members?.topics.count?.ideation || 0 }}
- - + + fill="#5AB467" + /> {{ group.members?.topics.count?.voting || 0 }}
- + + fill="white" + /> {{ group.members?.topics.count?.followUp || 0 }}
- - - + + diff --git a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss index 3c0c90e8c..89dd4a309 100644 --- a/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss +++ b/src/app/public-groups/components/publicgroupbox/publicgroupbox.component.scss @@ -21,12 +21,12 @@ } &:hover { - box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.3), - 0px 12px 16px 0px rgba(50, 85, 112, 0.1); + box-shadow: 0px 8px 20px 0px rgba(220, 231, 240, 0.30), 0px 12px 16px 0px rgba(50, 85, 112, 0.10); text-decoration: none; .group_title { color: var(--color-link); } + } .group_header { display: flex; @@ -127,16 +127,8 @@ } } - .btn_medium_secondary.disabled { - background: var(--color-surface-contrast); - opacity: 1; - - path { - fill: var(--color-text) !important; - } - - span { - color: var(--color-text); - } + .btn_big_secondary { + font-size: 14px; + line-height: 16px; } } From fb27b7cffee41744155a1b5341691277b04c4834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilmar=20T=C3=BCrk?= Date: Sat, 8 Nov 2025 00:35:14 +0200 Subject: [PATCH 24/24] fix: topic participants count is incorrect --- .../topic-participants-section.component.html | 30 +++++++ .../topic-participants-section.component.scss | 78 +++++++++++++++++++ .../topic-participants-section.component.ts | 57 ++++++++++++++ src/app/topic/topic.component.html | 30 +------ src/app/topic/topic.module.ts | 4 +- 5 files changed, 169 insertions(+), 30 deletions(-) create mode 100644 src/app/topic/components/topic-participants-section/topic-participants-section.component.html create mode 100644 src/app/topic/components/topic-participants-section/topic-participants-section.component.scss create mode 100644 src/app/topic/components/topic-participants-section/topic-participants-section.component.ts diff --git a/src/app/topic/components/topic-participants-section/topic-participants-section.component.html b/src/app/topic/components/topic-participants-section/topic-participants-section.component.html new file mode 100644 index 000000000..8d83c7ba5 --- /dev/null +++ b/src/app/topic/components/topic-participants-section/topic-participants-section.component.html @@ -0,0 +1,30 @@ +
+
+
+ +
+
+
+ {{ topic.members.users.count || members.length }} +
+
+ +
+ +
+ + +
+
+ + +
+ + {{ topic.members.users.count - 3 }} +
+
+
+ +
+ diff --git a/src/app/topic/components/topic-participants-section/topic-participants-section.component.scss b/src/app/topic/components/topic-participants-section/topic-participants-section.component.scss new file mode 100644 index 000000000..a15bed4b1 --- /dev/null +++ b/src/app/topic/components/topic-participants-section/topic-participants-section.component.scss @@ -0,0 +1,78 @@ +.info_items_wrap { + display: flex; + flex-direction: column; + gap: 8px; + + .info_header { + display: flex; + justify-content: space-between; + + .info_title { + font-size: 14px; + font-style: normal; + font-weight: 600; + line-height: 16px; + padding-bottom: 8px; + display: flex; + justify-content: space-between; + align-items: center; + color: var(--color-text); + } + } + + .participants_count_wrap { + display: flex; + justify-content: space-between; + + .participants_count { + font-size: 40px; + font-style: normal; + font-weight: 600; + line-height: 40px; + } + + .avatars_wrap { + display: flex; + + .avatar { + display: flex; + justify-content: center; + align-items: center; + border-radius: 40px; + width: 40px; + height: 40px; + border: 2px solid #f8fafc; + margin-left: -10px; + background-color: var(--color-secondary); + font-size: 10px; + font-style: normal; + font-weight: 600; + line-height: 16px; + + &:first-child { + margin-left: 0; + } + img { + border: 2px solid #f8fafc; + width: inherit; + border-radius: 40px; + aspect-ratio: 1; + object-fit: cover; + } + .profile_image_filler { + width: 100%; + height: 100%; + background-color: var(--color-surfaces); + border-radius: 40px; + display: flex; + align-items: center; + justify-content: center; + cos-initials { + font-size: 14px; + } + } + } + } + } +} + diff --git a/src/app/topic/components/topic-participants-section/topic-participants-section.component.ts b/src/app/topic/components/topic-participants-section/topic-participants-section.component.ts new file mode 100644 index 000000000..6c47d4bd3 --- /dev/null +++ b/src/app/topic/components/topic-participants-section/topic-participants-section.component.ts @@ -0,0 +1,57 @@ +import { Component, Input } from '@angular/core'; +import { Observable } from 'rxjs'; +import { Topic } from '@interfaces/topic'; +import { TopicService } from '@services/topic.service'; +import { DialogService } from '@shared/dialog'; +import { TopicParticipantsComponent } from '../topic-participants/topic-participants.component'; +import { TopicInviteDialogComponent } from '../topic-invite/topic-invite.component'; + +@Component({ + selector: 'topic-participants-section', + templateUrl: './topic-participants-section.component.html', + styleUrls: ['./topic-participants-section.component.scss'], + standalone: false +}) +export class TopicParticipantsSectionComponent { + @Input() topic!: Topic; + @Input() members$!: Observable; + + constructor( + public TopicService: TopicService, + private readonly DialogService: DialogService + ) {} + + canUpdate(topic: Topic): boolean { + return this.TopicService.canUpdate(topic); + } + + manageParticipants(topic: Topic): void { + const participantsDialog = this.DialogService.open( + TopicParticipantsComponent, + { data: { topic } } + ); + participantsDialog.afterClosed().subscribe({ + next: (res) => { + // Handle response if needed + }, + error: (error) => { + console.error('Error managing participants', error); + }, + }); + } + + inviteMembers(topic: Topic): void { + const inviteDialog = this.DialogService.open(TopicInviteDialogComponent, { + data: { topic }, + }); + inviteDialog.afterClosed().subscribe({ + next: (res) => { + // Handle response if needed + }, + error: (error) => { + console.error('Error inviting members', error); + }, + }); + } +} + diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index cff37ea64..1089ab035 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1095,35 +1095,7 @@ index: 4, position: wWidth <= 1024 ? 'bottom' : 'left' }"> -
-
-
- -
-
-
- {{ members.length || topic.members.users.count }} -
-
- -
- -
- - -
-
- - -
- + {{ topic.members.users.count - 3 }} -
-
-
- -
+
diff --git a/src/app/topic/topic.module.ts b/src/app/topic/topic.module.ts index 008e9a3a2..31356ebd6 100644 --- a/src/app/topic/topic.module.ts +++ b/src/app/topic/topic.module.ts @@ -112,6 +112,7 @@ import { TopicSettingsLockedComponent } from './components/topic-settings-locked import { AnonymousDraftDialogComponent } from '../ideation/components/anonymous-draft-dialog/anonymous-draft-dialog.component'; import { CloseWithoutSavingDialogComponent } from '../ideation/components/close-without-saving-dialog/close-without-saving-dialog.component'; import { TopicVoteCastComponent } from './components/topic-vote-cast/topic-vote-cast.component'; +import { TopicParticipantsSectionComponent } from './components/topic-participants-section/topic-participants-section.component'; @NgModule({ declarations: [ @@ -195,7 +196,8 @@ import { TopicVoteCastComponent } from './components/topic-vote-cast/topic-vote- CloseVotingComponent, TopicTabsComponent, TopicSettingsLockedComponent, - TopicVoteCastComponent + TopicVoteCastComponent, + TopicParticipantsSectionComponent ], imports: [ LinkyModule,