Merge branch 'master' into fix-token-logout-redirect-to-wallet-login

admin/src/locales/de.json

@@ -2,7 +2,7 @@
   "bookmark": "bookmark",
   "confirmed": "bestätigt",
   "creation_form": {
-    "creation_for": "Schöpfung für ",
+    "creation_for": "Schöpfung für",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",

admin/src/locales/en.json

@@ -2,7 +2,7 @@
   "bookmark": "Remember",
   "confirmed": "confirmed",
   "creation_form": {
-    "creation_for": "Creation for ",
+    "creation_for": "Creation for",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",

admin/src/pages/Creation.spec.js

@@ -8,14 +8,14 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     searchUsers: [
       {
-        id: 1,
+        userId: 1,
         firstName: 'Bibi',
         lastName: 'Bloxberg',
         email: 'bibi@bloxberg.de',
         creation: [200, 400, 600],
       },
       {
-        id: 2,
+        userId: 2,
         firstName: 'Benjamin',
         lastName: 'Blümchen',
         email: 'benjamin@bluemchen.de',
@@ -71,7 +71,7 @@ describe('Creation', () => {
       it('sets the data of itemsList', () => {
         expect(wrapper.vm.itemsList).toEqual([
           {
-            id: 1,
+            userId: 1,
             firstName: 'Bibi',
             lastName: 'Bloxberg',
             email: 'bibi@bloxberg.de',
@@ -79,7 +79,7 @@ describe('Creation', () => {
             showDetails: false,
           },
           {
-            id: 2,
+            userId: 2,
             firstName: 'Benjamin',
             lastName: 'Blümchen',
             email: 'benjamin@bluemchen.de',
@@ -100,7 +100,7 @@ describe('Creation', () => {
           wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
             'update-item',
             {
-              id: 2,
+              userId: 2,
               firstName: 'Benjamin',
               lastName: 'Blümchen',
               email: 'benjamin@bluemchen.de',
@@ -114,7 +114,7 @@ describe('Creation', () => {
         it('removes the pushed item from itemsList', () => {
           expect(wrapper.vm.itemsList).toEqual([
             {
-              id: 1,
+              userId: 1,
               firstName: 'Bibi',
               lastName: 'Bloxberg',
               email: 'bibi@bloxberg.de',
@@ -127,7 +127,7 @@ describe('Creation', () => {
         it('adds the pushed item to itemsMassCreation', () => {
           expect(wrapper.vm.itemsMassCreation).toEqual([
             {
-              id: 2,
+              userId: 2,
               firstName: 'Benjamin',
               lastName: 'Blümchen',
               email: 'benjamin@bluemchen.de',
@@ -142,7 +142,7 @@ describe('Creation', () => {
             wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
               'update-item',
               {
-                id: 2,
+                userId: 2,
                 firstName: 'Benjamin',
                 lastName: 'Blümchen',
                 email: 'benjamin@bluemchen.de',
@@ -160,7 +160,7 @@ describe('Creation', () => {
           it('adds the item to itemsList', () => {
             expect(wrapper.vm.itemsList).toEqual([
               {
-                id: 1,
+                userId: 1,
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
                 email: 'bibi@bloxberg.de',
@@ -168,7 +168,7 @@ describe('Creation', () => {
                 showDetails: false,
               },
               {
-                id: 2,
+                userId: 2,
                 firstName: 'Benjamin',
                 lastName: 'Blümchen',
                 email: 'benjamin@bluemchen.de',
@@ -206,7 +206,7 @@ describe('Creation', () => {
         await wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
           'update-item',
           {
-            id: 2,
+            userId: 2,
             firstName: 'Benjamin',
             lastName: 'Blümchen',
             email: 'benjamin@bluemchen.de',

admin/src/pages/Creation.vue

@@ -133,16 +133,16 @@ export default {
 
       switch (event) {
         case 'push':
-          findArr = this.itemsList.find((arr) => arr.id === e.id)
+          findArr = this.itemsList.find((item) => e.userId === item.userId)
           index = this.itemsList.indexOf(findArr)
           this.itemsList.splice(index, 1)
-          this.itemsMassCreation.push(e)
+          this.itemsMassCreation.push(findArr)
           break
         case 'remove':
-          findArr = this.itemsMassCreation.find((arr) => arr.id === e.id)
+          findArr = this.itemsMassCreation.find((item) => e.userId === item.userId)
           index = this.itemsMassCreation.indexOf(findArr)
           this.itemsMassCreation.splice(index, 1)
-          this.itemsList.push(e)
+          this.itemsList.push(findArr)
           break
         default:
           throw new Error(event)

docu/onboarding_process.md

@@ -0,0 +1,25 @@
+# Onboarding process
+## Meeting with Bernd (zoom)
+## Meeting with Claus-Peter and perhaps concerning team member (zoom)
+## Presentation to all team members (discord)
+## Grant access to
+- Nextcloud server
+- Add to github repository (create github account if not available)
+## Start working  
+- install docker desktop
+- install git: https://git-scm.com/book/de/v2/Erste-Schritte-Git-installieren
+- add new ssh key: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account
+- download gradido repository: git clone git@github.com:gradido/gradido.git --recursive
+- install visual studio code
+- docker-compose build
+- docker-compose up
+http://localhost/vue should be same as https://gdd1.gradido.com/vue
+
+## git basics to update this document
+- git status
+- git branch onboarding_process
+- git checkout onboarding_process
+- git add onboarding_process.md
+- git commit
+- git push
+- git push --set-upstream origin onboarding_process