diff --git a/backend/src/models/Donations.js b/backend/src/models/Donations.js
index 1273a6f77..742bfb569 100644
--- a/backend/src/models/Donations.js
+++ b/backend/src/models/Donations.js
@@ -2,10 +2,15 @@ import { v4 as uuid } from 'uuid'
export default {
id: { type: 'string', primary: true, default: uuid },
- showDonations: { type: 'boolean' },
- goal: { type: 'number' },
- progress: { type: 'number' },
- createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+ showDonations: { type: 'boolean', required: true },
+ goal: { type: 'number', required: true },
+ progress: { type: 'number', required: true },
+ createdAt: {
+ type: 'string',
+ isoDate: true,
+ required: true,
+ default: () => new Date().toISOString(),
+ },
updatedAt: {
type: 'string',
isoDate: true,
diff --git a/backend/src/schema/types/type/Donations.gql b/backend/src/schema/types/type/Donations.gql
index 47dae9340..2186ee63a 100644
--- a/backend/src/schema/types/type/Donations.gql
+++ b/backend/src/schema/types/type/Donations.gql
@@ -1,10 +1,10 @@
type Donations {
id: ID!
- createdAt: String
- updatedAt: String
- showDonations: Boolean! # Wolle make it required in the schema
- goal: Int! # Wolle make it required in the schema
- progress: Int! # Wolle make it required in the schema
+ createdAt: String!
+ updatedAt: String!
+ showDonations: Boolean!
+ goal: Int!
+ progress: Int!
}
type Query {
diff --git a/webapp/components/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue
index 3a6e74648..dc4184e19 100644
--- a/webapp/components/DonationInfo/DonationInfo.vue
+++ b/webapp/components/DonationInfo/DonationInfo.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('donations.donate-now') }}
@@ -10,7 +10,6 @@
diff --git a/webapp/components/ProgressBar/ProgressBar.spec.js b/webapp/components/ProgressBar/ProgressBar.spec.js
index b4fbf69b2..5735dea98 100644
--- a/webapp/components/ProgressBar/ProgressBar.spec.js
+++ b/webapp/components/ProgressBar/ProgressBar.spec.js
@@ -29,17 +29,6 @@ describe('ProgessBar.vue', () => {
})
})
- describe('given a title', () => {
- beforeEach(() => {
- propsData.title = 'This is progress'
- })
-
- // Wolle
- it.skip('renders the title', () => {
- expect(Wrapper().find('.progress-bar__title').text()).toBe('This is progress')
- })
- })
-
describe('given a label', () => {
beforeEach(() => {
propsData.label = 'Going well'
diff --git a/webapp/components/ProgressBar/ProgressBar.vue b/webapp/components/ProgressBar/ProgressBar.vue
index 0b4307b42..dd904e5b1 100644
--- a/webapp/components/ProgressBar/ProgressBar.vue
+++ b/webapp/components/ProgressBar/ProgressBar.vue
@@ -1,10 +1,5 @@
-
-
-
-
-
@@ -12,15 +7,9 @@
{{ label }}
-
-
-
-
-
-
@@ -35,9 +24,6 @@ export default {
type: Number,
required: true,
},
- title: {
- type: String,
- },
label: {
type: String,
},
@@ -54,68 +40,22 @@ export default {
.progress-bar-component {
height: 100%;
position: relative;
- // width: 150px;
- // width: 100%;
- // flex: 0 0 100%;
- // align-self: stretch;
flex: 1;
display: flex;
top: $space-xx-small;
- // margin-right: $space-x-small;
-
- // @media (max-width: 680px) {
- // width: 180px;
- // }
-
- // @media (max-width: 546px) {
- // flex-basis: 50%;
- // flex-grow: 1;
- // }
}
.progress-bar {
position: relative;
height: 100%;
- // width: 150px;
- // width: 100%;
- // flex: 0 0 100%;
- // align-self: stretch;
flex: 1;
margin-right: $space-x-small;
-
- // @media (max-width: 680px) {
- // width: 180px;
- // }
-
- // @media (max-width: 546px) {
- // flex-basis: 50%;
- // flex-grow: 1;
- // }
-}
-
-.progress-bar__title {
- // Wolle
- // position: absolute;
- // top: -2px;
- margin-left: $space-xxx-small;
- // margin: 0;
-
- @media (max-width: 546px) {
- top: $space-xx-small;
- }
-
- @media (max-width: 350px) {
- font-size: $font-size-small;
- }
}
.progress-bar__goal {
position: relative;
height: 26px; // styleguide-button-size
- // Wolle width: 100%;
border: 1px solid $color-primary;
- // Wolle background-color: $color-neutral-100;
- // background-color: $color-neutral-70;
background: repeating-linear-gradient(120deg, $color-neutral-80, $color-neutral-70);
border-radius: $border-radius-base;
}
@@ -126,11 +66,6 @@ export default {
left: 0px;
height: 26px; // styleguide-button-size
max-width: 100%;
- // Wolle background-color: $color-yellow;
- // background: repeating-linear-gradient(60deg, $color-primary-light, $color-primary-light 35px, $color-primary 35px, $color-primary 70px);
- // background: repeating-linear-gradient(60deg, $color-primary-light, $color-primary-light 35px, $color-primary 35px, $color-primary 50px);
- // background: repeating-linear-gradient(60deg, $color-primary-light, $color-primary-light 25px, $color-primary 35px, $color-primary 50px, $color-primary-light, $color-primary, $color-primary);
- // background: repeating-linear-gradient(120deg, $color-primary 0px, $color-primary 35px, $color-primary-light 45px, $color-primary-light 80px, $color-primary 90px);
background: repeating-linear-gradient(
120deg,
$color-primary 0px,
@@ -151,22 +86,15 @@ export default {
display: inline-flex;
align-items: center;
justify-content: center;
- // Wolle border: 1px solid $color-primary;
border-radius: $border-radius-base;
}
.progress-bar__label {
- // Wolle
position: relative;
- // top: 8px;
- // right: 8px;
- // text-align: right;
float: right;
- // margin-left: $space-xxx-small;
@media (max-width: 350px) {
font-size: $font-size-small;
- // top: 10px;
}
}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 31e361721..3ba84dea2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -299,8 +299,7 @@
},
"donations": {
"amount-of-total": "{amount} von {total} € erreicht",
- "donate-now": "Jetzt spenden",
- "donations-for": "Spenden für"
+ "donate-now": "Jetzt spenden"
},
"editor": {
"embed": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f75556e80..adf44e5c2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -299,8 +299,7 @@
},
"donations": {
"amount-of-total": "{amount} of {total} € collected",
- "donate-now": "Donate now",
- "donations-for": "Donations for"
+ "donate-now": "Donate now"
},
"editor": {
"embed": {
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 651d35365..d4338b343 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -245,8 +245,7 @@
},
"donations": {
"amount-of-total": "{amount} de {total} € recaudados",
- "donate-now": "Donar ahora",
- "donations-for": "Donaciones para"
+ "donate-now": "Donar ahora"
},
"editor": {
"embed": {
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 803dce549..424fa405e 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -245,8 +245,7 @@
},
"donations": {
"amount-of-total": "{amount} de {total} € collectés",
- "donate-now": "Faites un don",
- "donations-for": "Dons pour"
+ "donate-now": "Faites un don"
},
"editor": {
"embed": {
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index b20ff248b..cacf15684 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -253,9 +253,7 @@
},
"donations": {
"amount-of-total": "{amount} of {total} € collezionato",
- "donate-now": "Dona ora",
- "donations-for": "Donazioni per"
- },
+ "donate-now": "Dona ora" },
"editor": {
"embed": {
"always_allow": null,
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 2b9d2cd80..790f62230 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -291,8 +291,7 @@
},
"donations": {
"amount-of-total": "{amount} dos {total} € foram coletados",
- "donate-now": "Doe agora",
- "donations-for": "Doações para"
+ "donate-now": "Doe agora"
},
"editor": {
"embed": {
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index be33ad938..d1f354370 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -245,8 +245,7 @@
},
"donations": {
"amount-of-total": "{amount} из {total} € собрано",
- "donate-now": "Пожертвуйте сейчас",
- "donations-for": "Пожертвования для"
+ "donate-now": "Пожертвуйте сейчас"
},
"editor": {
"embed": {
diff --git a/webapp/pages/admin/donations.vue b/webapp/pages/admin/donations.vue
index 0646194dd..5ba35749d 100644
--- a/webapp/pages/admin/donations.vue
+++ b/webapp/pages/admin/donations.vue
@@ -30,7 +30,6 @@
:disabled="!showDonations"
/>
-
{{ $t('actions.save') }}
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index b3e244c79..5e5efd5c5 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -5,6 +5,7 @@
+