From fe8214df89a5a1a6f60af17d103fa4606f4a6115 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 22 Feb 2023 09:46:34 +0100 Subject: [PATCH 1/2] change contribution design an all and my contribution icons --- .../src/components/Contributions/ContributionListItem.vue | 8 ++++---- frontend/src/layouts/templates/CommunityTemplate.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index d830f1bcd..5b9bfb82f 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -2,7 +2,7 @@
@@ -25,7 +25,7 @@
{{ $t('contributionText') }}
{{ memo }}
-
+
{{ $t('contribution.alert.answerQuestion') }}
@@ -189,14 +189,14 @@ export default { if (this.deletedAt) return 'trash' if (this.deniedAt) return 'x-circle' if (this.confirmedAt) return 'check' - if (this.state === 'IN_PROGRESS') return 'question-circle' + if (this.state === 'IN_PROGRESS') return 'question' return 'bell-fill' }, variant() { if (this.deletedAt) return 'danger' if (this.deniedAt) return 'warning' if (this.confirmedAt) return 'success' - if (this.state === 'IN_PROGRESS') return 'f5' + if (this.state === 'IN_PROGRESS') return '205' return 'primary' }, date() { diff --git a/frontend/src/layouts/templates/CommunityTemplate.vue b/frontend/src/layouts/templates/CommunityTemplate.vue index 448c06bd2..f014af2c0 100644 --- a/frontend/src/layouts/templates/CommunityTemplate.vue +++ b/frontend/src/layouts/templates/CommunityTemplate.vue @@ -24,7 +24,7 @@ {{ $t('contribution.alert.pending') }}
  • - + {{ $t('contribution.alert.in_progress') }}
  • @@ -54,7 +54,7 @@ {{ $t('contribution.alert.pending') }}
  • - + {{ $t('contribution.alert.in_progress') }}
  • From 35d81f889cab5548d0bf39e0ff901fe932af352f Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 22 Feb 2023 13:53:51 +0100 Subject: [PATCH 2/2] fix tests --- .../src/components/Contributions/ContributionListItem.spec.js | 2 +- frontend/src/layouts/templates/CommunityTemplate.spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js index 3415ee5d3..cf2c062ed 100644 --- a/frontend/src/components/Contributions/ContributionListItem.spec.js +++ b/frontend/src/components/Contributions/ContributionListItem.spec.js @@ -74,7 +74,7 @@ describe('ContributionListItem', () => { it('is warning at when state is IN_PROGRESS', async () => { await wrapper.setProps({ state: 'IN_PROGRESS' }) - expect(wrapper.vm.variant).toBe('f5') + expect(wrapper.vm.variant).toBe('205') }) }) diff --git a/frontend/src/layouts/templates/CommunityTemplate.spec.js b/frontend/src/layouts/templates/CommunityTemplate.spec.js index cd4b598ef..534e45125 100644 --- a/frontend/src/layouts/templates/CommunityTemplate.spec.js +++ b/frontend/src/layouts/templates/CommunityTemplate.spec.js @@ -50,7 +50,7 @@ describe('CommunityTemplate', () => { expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill') expect(listItems.at(0).text()).toBe('contribution.alert.pending') - expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square') + expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question') expect(listItems.at(1).text()).toBe('contribution.alert.in_progress') expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check') @@ -80,7 +80,7 @@ describe('CommunityTemplate', () => { expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill') expect(listItems.at(0).text()).toBe('contribution.alert.pending') - expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question square') + expect(listItems.at(1).find('svg').attributes('aria-label')).toEqual('question') expect(listItems.at(1).text()).toBe('contribution.alert.in_progress') expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check')