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

review changed from ulf

Browse Source
This commit is contained in:
ogerly 2023-01-05 16:38:19 +01:00
parent 4c097a34a3
commit 183d670c2a
26 changed files with 212 additions and 663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/.eslintrc.js
View File

@ -55,12 +55,7 @@ module.exports = {
'settings.password.set-password.text',
'settings.password.subtitle',
'math.asterisk',
'pageTitle.overview',
'pageTitle.send',
'pageTitle.transactions',
'pageTitle.gdt',
'pageTitle.community',
'pageTitle.settings',
'/pageTitle./',
],
enableFix: false,
},

11
frontend/src/assets/scss/gradido-template.scss
View File

@ -117,10 +117,6 @@ a:hover,
height: 50px;
}
// .rounded-right-17 {
// border-top-right-radius: 17px !important;
// border-bottom-right-radius: 17px !important;
// }
.input-group .rounded-right {
border-top-right-radius: 17px !important;
border-bottom-right-radius: 17px !important;
@ -293,13 +289,6 @@ a:hover,
}
.pulse {
// margin:100px;
// display: block;
// width: 22px;
// height: 22px;
// border-radius: 50%;
// background: #cca92c;
// cursor: pointer;
box-shadow: 0 0 0 #c58d38;
animation: pulse 2s infinite;
}

12
frontend/src/components/Breadcrumb/breadcrumb.vue
View File

@ -1,18 +1,6 @@
<template>
<div class="breadcrumb bg-transparent">
<!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys -->
<h1>{{ pageTitle }}</h1>
<!-- <div v-switch="path">
<h2 v-case="'/overview'">overview</h2>
<h2 v-case="'/send'">send</h2>
<h2 v-case="'/transactions'">transactions</h2>
<h2 v-case="'/gdt'">gdt</h2>
<h2 v-case="'/community'">community</h2>
<h2 v-case="'/information'">information</h2>
<h2 v-case="'/settings'">settings</h2>
<h2 v-default>Default</h2>
</div>
{{ this.$route.bread }} -->
</div>
</template>
<script>

12
frontend/src/components/ClipboardCopy.vue
View File

@ -6,7 +6,6 @@
<label>{{ $t('gdd_per_link.copy-link') }}</label>
<div class="pointer text-center bg-secondary gradido-border-radius p-4" @click="copyLink">
{{ link }}
<!-- <b-icon icon="clipboard-plus" class="ml-5"></b-icon> -->
</div>
</div>
<div class="ml-5">
@ -18,17 +17,6 @@
</div>
</div>
</div>
<!-- <div class="text-center mt-5">
<b-button size="sm" text="Button" variant="gradido" @click="copyLink">
{{ $t('gdd_per_link.copy-link') }}
</b-button>
<hr />
<b-button size="sm" text="Button" variant="gradido" @click="copyLinkWithText">
{{ $t('gdd_per_link.copy-link-with-text') }}
</b-button>
<hr />
</div> -->
</div>
<div v-else>
<div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>

56
frontend/src/components/Contributions/ContributionForm.vue
View File

@ -44,26 +44,6 @@
:validMaxTime="validMaxTime"
@updateAmount="updateAmount"
></input-hour>
<!-- <validation-provider
:rules="{
min: minlength,
max: maxlength,
}"
:name="$t('form.message')"
v-slot="{ errors }"
>
<label class="mt-3">{{ $t('contribution.activity') }} {{ $t('math.asterisk') }}</label>
<b-form-textarea
id="contribution-memo"
v-model="form.memo"
rows="3"
:placeholder="$t('contribution.yourActivity')"
required
></b-form-textarea>
<b-col v-if="errors">
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
</b-col>
</validation-provider> -->
<input-amount
v-model="form.amount"
:name="$t('form.amount')"
@ -74,29 +54,6 @@
></input-amount>
</div>
<div v-else class="mb-5">{{ $t('contribution.exhausted') }}</div>
<!-- <validation-provider
:name="$t('form.amount')"
:rules="{
required: true,
gddSendAmount: [0.01, validMaxGDD],
}"
v-slot="{ errors }"
>
<label class="mt-3">{{ $t('form.amount') }} {{ $t('math.asterisk') }}</label>
<b-input-group size="lg" prepend="GDD">
<b-form-input
id="contribution-amount"
v-model="form.amount"
type="number"
:formatter="numberFormat"
:max="validMaxGDD"
required
></b-form-input>
</b-input-group>
<b-col v-if="errors">
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
</b-col>
</validation-provider> -->
<b-row class="mt-5">
<b-col>
<b-button type="reset" variant="secondary" @click="reset" data-test="button-cancel">
@ -143,12 +100,7 @@ export default {
updateAmount(amount) {
this.form.amount = (amount * 20).toFixed(2).toString()
},
// numberFormat(value) {
// return value.replace(PATTERN_NON_DIGIT, '')
// },
submit() {
// this.form.amount = this.form.amount.replace(PATTERN_NON_DIGIT, '')
// spreading is needed for testing
this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
this.reset()
},
@ -160,13 +112,6 @@ export default {
this.form.hours = 0.0
this.form.amount = ''
},
// textForMonth(date, availableAmount) {
// const obj = {
// monthAndYear: this.$d(date, 'monthAndYear'),
// creation: availableAmount,
// }
// return this.$t('contribution.formText.openAmountForMonth', obj)
// },
},
computed: {
disabled() {
@ -185,7 +130,6 @@ export default {
return Number(this.isThisMonth ? this.maxGddThisMonth : this.maxGddLastMonth)
},
validMaxTime() {
// console.log('this.validMaxGDD', this.validMaxGDD)
return Number(this.validMaxGDD / 20)
},
},

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

@ -110,8 +110,7 @@ describe('ContributionListItem', () => {
beforeEach(() => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve(true))
// wrapper.findAll('div.pointer').at(1).trigger('click')
wrapper.findAll('div.test-delete-contribution').trigger('click')
wrapper.find('div.test-delete-contribution').trigger('click')
})
it('opens the modal', () => {

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

@ -25,10 +25,6 @@
<div v-if="state === 'IN_PROGRESS'" class="text-205">
{{ $t('contribution.alert.answerQuestion') }}
</div>
<!-- <div class="small">
contributionDate {{ $d(new Date(contributionDate), 'monthAndYear') }}
</div>
<div class="small">createdAt {{ createdAt }}</div> -->
</b-col>
<b-col cols="12" lg="3" offset="3" offset-md="0" offset-lg="0">
<div class="small">
@ -83,88 +79,6 @@
</b-col>
</b-row>
<div v-else class="pb-3"></div>
<!-- <div class="border p-3 w-100 mb-1" :class="`border-${variant}`">
<div>
<div class="d-inline-flex">
<div class="mr-2">
<b-icon
v-if="state === 'IN_PROGRESS'"
icon="question-square"
font-scale="2"
variant="warning"
></b-icon>
<b-icon v-else :icon="icon" :variant="variant" class="h2"></b-icon>
</div>
<div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div>
<div class="mr-2" :class="state !== 'DELETED' ? 'font-weight-bold' : ''">
{{ amount | GDD }}
</div>
{{ $t('math.minus') }}
<div class="mx-2">{{ $d(new Date(date), 'short') }}</div>
</div>
<div class="mr-2">
<span>{{ $t('contribution.date') }}</span>
<span>
{{ $d(new Date(contributionDate), 'monthAndYear') }}
</span>
</div>
<div class="mr-2">{{ memo }}</div>
<div class="d-flex flex-row-reverse">
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
class="pointer ml-5"
@click="
$emit('closeAllOpenCollapse'),
$emit('update-contribution-form', {
id: id,
contributionDate: contributionDate,
memo: memo,
amount: amount,
})
"
>
<b-icon icon="pencil" class="h2"></b-icon>
</div>
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state) && !allContribution"
class="pointer"
@click="deleteContribution({ id })"
>
<b-icon icon="trash" class="h2"></b-icon>
</div>
<div v-if="messagesCount > 0" class="pointer">
<b-icon
v-b-toggle="collapsId"
icon="chat-dots"
class="h2 mr-5"
@click="getListContributionMessages"
></b-icon>
</div>
</div>
</div>
<div v-if="messagesCount > 0">
<b-button
v-if="state === 'IN_PROGRESS'"
v-b-toggle="collapsId"
variant="warning"
@click="getListContributionMessages"
>
{{ $t('contribution.alert.answerQuestion') }}
</b-button>
<b-collapse :id="collapsId" class="mt-2" v-model="visible">
<b-card>
<contribution-messages-list
:messages="messages_get"
:state="state"
:contributionId="contributionId"
@get-list-contribution-messages="getListContributionMessages"
@update-state="updateState"
/>
</b-card>
</b-collapse>
</div>
</div> -->
<b-collapse :id="collapsId" class="mt-2" v-model="visible">
<contribution-messages-list
:messages="messages_get"
@ -297,7 +211,6 @@ export default {
fetchPolicy: 'no-cache',
})
.then((result) => {
// console.log('result', result.data.listContributionMessages.messages)
this.messages_get = result.data.listContributionMessages.messages
})
.catch((error) => {

13
frontend/src/components/DecayInformations/DecayInformation-Long.vue
View File

@ -8,14 +8,6 @@
<b-icon icon="droplet-half" class="mr-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
<!-- <b-row>
<b-col offset="">
<div class="pb-3">
<b-icon icon="droplet-half" class="mr-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</b-col>
</b-row> -->
<b-row>
<b-col>
<b-row>
@ -49,11 +41,6 @@
<b-col cols="12" lg="4" md="4">{{ $t(`decay.types.${typeId.toLowerCase()}`) }}</b-col>
<b-col offset="1" offset-md="0" offset-lg="0">{{ amount | GDD }}</b-col>
</b-row>
<!-- Decay-->
<!-- <b-row>
<b-col cols="4">{{ $t('decay.decay') }}</b-col>
<b-col>{{ decay.decay | GDD }}</b-col>
</b-row> -->
<!-- Total-->
<b-row>
<b-col cols="12" lg="4" md="4">

53
frontend/src/components/GddSend/TransactionConfirmationLink.vue
View File

@ -51,59 +51,6 @@
</b-col>
</b-row>
</div>
<!-- <b-row class="confirm-box-link">
<b-col class="text-right mt-4 mb-3">
<div class="alert-heading text-left h3">{{ $t('gdd_per_link.header') }}</div>
<h1>{{ (amount * -1) | GDD }}</h1>
<b class="mt-2">{{ memo }}</b>
</b-col>
</b-row> -->
<!-- <b-container class="bv-example-row mt-3 mb-5">
<div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
<b-col class="text-right">{{ balance | GDD }}</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">
<strong>{{ $t('form.your_amount') }}</strong>
</b-col>
<b-col class="text-right">
<strong>{{ (amount * -1) | GDD }}</strong>
</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">
<strong>{{ $t('gdd_per_link.decay-14-day') }}</strong>
</b-col>
<b-col class="text-right borderbottom">
<strong>{{ $t('math.aprox') }} {{ (amount * -0.028) | GDD }}</strong>
</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
<b-col class="text-right">{{ $t('math.aprox') }} {{ totalBalance | GDD }}</b-col>
</b-row>
</b-container> -->
<!-- <b-row class="mt-4">
<b-col>
<b-button @click="$emit('on-reset')">{{ $t('back') }}</b-button>
</b-col>
<b-col class="text-right">
<b-button
class="send-button"
variant="primary"
:disabled="disabled"
@click="$emit('send-transaction')"
>
{{ $t('form.generate_now') }}
</b-button>
</b-col>
</b-row> -->
</div>
</template>
<script>

63
frontend/src/components/GddSend/TransactionConfirmationSend.vue
View File

@ -3,9 +3,7 @@
<div class="bg-white appBoxShadow gradido-border-radius p-3">
<div class="h3 mb-4">{{ $t('form.send_check') }}</div>
<b-row class="mt-5">
<b-col cols="2">
<!-- <b-avatar :text="avatarText" variant="success" size="3em"></b-avatar> -->
</b-col>
<b-col cols="2"></b-col>
<b-col>
<div class="h4">
{{ email }}
@ -56,59 +54,6 @@
</b-col>
</b-row>
</div>
<!-- <b-row class="confirm-box-send">
<b-col>
<div class="display-4 pb-4">{{ $t('form.send_check') }}</div>
<b-list-group class="">
<label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
<b-input-group id="input-group-1" class="borderbottom" size="lg">
<b-input-group-prepend class="d-none d-md-block gray-background">
<b-icon icon="envelope" class="display-4 m-3"></b-icon>
</b-input-group-prepend>
<div class="p-3">{{ email }}</div>
</b-input-group>
<br />
<label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
<b-input-group id="input-group-2" class="borderbottom" size="lg">
<b-input-group-prepend class="p-2 d-none d-md-block gray-background">
<div class="m-1 mt-2">{{ $t('GDD') }}</div>
</b-input-group-prepend>
<div class="p-3">{{ amount | GDD }}</div>
</b-input-group>
<br />
<label class="input-3" for="input-3">{{ $t('form.message') }}</label>
<b-input-group id="input-group-3" class="borderbottom">
<b-input-group-prepend class="d-none d-md-block gray-background">
<b-icon icon="chat-right-text" class="display-4 m-3 mt-4"></b-icon>
</b-input-group-prepend>
<div class="p-3">{{ memo ? memo : $t('em-dash') }}</div>
</b-input-group>
</b-list-group>
</b-col>
</b-row> -->
<!-- <b-container class="bv-example-row mt-5 mb-5">
<div class="alert-heading text-left h3">{{ $t('advanced-calculation') }}</div>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.current_balance') }}</b-col>
<b-col class="text-right">{{ balance | GDD }}</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">
<strong>{{ $t('form.your_amount') }}</strong>
</b-col>
<b-col class="text-right borderbottom">
<strong>{{ (amount * -1) | GDD }}</strong>
</b-col>
</b-row>
<b-row class="pr-3">
<b-col class="text-right">{{ $t('form.new_balance') }}</b-col>
<b-col class="text-right">{{ (balance - amount) | GDD }}</b-col>
</b-row>
</b-container> -->
</div>
</template>
<script>
@ -125,12 +70,6 @@ export default {
disabled: false,
}
},
// computed: {
// avatarText() {
// // return this.linkedUser.firstName[0] + this.linkedUser.lastName[0]
// return 'xx'
// },
// },
}
</script>
<style>

32
frontend/src/components/GddSend/TransactionResultLink.vue
View File

@ -1,7 +1,6 @@
<template>
<div class="bg-white appBoxShadow gradido-border-radius p-5">
<div class="h3 mb-4">{{ $t('gdd_per_link.created') }}</div>
<clipboard-copy
:link="link"
:amount="amount"
@ -16,27 +15,6 @@
</b-button>
</div>
</div>
<!-- <b-row>
<b-col>
<div class="h3 mb-4">{{ $t('gdd_per_link.created') }}</div>
<clipboard-copy
:link="link"
:amount="amount"
:memo="memo"
:validUntil="validUntil"
@show-qr-code-button="showQrCodeButton"
></clipboard-copy>
<div class="text-center">
<figure-qr-code v-if="showQrcode" :link="link" />
<b-button variant="secondary" @click="$emit('on-reset')" class="mt-4">
{{ $t('form.close') }}
</b-button>
</div>
</b-col>
</b-row> -->
</div>
</template>
<script>
@ -55,15 +33,5 @@ export default {
memo: { type: String, required: true },
validUntil: { type: String, required: true },
},
// data() {
// return {
// showQrcode: false,
// }
// },
// methods: {
// showQrCodeButton() {
// this.showQrcode = !this.showQrcode
// },
// },
}
</script>

240
frontend/src/components/GddTransactionList.spec.js
View File

@ -198,26 +198,26 @@ describe('GddTransactionList', () => {
])
})
// it('has gradido-global-color-gray color', () => {
// expect(transaction.findAll('svg').at(1).classes()).toEqual([
// 'bi-arrow-down-circle',
// 'b-icon',
// 'bi',
// 'text-muted',
// ])
// })
it.skip('has gradido-global-color-gray color', () => {
expect(transaction.findAll('svg').at(1).classes()).toEqual([
'bi-arrow-down-circle',
'b-icon',
'bi',
'text-muted',
])
})
// it.skip('shows the amount of transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
// '0.16778637075575395',
// )
// })
it.skip('shows the amount of transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
'0.16778637075575395',
)
})
// it.skip('shows the name of the receiver', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toBe(
// 'decay.decay_since_last_transaction',
// )
// })
it.skip('shows the name of the receiver', () => {
expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toBe(
'decay.decay_since_last_transaction',
)
})
})
describe('send transactions', () => {
@ -245,51 +245,51 @@ describe('GddTransactionList', () => {
])
})
// it('has text-danger color', () => {
// expect(transaction.findAll('svg').at(1).classes()).toEqual([
// 'bi-droplet-half',
// 'mr-2',
// 'b-icon',
// 'bi',
// ])
// })
it.skip('has text-danger color', () => {
expect(transaction.findAll('svg').at(1).classes()).toEqual([
'bi-droplet-half',
'mr-2',
'b-icon',
'bi',
])
})
// operators are renderd by GDD filter
// it.skip('has a minus operator', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
// '-',
// )
// })
it.skip('has a minus operator', () => {
expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
'-',
)
})
// it.skip('shows the amount of transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
// '1',
// )
// })
it.skip('shows the amount of transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
'1',
)
})
// it.skip('shows the name of the receiver', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
// 'Bibi Bloxberg',
// )
// })
it.skip('shows the name of the receiver', () => {
expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
'Bibi Bloxberg',
)
})
// it.skip('shows the message of the transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
// 'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
// )
// })
it.skip('shows the message of the transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
)
})
// it.skip('shows the date of the transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
// 'Mon Feb 28 2022 13:55:47 GMT+0000',
// )
// })
it.skip('shows the date of the transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
'Mon Feb 28 2022 13:55:47 GMT+0000',
)
})
// it.skip('shows the decay calculation', () => {
// expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
// '− 0.2038314055482643084',
// )
// })
it.skip('shows the decay calculation', () => {
expect(transaction.findAll('div.gdd-transaction-list-item-decay').at(0).text()).toContain(
'− 0.2038314055482643084',
)
})
})
describe('receive transactions', () => {
@ -309,45 +309,45 @@ describe('GddTransactionList', () => {
])
})
// it('has a bi-gift icon', () => {
// expect(transaction.findAll('svg').at(1).classes()).toEqual(['bi-gift', 'b-icon', 'bi'])
// })
it.skip('has a bi-gift icon', () => {
expect(transaction.findAll('svg').at(1).classes()).toEqual(['bi-gift', 'b-icon', 'bi'])
})
// it.skip('has gradido-global-color-accent color', () => {
// expect(transaction.findAll('svg').at(1).classes()).toEqual([
// 'bi-arrow-right-circle',
// 'm-mb-1',
// 'font2em',
// 'b-icon',
// 'bi',
// 'gradido-global-color-accent',
// ])
// })
it.skip('has gradido-global-color-accent color', () => {
expect(transaction.findAll('svg').at(1).classes()).toEqual([
'bi-arrow-right-circle',
'm-mb-1',
'font2em',
'b-icon',
'bi',
'gradido-global-color-accent',
])
})
// // operators are renderd by GDD filter
// it.skip('has a plus operator', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
// '+',
// )
// })
// operators are renderd by GDD filter
it.skip('has a plus operator', () => {
expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
'+',
)
})
// it.skip('shows the amount of transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
// '+ 10 GDD',
// )
// })
it.skip('shows the amount of transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
'+ 10 GDD',
)
})
// it.skip('shows the name of the receiver', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
// 'Bibi Bloxberg',
// )
// })
it.skip('shows the name of the receiver', () => {
expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
'Bibi Bloxberg',
)
})
// it.skip('shows the date of the transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
// 'Wed Feb 23 2022 10:55:30 GMT+0000',
// )
// })
it.skip('shows the date of the transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
'Wed Feb 23 2022 10:55:30 GMT+0000',
)
})
})
describe('creation transactions', () => {
@ -371,41 +371,41 @@ describe('GddTransactionList', () => {
})
// operators are renderd by GDD filter
// it('has a plus operator', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
// '+',
// )
// })
it.skip('has a plus operator', () => {
expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
'+',
)
})
// it('shows the amount of transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
// '10',
// )
// })
it.skip('shows the amount of transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
'10',
)
})
// it('shows the name of the recipient', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
// 'Gradido Akademie',
// )
// })
it.skip('shows the name of the recipient', () => {
expect(transaction.findAll('.gdd-transaction-list-item-name').at(0).text()).toContain(
'Gradido Akademie',
)
})
// it('shows the message of the transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
// 'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
// )
// })
it.skip('shows the message of the transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-message').at(0).text()).toContain(
'Jammern hilft nichts, sondern ich kann selber meinen Teil dazu beitragen.',
)
})
// it('shows the date of the transaction', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
// 'Fri Feb 25 2022 07:29:26 GMT+0000',
// )
// })
it.skip('shows the date of the transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-date').at(0).text()).toContain(
'Fri Feb 25 2022 07:29:26 GMT+0000',
)
})
// it('shows the decay calculation', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-decay').at(0).text()).toContain(
// '0',
// )
// })
it.skip('shows the decay calculation', () => {
expect(transaction.findAll('.gdd-transaction-list-item-decay').at(0).text()).toContain(
'0',
)
})
})
})

5
frontend/src/components/Inputs/InputTextarea.spec.js
View File

@ -1,6 +1,5 @@
import { mount } from '@vue/test-utils'
import InputTextarea from './InputTextarea'
// import flushPromises from 'flush-promises'
const localVue = global.localVue
@ -53,7 +52,9 @@ describe('InputTextarea', () => {
})
it('has the placeholder "input-field-placeholder"', () => {
expect(wrapper.find('textarea').attributes('placeholder')).toEqual('input-field-placeholder')
expect(wrapper.find('textarea').attributes('placeholder')).toEqual(
'input-field-placeholder',
)
})
it('has the value ""', () => {

39
frontend/src/components/Menu/Sidebar.vue
View File

@ -1,22 +1,12 @@
<template>
<div id="component-sidebar">
<div id="side-menu" ref="sideMenu" class="gradido-border-radius appBoxShadow pt-2">
<!-- @mouseout="$emit('toogleMobilMenu')" -->
<div class="mb-3 mt-3">
<b-nav vertical class="w-200">
<b-nav-item to="/overview" class="mb-3" active-class="activeRoute">
<b-icon icon="house" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.overview') }}</span>
</b-nav-item>
<!-- <b-nav-item to="/storys" class="mb-3">
<b-icon icon="card-heading" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.topStories') }}</span>
</b-nav-item> -->
<!-- <b-nav-item to="/addresses" class="mb-3">
<b-icon icon="bookmark" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.adresses') }}</span>
</b-nav-item> -->
<b-nav-item to="/send" class="mb-3" active-class="activeRoute">
<b-icon icon="cash-stack" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.send') }}</span>
@ -29,10 +19,6 @@
<b-icon icon="layers" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('gdt.gdt') }}</span>
</b-nav-item>
<!-- <b-nav-item to="/profile" class="mb-3 HIDE_FOR_WORK_IN_PROCESS">
<b-icon icon="person" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.profile') }}</span>
</b-nav-item> -->
<b-nav-item to="/community#my" class="" active-class="activeRoute">
<b-icon icon="people" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('creation') }}</span>
@ -44,20 +30,6 @@
<b-icon icon="info-circle" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.info') }}</span>
</b-nav-item>
<!-- <b-nav-item
@click="
lightmode = !lightmode
$emit('modeToggle')
"
class="mb-3 HIDE_FOR_WORK_IN_PROCESS"
>
<b-icon :icon="lightmode ? 'toggle-on' : 'toggle-off'" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.lightmode') }}</span>
<label for="checkbox" class="switch-label">
<span v-if="lightmode">{{ $t('navigation.moon') }}</span>
<span v-else>{{ $t('navigation.sun') }}</span>
</label>
</b-nav-item> -->
<b-nav-item to="/settings" class="mb-3" active-class="activeRoute">
<b-icon icon="gear" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.settings') }}</span>
@ -83,11 +55,6 @@
<script>
export default {
name: 'Sidebar',
data() {
return {
// lightmode: false,
}
},
}
</script>
<style>
@ -99,12 +66,6 @@ export default {
color: rgb(2, 2, 1);
border-left: 4px rgb(219, 129, 19) solid;
}
/* .component-navbar .active, */
/* #component-sidebar .active {
font-weight: bold;
color: red;
} */
#component-sidebar {
min-width: 200px;
}

9
frontend/src/components/Template/ContentHeader/GddAmount.vue
View File

@ -20,15 +20,6 @@
>
<b-row>
<b-col class="h4">{{ $t('gddKonto') }}</b-col>
<!-- <b-col cols="3" class="text-center">
<div>
<b-icon
:icon="showStatus ? 'check-circle' : 'circle'"
:class="showStatus ? 'gradido-global-border-color-accent' : ''"
></b-icon>
<div class="small">{{ badge ? $t('active') : $t('inactive') }}</div>
</div>
</b-col> -->
</b-row>
<b-row>

9
frontend/src/components/Template/ContentHeader/GdtAmount.vue
View File

@ -16,15 +16,6 @@
>
<b-row>
<b-col class="h4">{{ $t('gdt.gdtKonto') }}</b-col>
<!-- <b-col cols="3" class="text-center">
<div>
<b-icon
:icon="badge ? 'check-circle' : 'circle'"
class="gradido-global-border-color-accent"
></b-icon>
<div class="small">{{ badge ? $t('active') : $t('inactive') }}</div>
</div>
</b-col> -->
</b-row>
<b-row>
<b-col cols="9">

39
frontend/src/components/Transaction.spec.js
View File

@ -1,6 +1,7 @@
import { mount } from '@vue/test-utils'
import Transaction from './Transaction'
import Vue from 'vue'
import flushPromises from 'flush-promises'
const localVue = global.localVue
@ -85,13 +86,13 @@ describe('Transaction', () => {
expect(wrapper.findAll('div.row').at(0).text()).toContain('1700 GDT')
})
// it('renders the comment message', () => {
// expect(wrapper.findAll('div.row').at(0).text()).toContain('This is a comment')
// })
it.skip('renders the comment message', () => {
expect(wrapper.findAll('div.row').at(0).text()).toContain('This is a comment')
})
// it('renders the date', () => {
// expect(wrapper.findAll('div.row').at(0).text()).toContain('Sun May 02 2021')
// })
it.skip('renders the date', () => {
expect(wrapper.findAll('div.row').at(0).text()).toContain('Sun May 02 2021')
})
it('does not show the collapse by default', () => {
expect(wrapper.find('div#gdt-collapse-42').isVisible()).toBeFalsy()
@ -103,24 +104,20 @@ describe('Transaction', () => {
expect(wrapper.findAll('div.row').at(1).text()).toContain('gdt.calculation')
})
})
/* how to open the collapse ?????
describe('collapse is open', () => {
// how to open the collapse ?????
describe.skip('collapse is open', () => {
beforeEach(async () => {
//console.log(wrapper.html())
await wrapper.find('div#gdt-collapse-42').trigger('click')
await wrapper.vm.$nextTick()
await flushPromises()
await wrapper.vm.$nextTick()
await flushPromises()
//console.log(wrapper.find('[enteractiveclass="collapsing"]').html())
})
it('shows the collapse', () => {
//console.log(wrapper.html())
expect(wrapper.find('div#gdt-collapse-42').isVisible()).toBeTruthy()
})
})
*/
})
describe('GdtEntryType.CVS', () => {
@ -184,20 +181,20 @@ describe('Transaction', () => {
expect(wrapper.findAll('div.row').at(1).text()).toContain('gdt.publisher')
})
// it('renders the date', () => {
// expect(wrapper.findAll('div.row').at(2).text()).toContain('Fri Apr 10 2020')
// })
it.skip('renders the date', () => {
expect(wrapper.findAll('div.row').at(2).text()).toContain('Fri Apr 10 2020')
})
it('does not show the collapse by default', () => {
expect(wrapper.find('div#gdt-collapse-42').isVisible()).toBeFalsy()
})
// describe('without comment', () => {
// it('does not render the message row', async () => {
// await wrapper.setProps({ comment: undefined })
// expect(wrapper.findAll('div.row').at(0).text()).toContain('form.date')
// })
// })
describe.skip('without comment', () => {
it('does not render the message row', async () => {
await wrapper.setProps({ comment: undefined })
expect(wrapper.findAll('div.row').at(0).text()).toContain('form.date')
})
})
})
describe('GdtEntryType.GLOBAL_MODIFICATOR', () => {

10
frontend/src/components/Transactions/TransactionCreation.vue
View File

@ -24,22 +24,12 @@
</template>
<script>
import CollapseIcon from '../TransactionRows/CollapseIcon'
// import TypeIcon from '../TransactionRows/TypeIcon'
// import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
// import MemoRow from '../TransactionRows/MemoRow'
// import DateRow from '../TransactionRows/DateRow'
// import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
name: 'TransactionCreation',
components: {
CollapseIcon,
// TypeIcon,
// AmountAndNameRow,
// MemoRow,
// DateRow,
// DecayRow,
DecayInformation,
},
props: {

8
frontend/src/components/Transactions/TransactionLinkSummary.vue
View File

@ -29,10 +29,6 @@
</template>
<script>
import CollapseIcon from '../TransactionRows/CollapseIcon'
// import TypeIcon from '../TransactionRows/TypeIcon'
// import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
// import LinkCountRow from '../TransactionRows/LinkCountRow'
// import DecayRow from '../TransactionRows/DecayRow'
import CollapseLinksList from '../DecayInformations/CollapseLinksList'
import { listTransactionLinks } from '@/graphql/queries'
@ -40,10 +36,6 @@ export default {
name: 'TransactionSlotLink',
components: {
CollapseIcon,
// TypeIcon,
// AmountAndNameRow,
// LinkCountRow,
// DecayRow,
CollapseLinksList,
},
props: {

8
frontend/src/components/Transactions/TransactionReceive.vue
View File

@ -50,11 +50,7 @@
<script>
import Avatar from 'vue-avatar'
import CollapseIcon from '../TransactionRows/CollapseIcon'
// import TypeIcon from '../TransactionRows/TypeIcon'
import Name from '../TransactionRows/Name'
// import MemoRow from '../TransactionRows/MemoRow'
// import DateRow from '../TransactionRows/DateRow'
// import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
@ -62,11 +58,7 @@ export default {
components: {
Avatar,
CollapseIcon,
// TypeIcon,
Name,
// MemoRow,
// DateRow,
// DecayRow,
DecayInformation,
},
props: {

8
frontend/src/components/Transactions/TransactionSend.vue
View File

@ -49,11 +49,7 @@
<script>
import Avatar from 'vue-avatar'
import CollapseIcon from '../TransactionRows/CollapseIcon'
// import TypeIcon from '../TransactionRows/TypeIcon'
import Name from '../TransactionRows/Name'
// import MemoRow from '../TransactionRows/MemoRow'
// import DateRow from '../TransactionRows/DateRow'
// import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
@ -61,11 +57,7 @@ export default {
components: {
Avatar,
CollapseIcon,
// TypeIcon,
Name,
// MemoRow,
// DateRow,
// DecayRow,
DecayInformation,
},
props: {

6
frontend/src/graphql/queries.js
View File

@ -210,12 +210,6 @@ export const communityStatistics = gql`
query {
communityStatistics {
totalUsers
# activeUsers
# deletedUsers
# totalGradidoCreated
# totalGradidoDecayed
# totalGradidoAvailable
# totalGradidoUnbookedDecayed
}
}
`

100
frontend/src/layouts/DashboardLayout.spec.js
View File

@ -255,64 +255,64 @@ describe('DashboardLayout', () => {
})
})
// describe('set visible method', () => {
// beforeEach(() => {
// wrapper.findComponent({ name: 'NavbarNew' }).vm.$emit('set-visible', true)
// })
describe.skip('set visible method', () => {
beforeEach(() => {
wrapper.findComponent({ name: 'NavbarNew' }).vm.$emit('set-visible', true)
})
// it('sets visible to true', () => {
// expect(wrapper.vm.visible).toBe(true)
// })
// })
it('sets visible to true', () => {
expect(wrapper.vm.visible).toBe(true)
})
})
// describe('elopage URI', () => {
// describe('user has no publisher ID and no elopage', () => {
// beforeEach(() => {
// mocks.$store.state.publisherId = null
// mocks.$store.state.hasElopage = false
// wrapper = Wrapper()
// })
describe.skip('elopage URI', () => {
describe('user has no publisher ID and no elopage', () => {
beforeEach(() => {
mocks.$store.state.publisherId = null
mocks.$store.state.hasElopage = false
wrapper = Wrapper()
})
// it('links to basic-de', () => {
// expect(wrapper.vm.elopageUri).toBe(
// 'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=2896&firstName=User&lastName=Example&email=user@example.org',
// )
// })
// })
it('links to basic-de', () => {
expect(wrapper.vm.elopageUri).toBe(
'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=2896&firstName=User&lastName=Example&email=user@example.org',
)
})
})
// describe('user has elopage', () => {
// beforeEach(() => {
// mocks.$store.state.publisherId = '123'
// mocks.$store.state.hasElopage = true
// wrapper = Wrapper()
// })
describe('user has elopage', () => {
beforeEach(() => {
mocks.$store.state.publisherId = '123'
mocks.$store.state.hasElopage = true
wrapper = Wrapper()
})
// it('links to sign in for elopage', () => {
// expect(wrapper.vm.elopageUri).toBe('https://elopage.com/s/gradido/sign_in?locale=en')
// })
// })
// })
it('links to sign in for elopage', () => {
expect(wrapper.vm.elopageUri).toBe('https://elopage.com/s/gradido/sign_in?locale=en')
})
})
})
// describe('admin method', () => {
// const windowLocationMock = jest.fn()
// beforeEach(() => {
// delete window.location
// window.location = {
// assign: windowLocationMock,
// }
// wrapper.findComponent({ name: 'NavbarNew' }).vm.$emit('admin')
// })
describe.skip('admin method', () => {
const windowLocationMock = jest.fn()
beforeEach(() => {
delete window.location
window.location = {
assign: windowLocationMock,
}
wrapper.findComponent({ name: 'NavbarNew' }).vm.$emit('admin')
})
// it('dispatches logout to store', () => {
// expect(storeDispatchMock).toBeCalled()
// })
it('dispatches logout to store', () => {
expect(storeDispatchMock).toBeCalled()
})
// it('changes window location to admin interface', () => {
// expect(windowLocationMock).toBeCalledWith(
// 'http://localhost/admin/authenticate?token=valid-token',
// )
// })
// })
it('changes window location to admin interface', () => {
expect(windowLocationMock).toBeCalledWith(
'http://localhost/admin/authenticate?token=valid-token',
)
})
})
})
})
})

5
frontend/src/mixins/copyLinks.js
View File

@ -1,4 +1,3 @@
/* eslint-disable prettier/prettier */
export const copyLinks = {
props: {
link: { type: String, required: true },
@ -29,7 +28,9 @@ export const copyLinks = {
`${this.link}
${this.$store.state.firstName} ${this.$t('transaction-link.send_you')} ${this.amount} Gradido.
"${this.memo}"
${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {date: this.$d(new Date(this.validUntil), 'short')})}
${this.$t('gdd_per_link.credit-your-gradido')} ${this.$t('gdd_per_link.validUntilDate', {
date: this.$d(new Date(this.validUntil), 'short'),
})}
${this.$t('gdd_per_link.link-hint')}`,
)
.then(() => {

10
frontend/src/pages/Transactions.vue
View File

@ -85,9 +85,6 @@ export default {
}
},
watch: {
// currentPage() {
// this.updateGdt()
// },
gdt() {
if (this.gdt) {
this.updateGdt()
@ -101,17 +98,10 @@ export default {
padding-top: 14px;
margin-bottom: 14px;
}
.nav-tabs .nav-link {
background-color: rgba(204, 204, 204, 0.185);
}
.nav-tabs .nav-link.active {
background-color: rgb(248 249 254);
}
/* .tab-content {
padding-top: 25px;
border-left: 1px inset rgba(28, 110, 164, 0.1);
border-right: 1px inset rgba(28, 110, 164, 0.1);
} */
</style>

30
frontend/src/routes/router.test.js
View File

@ -86,16 +86,16 @@ describe('router', () => {
})
})
// describe('profile', () => {
// it('requires authorization', () => {
// expect(routes.find((r) => r.path === '/profile').meta.requiresAuth).toBeTruthy()
// })
describe.skip('profile', () => {
it('requires authorization', () => {
expect(routes.find((r) => r.path === '/profile').meta.requiresAuth).toBeTruthy()
})
// it('loads the "Profile" page', async () => {
// const component = await routes.find((r) => r.path === '/profile').component()
// expect(component.default.name).toBe('Profile')
// })
// })
it('loads the "Profile" page', async () => {
const component = await routes.find((r) => r.path === '/profile').component()
expect(component.default.name).toBe('Profile')
})
})
describe('transactions', () => {
it('requires authorization', () => {
@ -178,12 +178,12 @@ describe('router', () => {
})
})
// describe('select-community', () => {
// it('loads the "SelectCommunity" page', async () => {
// const component = await routes.find((r) => r.path === '/select-community').component()
// expect(component.default.name).toBe('SelectCommunity')
// })
// })
describe.skip('select-community', () => {
it('loads the "SelectCommunity" page', async () => {
const component = await routes.find((r) => r.path === '/select-community').component()
expect(component.default.name).toBe('SelectCommunity')
})
})
describe('reset password', () => {
it('loads the "ResetPassword" page', async () => {