Merge branch 'master' into 2000-contribution-delete

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()
 

backend/src/graphql/resolver/ContributionResolver.ts

@@ -5,7 +5,7 @@ import { Contribution } from '@entity/Contribution'
 import { Arg, Args, Authorized, Ctx, Int, 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

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

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,

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 {

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>