IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2731 from gradido/2709-the-bell-symbol-must-appear-text

Browse Source 
fix(frontend): change contribution design
This commit is contained in:
mahula 2023-03-06 17:19:51 +01:00 committed by GitHub
commit 3d9909b98e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Contributions/ContributionListItem.spec.js
View File

@ -74,7 +74,7 @@ describe('ContributionListItem', () => {
it('is warning at when state is IN_PROGRESS', async () => { it('is warning at when state is IN_PROGRESS', async () => {
await wrapper.setProps({ state: 'IN_PROGRESS' }) await wrapper.setProps({ state: 'IN_PROGRESS' })
expect(wrapper.vm.variant).toBe('f5') expect(wrapper.vm.variant).toBe('205')
}) })
}) })

12
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -2,7 +2,7 @@
<div> <div>
<div <div
class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3" class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3"
:class="state === 'IN_PROGRESS' ? 'pulse border border-205' : ''" :class="state === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
> >
<b-row> <b-row>
<b-col cols="3" lg="2" md="2"> <b-col cols="3" lg="2" md="2">
@ -25,11 +25,7 @@
</div> </div>
<div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div> <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
<div class="mb-3 text-break word-break">{{ memo }}</div> <div class="mb-3 text-break word-break">{{ memo }}</div>
<div <div v-if="state === 'IN_PROGRESS' && !allContribution" class="text-205">
v-if="state === 'IN_PROGRESS'"
class="text-205 pointer hover-font-bold"
@click="visible = !visible"
>
{{ $t('contribution.alert.answerQuestion') }} {{ $t('contribution.alert.answerQuestion') }}
</div> </div>
</b-col> </b-col>
@ -193,14 +189,14 @@ export default {
if (this.deletedAt) return 'trash' if (this.deletedAt) return 'trash'
if (this.deniedAt) return 'x-circle' if (this.deniedAt) return 'x-circle'
if (this.confirmedAt) return 'check' if (this.confirmedAt) return 'check'
if (this.state === 'IN_PROGRESS') return 'question-circle' if (this.state === 'IN_PROGRESS') return 'question'
return 'bell-fill' return 'bell-fill'
}, },
variant() { variant() {
if (this.deletedAt) return 'danger' if (this.deletedAt) return 'danger'
if (this.deniedAt) return 'warning' if (this.deniedAt) return 'warning'
if (this.confirmedAt) return 'success' if (this.confirmedAt) return 'success'
if (this.state === 'IN_PROGRESS') return 'f5' if (this.state === 'IN_PROGRESS') return '205'
return 'primary' return 'primary'
}, },
date() { date() {

4
frontend/src/layouts/templates/CommunityTemplate.spec.js
View File

@ -50,7 +50,7 @@ describe('CommunityTemplate', () => {
expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill') expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill')
expect(listItems.at(0).text()).toBe('contribution.alert.pending') 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(1).text()).toBe('contribution.alert.in_progress')
expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check') 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).find('svg').attributes('aria-label')).toEqual('bell fill')
expect(listItems.at(0).text()).toBe('contribution.alert.pending') 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(1).text()).toBe('contribution.alert.in_progress')
expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check') expect(listItems.at(2).find('svg').attributes('aria-label')).toEqual('check')

4
frontend/src/layouts/templates/CommunityTemplate.vue
View File

@ -24,7 +24,7 @@
{{ $t('contribution.alert.pending') }} {{ $t('contribution.alert.pending') }}
</li> </li>
<li> <li>
<b-icon icon="question-square" variant="warning"></b-icon> <b-icon icon="question" variant="205"></b-icon>
{{ $t('contribution.alert.in_progress') }} {{ $t('contribution.alert.in_progress') }}
</li> </li>
<li> <li>
@ -54,7 +54,7 @@
{{ $t('contribution.alert.pending') }} {{ $t('contribution.alert.pending') }}
</li> </li>
<li> <li>
<b-icon icon="question-square" variant="warning"></b-icon> <b-icon icon="question" variant="205"></b-icon>
{{ $t('contribution.alert.in_progress') }} {{ $t('contribution.alert.in_progress') }}
</li> </li>
<li> <li>