From 1d862153751851b104f4b6be13fae3077662dab4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 1 Jul 2022 11:11:17 +0200
Subject: [PATCH 1/3] change link color

---
 frontend/src/components/Auth/AuthNavbar.vue | 4 ++--
 frontend/src/components/LanguageSwitch2.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue
index e1f47e5a7..1192d6db3 100644
--- a/frontend/src/components/Auth/AuthNavbar.vue
+++ b/frontend/src/components/Auth/AuthNavbar.vue
@@ -46,7 +46,7 @@ export default {
 
 <style lang="scss">
 .authNavbar > .nav-link {
-  color: #383838 !important;
+  color: #0e79bc !important;
 }
 
 .navbar-toggler {
@@ -54,7 +54,7 @@ export default {
 }
 
 .authNavbar > .router-link-exact-active {
-  color: #0e79bc !important;
+  color: #383838 !important;
 }
 
 button.navbar-toggler > span.navbar-toggler-icon {
diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
index b78154e0a..e88050047 100644
--- a/frontend/src/components/LanguageSwitch2.vue
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -5,7 +5,7 @@
       @click.prevent="saveLocale(lang.code)"
       :key="lang.code"
       class="pointer pr-2"
-      :class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
+      :class="$store.state.language === lang.code ? 'c-grey' : 'c-blau'"
     >
       <span class="locales">{{ lang.name }}</span>
       <span class="ml-3">{{ locales.length - 1 > index ? $t('math.pipe') : '' }}</span>

From 061a9232a15abbeeabf1d321699ef7e1f830b04b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 1 Jul 2022 11:22:37 +0200
Subject: [PATCH 2/3] change welcome in community text

---
 frontend/src/layouts/AuthLayout.vue | 4 ++--
 frontend/src/locales/de.json        | 3 +--
 frontend/src/locales/en.json        | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index 9c33ad195..46f58a4a2 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -30,8 +30,8 @@
             </b-row>
             <b-row class="mt-0 mt-md-5 pl-2 pl-md-0 pl-lg-0">
               <b-col lg="9" md="9" sm="12">
-                <div class="h1 mb--2">{{ $t('welcome') }}</div>
-                <div class="h1 mb-0">{{ $t('WelcomeBy', { name: communityName }) }}</div>
+                <div class="mb--2">{{ $t('welcome') }}</div>
+                <div class="h1 mb-0">{{ communityName }}</div>
                 <div class="mb-0">{{ $t('1000thanks') }}</div>
               </b-col>
               <b-col cols="3" class="text-right d-none d-sm-none d-md-inline">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6be44f30d..99122a218 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -284,6 +284,5 @@
     "send_you": "sendet dir"
   },
   "via_link": "über einen Link",
-  "welcome": "Willkommen",
-  "WelcomeBy": "bei {name}"
+  "welcome": "Willkommen in der Gemeinschaft"
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5a89bb7bb..63e285a75 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -284,6 +284,5 @@
     "send_you": "wants to send you"
   },
   "via_link": "via Link",
-  "welcome": "Welcome",
-  "WelcomeBy": "by {name}"
+  "welcome": "Welcome to the community"
 }

From 103928518c2dceb0ddd2f643a6c4270a83365d98 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 5 Jul 2022 11:35:50 +0200
Subject: [PATCH 3/3] Change utils file isContributionValid to contributions
 and changed method isContributionValid to validateContribution.

---
 backend/src/graphql/resolver/AdminResolver.ts          | 10 +++++-----
 backend/src/graphql/resolver/ContributionResolver.ts   |  4 ++--
 .../src/graphql/resolver/TransactionLinkResolver.ts    |  4 ++--
 .../util/{isContributionValid.ts => creations.ts}      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename backend/src/graphql/resolver/util/{isContributionValid.ts => creations.ts} (99%)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 5476fd8a1..75175edc2 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -50,9 +50,9 @@ import {
   getCreationIndex,
   getUserCreation,
   getUserCreations,
-  isContributionValid,
+  validateContribution,
   isStartEndDateValid,
-} from './util/isContributionValid'
+} from './util/creations'
 import {
   CONTRIBUTIONLINK_MEMO_MAX_CHARS,
   CONTRIBUTIONLINK_MEMO_MIN_CHARS,
@@ -252,7 +252,7 @@ export class AdminResolver {
     const creations = await getUserCreation(user.id)
     logger.trace('creations', creations)
     const creationDateObj = new Date(creationDate)
-    isContributionValid(creations, amount, creationDateObj)
+    validateContribution(creations, amount, creationDateObj)
     const contribution = Contribution.create()
     contribution.userId = user.id
     contribution.amount = amount
@@ -328,7 +328,7 @@ export class AdminResolver {
     }
 
     // all possible cases not to be true are thrown in this function
-    isContributionValid(creations, amount, creationDateObj)
+    validateContribution(creations, amount, creationDateObj)
     contributionToUpdate.amount = amount
     contributionToUpdate.memo = memo
     contributionToUpdate.contributionDate = new Date(creationDate)
@@ -405,7 +405,7 @@ export class AdminResolver {
     if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a contribution.')
 
     const creations = await getUserCreation(contribution.userId, false)
-    isContributionValid(creations, contribution.amount, contribution.contributionDate)
+    validateContribution(creations, contribution.amount, contribution.contributionDate)
 
     const receivedCallDate = new Date()
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 924108f87..98492b510 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -5,7 +5,7 @@ import { Contribution } from '@entity/Contribution'
 import { Args, Authorized, Ctx, Mutation, Resolver } from 'type-graphql'
 import ContributionArgs from '../arg/ContributionArgs'
 import { UnconfirmedContribution } from '../model/UnconfirmedContribution'
-import { isContributionValid, getUserCreation } from './util/isContributionValid'
+import { validateContribution, getUserCreation } from './util/creations'
 
 @Resolver()
 export class ContributionResolver {
@@ -19,7 +19,7 @@ export class ContributionResolver {
     const creations = await getUserCreation(user.id)
     logger.trace('creations', creations)
     const creationDateObj = new Date(creationDate)
-    isContributionValid(creations, amount, creationDateObj)
+    validateContribution(creations, amount, creationDateObj)
 
     const contribution = Contribution.create()
     contribution.userId = user.id
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts
index 8d1555f58..8696065ed 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@@ -28,7 +28,7 @@ import { executeTransaction } from './TransactionResolver'
 import { Order } from '@enum/Order'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { getUserCreation, isContributionValid } from './util/isContributionValid'
+import { getUserCreation, validateContribution } from './util/creations'
 import { Decay } from '@model/Decay'
 import Decimal from 'decimal.js-light'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
@@ -223,7 +223,7 @@ export class TransactionLinkResolver {
 
         const creations = await getUserCreation(user.id, false)
         logger.info('open creations', creations)
-        isContributionValid(creations, contributionLink.amount, now)
+        validateContribution(creations, contributionLink.amount, now)
         const contribution = new DbContribution()
         contribution.userId = user.id
         contribution.createdAt = now
diff --git a/backend/src/graphql/resolver/util/isContributionValid.ts b/backend/src/graphql/resolver/util/creations.ts
similarity index 99%
rename from backend/src/graphql/resolver/util/isContributionValid.ts
rename to backend/src/graphql/resolver/util/creations.ts
index 0a9b57170..dcdce2bfa 100644
--- a/backend/src/graphql/resolver/util/isContributionValid.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -9,7 +9,7 @@ interface CreationMap {
   creations: Decimal[]
 }
 
-export const isContributionValid = (
+export const validateContribution = (
   creations: Decimal[],
   amount: Decimal,
   creationDate: Date,