Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1921-feature-contribution-link-crud-in-admin-resolver

.dbeaver/.credentials-config.json.bak

@@ -1,2 +0,0 @@
-'U<EFBFBD>[V<EFBFBD>$<EFBFBD><EFBFBD>8%<EFBFBD>k<EFBFBD>ِQN<EFBFBD><EFBFBD>,
-<EFBFBD>ؤـ`W<EFBFBD>-T3NvU<EFBFBD><EFBFBD>ظ{<EFBFBD>ية<EFBFBD><EFBFBD><EFBFBD>هه<EFBFBD><EFBFBD><EFBFBD>HK­~ح,<EFBFBD><EFBFBD>DXدpX<EFBFBD><EFBFBD>.g/¤<EFBFBD>،:<EFBFBD>ِ?B9|<EFBFBD><EFBFBD>GZn>¤بؤ/

.dbeaver/.data-sources.json.bak

@@ -1,33 +0,0 @@
-{
-	"folders": {},
-	"connections": {
-		"mariaDB-1813fbbc7bc-107c0b3aeaeb91ab": {
-			"provider": "mysql",
-			"driver": "mariaDB",
-			"name": "gradido",
-			"save-password": true,
-			"read-only": false,
-			"configuration": {
-				"host": "localhost",
-				"port": "3306",
-				"database": "gradido",
-				"url": "jdbc:mariadb://localhost:3306/gradido",
-				"home": "mysql_client",
-				"type": "dev",
-				"auth-model": "native",
-				"handlers": {}
-			}
-		}
-	},
-	"connection-types": {
-		"dev": {
-			"name": "Development",
-			"color": "255,255,255",
-			"description": "Regular development database",
-			"auto-commit": true,
-			"confirm-execute": false,
-			"confirm-data-change": false,
-			"auto-close-transactions": false
-		}
-	}
-}

backend/src/graphql/enum/ContributionCycleType.ts

@@ -1,28 +0,0 @@
-import { registerEnumType } from 'type-graphql'
-
-export enum ContributionCycleType {
-  ONCE = 'once',
-  HOUR = 'hour',
-  TWO_HOURS = 'two_hours',
-  FOUR_HOURS = 'four_hours',
-  EIGHT_HOURS = 'eight_hours',
-  HALF_DAY = 'half_day',
-  DAY = 'day',
-  TWO_DAYS = 'two_days',
-  THREE_DAYS = 'three_days',
-  FOUR_DAYS = 'four_days',
-  FIVE_DAYS = 'five_days',
-  SIX_DAYS = 'six_days',
-  WEEK = 'week',
-  TWO_WEEKS = 'two_weeks',
-  MONTH = 'month',
-  TWO_MONTH = 'two_month',
-  QUARTER = 'quarter',
-  HALF_YEAR = 'half_year',
-  YEAR = 'year',
-}
-
-registerEnumType(ContributionCycleType, {
-  name: 'ContributionCycleType', // this one is mandatory
-  description: 'Name of the Type of the ContributionCycle', // this one is optional
-})

database/entity/0037-add_contribution_links_table/ContributionLinks.ts

@@ -13,8 +13,8 @@ export class ContributionLinks extends BaseEntity {
   @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' })
   memo: string
 
-  @Column({ name: 'valid_from', type: 'datetime', nullable: true, default: null })
-  validFrom: Date | null
+  @Column({ name: 'valid_from', type: 'datetime', nullable: false })
+  validFrom: Date
 
   @Column({ name: 'valid_to', type: 'datetime', nullable: true, default: null })
   validTo: Date | null
@@ -43,7 +43,7 @@ export class ContributionLinks extends BaseEntity {
     default: null,
     transformer: DecimalTransformer,
   })
-  maxAmountPerMonth: Decimal
+  maxAmountPerMonth: Decimal | null
 
   @Column({
     name: 'total_max_count_of_contribution',
@@ -62,7 +62,7 @@ export class ContributionLinks extends BaseEntity {
     default: null,
     transformer: DecimalTransformer,
   })
-  maxAccountBalance: Decimal
+  maxAccountBalance: Decimal | null
 
   @Column({
     name: 'min_gap_hours',
@@ -79,7 +79,7 @@ export class ContributionLinks extends BaseEntity {
   deletedAt: Date | null
 
   @Column({ length: 24, nullable: true, collation: 'utf8mb4_unicode_ci' })
-  code: string
+  code: string | null
 
   @Column({ name: 'link_enabled', type: 'boolean', default: true })
   linkEnabled: boolean

frontend/src/components/Auth/AuthNavbar.vue

@@ -20,7 +20,7 @@
 
       <b-collapse id="nav-collapse" is-nav class="mt-5 mt-lg-0">
         <b-navbar-nav class="ml-auto" right>
-          <b-nav-item href="https://gradido.net/de/" target="_blank">
+          <b-nav-item :href="`https://gradido.net/${$i18n.locale}`" target="_blank">
             {{ $t('auth.navbar.aboutGradido') }}
           </b-nav-item>
           <b-nav-item to="/register" class="authNavbar ml-lg-5">{{ $t('signup') }}</b-nav-item>