From 6de8e9bad96fe0907455d2fd4246f0026bf91d88 Mon Sep 17 00:00:00 2001 From: msantos-lab Date: Wed, 3 Jul 2024 19:08:12 +0200 Subject: [PATCH 1/3] New option on Education projects --- .github/ISSUE_TEMPLATE/add_new_activity.yaml | 1 + src/constants/index.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/add_new_activity.yaml b/.github/ISSUE_TEMPLATE/add_new_activity.yaml index 536c487a..c8f1b520 100644 --- a/.github/ISSUE_TEMPLATE/add_new_activity.yaml +++ b/.github/ISSUE_TEMPLATE/add_new_activity.yaml @@ -28,6 +28,7 @@ body: - Workshop - Media - Evento + - Escola default: 0 validations: required: true diff --git a/src/constants/index.js b/src/constants/index.js index 3310a3b6..921ab6b7 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -5,7 +5,8 @@ import FeatureFlags from './featureflags'; const Categories = Object.freeze({ EVENT: { label: 'evento', color: 'dark-blue' }, WORKSHOP: { label: 'workshop', color: 'dark-blue' }, - MEDIA: { label: 'media', color: 'dark-blue' } + MEDIA: { label: 'media', color: 'dark-blue' }, + ESCOLA: { label: 'media', color: 'dark-blue' } }); const LinkType = Object.freeze({ From b756afc379da15e31ed99665f2e357598b931d2a Mon Sep 17 00:00:00 2001 From: msantos-lab Date: Sat, 13 Jul 2024 12:00:34 +0200 Subject: [PATCH 2/3] =?UTF-8?q?altera=C3=A7=C3=A3o=20de=20escola=20para=20?= =?UTF-8?q?educa=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/add_new_activity.yaml | 2 +- src/constants/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/add_new_activity.yaml b/.github/ISSUE_TEMPLATE/add_new_activity.yaml index c8f1b520..e1b7c2e2 100644 --- a/.github/ISSUE_TEMPLATE/add_new_activity.yaml +++ b/.github/ISSUE_TEMPLATE/add_new_activity.yaml @@ -28,7 +28,7 @@ body: - Workshop - Media - Evento - - Escola + - Educação default: 0 validations: required: true diff --git a/src/constants/index.js b/src/constants/index.js index 921ab6b7..145caf6e 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -6,7 +6,7 @@ const Categories = Object.freeze({ EVENT: { label: 'evento', color: 'dark-blue' }, WORKSHOP: { label: 'workshop', color: 'dark-blue' }, MEDIA: { label: 'media', color: 'dark-blue' }, - ESCOLA: { label: 'media', color: 'dark-blue' } + EDUCACAO: { label: 'educação', color: 'dark-blue' } }); const LinkType = Object.freeze({ From 8c1e3807d73b9b9e2e95b7600f6e80ea33b7b8c4 Mon Sep 17 00:00:00 2001 From: msantos-lab Date: Sat, 13 Jul 2024 12:27:27 +0200 Subject: [PATCH 3/3] =?UTF-8?q?altera=C3=A7=C3=A3o=20para=20education=20e?= =?UTF-8?q?=20corre=C3=A7=C3=A3o=20exibi=C3=A7=C3=A3o=20na=20pg=20atividad?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/index.js | 2 +- src/pages/Activities/index.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/constants/index.js b/src/constants/index.js index 145caf6e..e959f7df 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -6,7 +6,7 @@ const Categories = Object.freeze({ EVENT: { label: 'evento', color: 'dark-blue' }, WORKSHOP: { label: 'workshop', color: 'dark-blue' }, MEDIA: { label: 'media', color: 'dark-blue' }, - EDUCACAO: { label: 'educação', color: 'dark-blue' } + EDUCATION: { label: 'educação', color: 'dark-blue' } }); const LinkType = Object.freeze({ diff --git a/src/pages/Activities/index.js b/src/pages/Activities/index.js index e0008440..f8fa751f 100644 --- a/src/pages/Activities/index.js +++ b/src/pages/Activities/index.js @@ -108,7 +108,9 @@ function Activities({ translation }) { {Object.values(Constants.Categories).map((category, index) => { const label = category.label; - return ( + const categoryTotal = calculateCategoryTotal(label); + + return categoryTotal ? ( + ) : ( + '' ); })}