Merge branch 'master' into 2332-mark-contribution-as-rejected

deployment/bare_metal/setup.md

@@ -231,3 +231,32 @@ This opens the `crontab` in edit-mode and insert the following entry:
 ```bash
 0 4 * * * find /tmp -name "yarn--*" -ctime +1 -exec rm -r {} \; > /dev/null
 ```
+
+## Define Cronjob To start backup script automatically
+
+At least at production stage we need a daily backup of our database. This can be done by adding a cronjob
+to start the existing backup.sh script.
+
+### On production / stage3 / stage2
+
+To check for existing cronjobs for the `gradido` user, please
+
+Run:
+
+```bash
+crontab -l
+```
+
+This show all existing entries of the crontab for user `gradido`
+
+To install/add the cronjob for a daily backup at 3:00am please 
+
+Run:
+
+```bash
+crontab -e
+```
+and insert the following line
+```bash
+0 3 * * * ~/gradido/deployment/bare_metal/backup.sh
+```

frontend/src/components/Contributions/OpenCreationsAmount.spec.js

@@ -0,0 +1,103 @@
+import { mount } from '@vue/test-utils'
+import OpenCreationsAmount from './OpenCreationsAmount.vue'
+
+const localVue = global.localVue
+
+describe('OpenCreationsAmount', () => {
+  let wrapper
+
+  const mocks = {
+    $t: jest.fn((t) => t),
+    $d: jest.fn((date, formatter = null) => {
+      return { date, formatter }
+    }),
+  }
+
+  const thisMonth = new Date()
+  const lastMonth = new Date(thisMonth.getFullYear(), thisMonth.getMonth() - 1)
+
+  const propsData = {
+    minimalDate: lastMonth,
+    maxGddLastMonth: 400,
+    maxGddThisMonth: 600,
+  }
+
+  const Wrapper = () => {
+    return mount(OpenCreationsAmount, {
+      localVue,
+      mocks,
+      propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.appBoxShadow').exists()).toBe(true)
+    })
+
+    it('renders two dates', () => {
+      expect(mocks.$d).toBeCalledTimes(2)
+    })
+
+    it('renders the date of last month', () => {
+      expect(mocks.$d).toBeCalledWith(lastMonth, 'monthAndYear')
+    })
+
+    it('renders the date of this month', () => {
+      expect(mocks.$d).toBeCalledWith(expect.any(Date), 'monthAndYear')
+    })
+
+    describe('open creations for both months', () => {
+      it('renders submitted contributions text', () => {
+        expect(mocks.$t).toBeCalledWith('contribution.submit')
+      })
+
+      it('does not render max reached text', () => {
+        expect(mocks.$t).not.toBeCalledWith('maxReached')
+      })
+
+      it('renders submitted hours last month', () => {
+        expect(wrapper.findAll('div.row').at(1).findAll('div.col').at(2).text()).toBe('30 h')
+      })
+
+      it('renders available hours last month', () => {
+        expect(wrapper.findAll('div.row').at(1).findAll('div.col').at(3).text()).toBe('20 h')
+      })
+
+      it('renders submitted hours this month', () => {
+        expect(wrapper.findAll('div.row').at(2).findAll('div.col').at(2).text()).toBe('20 h')
+      })
+
+      it('renders available hours this month', () => {
+        expect(wrapper.findAll('div.row').at(2).findAll('div.col').at(3).text()).toBe('30 h')
+      })
+    })
+
+    describe('no creations available for last month', () => {
+      beforeEach(() => {
+        wrapper.setProps({ maxGddLastMonth: 0 })
+      })
+
+      it('renders submitted contributions text', () => {
+        expect(mocks.$t).toBeCalledWith('contribution.submit')
+      })
+
+      it('renders max reached text', () => {
+        expect(mocks.$t).toBeCalledWith('maxReached')
+      })
+
+      it('renders submitted hours last month', () => {
+        expect(wrapper.findAll('div.row').at(1).findAll('div.col').at(2).text()).toBe('50 h')
+      })
+
+      it('renders available hours last month', () => {
+        expect(wrapper.findAll('div.row').at(1).findAll('div.col').at(3).text()).toBe('0 h')
+      })
+    })
+  })
+})

frontend/src/components/Contributions/OpenCreationsAmount.vue

@@ -14,9 +14,9 @@
           {{ maxGddLastMonth > 0 ? $t('contribution.submit') : $t('maxReached') }}
         </b-col>
         <b-col class="d-none d-md-inline text-197 text-center">
-          {{ (1000 - maxGddLastMonth) / 20 }} {{ $t('h') }}
+          {{ hoursSubmittedLastMonth }} {{ $t('h') }}
         </b-col>
-        <b-col class="text-4 text-center">{{ maxGddLastMonth / 20 }} {{ $t('h') }}</b-col>
+        <b-col class="text-4 text-center">{{ hoursAvailableLastMonth }} {{ $t('h') }}</b-col>
       </b-row>
 
       <b-row class="font-weight-bold">
@@ -25,9 +25,9 @@
           {{ maxGddThisMonth > 0 ? $t('contribution.submit') : $t('maxReached') }}
         </b-col>
         <b-col class="d-none d-md-inline text-197 text-center">
-          {{ (1000 - maxGddThisMonth) / 20 }} {{ $t('h') }}
+          {{ hoursSubmittedThisMonth }} {{ $t('h') }}
         </b-col>
-        <b-col class="text-4 text-center">{{ maxGddThisMonth / 20 }} {{ $t('h') }}</b-col>
+        <b-col class="text-4 text-center">{{ hoursAvailableThisMonth }} {{ $t('h') }}</b-col>
       </b-row>
     </div>
   </div>
@@ -40,5 +40,19 @@ export default {
     maxGddLastMonth: { type: Number, required: true },
     maxGddThisMonth: { type: Number, required: true },
   },
+  computed: {
+    hoursSubmittedThisMonth() {
+      return (1000 - this.maxGddThisMonth) / 20
+    },
+    hoursSubmittedLastMonth() {
+      return (1000 - this.maxGddLastMonth) / 20
+    },
+    hoursAvailableThisMonth() {
+      return this.maxGddThisMonth / 20
+    },
+    hoursAvailableLastMonth() {
+      return this.maxGddLastMonth / 20
+    },
+  },
 }
 </script>

frontend/src/components/GddSend/TransactionForm.vue

@@ -1,112 +1,115 @@
 <template>
-  <b-row class="transaction-form">
-    <b-col cols="12">
-      <b-card class="appBoxShadow gradido-border-radius" body-class="p-3">
-        <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
-          <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
-            <b-form-radio-group v-model="radioSelected" class="container">
-              <b-row class="mb-4">
-                <b-col cols="12" lg="6">
-                  <b-row class="bg-248 gradido-border-radius pt-lg-2 mr-lg-2">
-                    <b-col cols="10" @click="radioSelected = sendTypes.send" class="pointer">
-                      {{ $t('send_gdd') }}
-                    </b-col>
-                    <b-col cols="2">
-                      <b-form-radio
-                        name="shipping"
-                        size="lg"
-                        :value="sendTypes.send"
-                        stacked
-                        class="custom-radio-button pointer"
-                      ></b-form-radio>
-                    </b-col>
-                  </b-row>
-                </b-col>
+  <div class="transaction-form">
+    <b-row>
+      <b-col cols="12">
+        <b-card class="appBoxShadow gradido-border-radius" body-class="p-3">
+          <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
+            <b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset">
+              <b-form-radio-group v-model="radioSelected" class="container">
+                <b-row class="mb-4">
+                  <b-col cols="12" lg="6">
+                    <b-row class="bg-248 gradido-border-radius pt-lg-2 mr-lg-2">
+                      <b-col cols="10" @click="radioSelected = sendTypes.send" class="pointer">
+                        {{ $t('send_gdd') }}
+                      </b-col>
+                      <b-col cols="2">
+                        <b-form-radio
+                          name="shipping"
+                          size="lg"
+                          :value="sendTypes.send"
+                          stacked
+                          class="custom-radio-button pointer"
+                        ></b-form-radio>
+                      </b-col>
+                    </b-row>
+                  </b-col>
+                  <b-col>
+                    <b-row class="bg-248 gradido-border-radius pt-lg-2 ml-lg-2 mt-2 mt-lg-0">
+                      <b-col cols="10" @click="radioSelected = sendTypes.link" class="pointer">
+                        {{ $t('send_per_link') }}
+                      </b-col>
+                      <b-col cols="2" class="pointer">
+                        <b-form-radio
+                          name="shipping"
+                          :value="sendTypes.link"
+                          size="lg"
+                          class="custom-radio-button"
+                        ></b-form-radio>
+                      </b-col>
+                    </b-row>
+                  </b-col>
+                </b-row>
+
+                <div class="mt-4 mb-4" v-if="radioSelected === sendTypes.link">
+                  <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
+                  <div>
+                    {{ $t('gdd_per_link.choose-amount') }}
+                  </div>
+                </div>
+              </b-form-radio-group>
+              <b-row>
                 <b-col>
-                  <b-row class="bg-248 gradido-border-radius pt-lg-2 ml-lg-2 mt-2 mt-lg-0">
-                    <b-col cols="10" @click="radioSelected = sendTypes.link" class="pointer">
-                      {{ $t('send_per_link') }}
+                  <b-row>
+                    <b-col cols="12">
+                      <div v-if="radioSelected === sendTypes.send">
+                        <input-email
+                          :name="$t('form.recipient')"
+                          :label="$t('form.recipient')"
+                          :placeholder="$t('form.email')"
+                          v-model="form.email"
+                          :disabled="isBalanceDisabled"
+                          @onValidation="onValidation"
+                        />
+                      </div>
                     </b-col>
-                    <b-col cols="2" class="pointer">
-                      <b-form-radio
-                        name="shipping"
-                        :value="sendTypes.link"
-                        size="lg"
-                        class="custom-radio-button"
-                      ></b-form-radio>
+                    <b-col cols="12" lg="6">
+                      <input-amount
+                        v-model="form.amount"
+                        :name="$t('form.amount')"
+                        :label="$t('form.amount')"
+                        :placeholder="'0.01'"
+                        :rules="{ required: true, gddSendAmount: [0.01, balance] }"
+                        typ="TransactionForm"
+                        :disabled="isBalanceDisabled"
+                      ></input-amount>
                     </b-col>
                   </b-row>
                 </b-col>
               </b-row>
 
-              <div class="mt-4 mb-4" v-if="radioSelected === sendTypes.link">
-                <h2 class="alert-heading">{{ $t('gdd_per_link.header') }}</h2>
-                <div>
-                  {{ $t('gdd_per_link.choose-amount') }}
-                </div>
+              <b-row>
+                <b-col>
+                  <input-textarea
+                    v-model="form.memo"
+                    :name="$t('form.message')"
+                    :label="$t('form.message')"
+                    :placeholder="$t('form.message')"
+                    :rules="{ required: true, min: 5, max: 255 }"
+                    :disabled="isBalanceDisabled"
+                  />
+                </b-col>
+              </b-row>
+              <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
+                {{ $t('form.no_gdd_available') }}
               </div>
-            </b-form-radio-group>
-            <b-row>
-              <b-col>
-                <b-row>
-                  <b-col cols="12">
-                    <div v-if="radioSelected === sendTypes.send">
-                      <input-email
-                        :name="$t('form.recipient')"
-                        :label="$t('form.recipient')"
-                        :placeholder="$t('form.email')"
-                        v-model="form.email"
-                        :disabled="isBalanceDisabled"
-                      />
-                    </div>
-                  </b-col>
-                  <b-col cols="12" lg="6">
-                    <input-amount
-                      v-model="form.amount"
-                      :name="$t('form.amount')"
-                      :label="$t('form.amount')"
-                      :placeholder="'0.01'"
-                      :rules="{ required: true, gddSendAmount: [0.01, balance] }"
-                      typ="TransactionForm"
-                      :disabled="isBalanceDisabled"
-                    ></input-amount>
-                  </b-col>
-                </b-row>
-              </b-col>
-            </b-row>
-
-            <b-row>
-              <b-col>
-                <input-textarea
-                  v-model="form.memo"
-                  :name="$t('form.message')"
-                  :label="$t('form.message')"
-                  :placeholder="$t('form.message')"
-                  :rules="{ required: true, min: 5, max: 255 }"
-                  :disabled="isBalanceDisabled"
-                />
-              </b-col>
-            </b-row>
-            <div v-if="!!isBalanceDisabled" class="text-danger mt-5">
-              {{ $t('form.no_gdd_available') }}
-            </div>
-            <b-row v-else class="test-buttons mt-5">
-              <b-col>
-                <b-button type="reset" variant="secondary" @click="onReset">
-                  {{ $t('form.reset') }}
-                </b-button>
-              </b-col>
-              <b-col class="text-right">
-                <b-button type="submit" variant="gradido">
-                  {{ $t('form.check_now') }}
-                </b-button>
-              </b-col>
-            </b-row>
-          </b-form>
-        </validation-observer>
-      </b-card>
-    </b-col>
-  </b-row>
+              <b-row v-else class="test-buttons mt-5">
+                <b-col>
+                  <b-button type="reset" variant="secondary" @click="onReset">
+                    {{ $t('form.reset') }}
+                  </b-button>
+                </b-col>
+                <b-col class="text-right">
+                  <b-button type="submit" variant="gradido">
+                    {{ $t('form.check_now') }}
+                  </b-button>
+                </b-col>
+              </b-row>
+            </b-form>
+          </validation-observer>
+        </b-card>
+      </b-col>
+    </b-row>
+  </div>
 </template>
 <script>
 import { SEND_TYPES } from '@/pages/Send.vue'
@@ -140,6 +143,9 @@ export default {
     }
   },
   methods: {
+    onValidation() {
+      this.$refs.formValidator.validate()
+    },
     onSubmit() {
       this.$emit('set-transaction', {
         selected: this.radioSelected,
@@ -153,6 +159,7 @@ export default {
       this.form.email = ''
       this.form.amount = ''
       this.form.memo = ''
+      this.$refs.formValidator.validate()
     },
     setNewRecipientEmail() {
       this.form.email = this.recipientEmail ? this.recipientEmail : this.form.email
@@ -177,6 +184,9 @@ export default {
   created() {
     this.setNewRecipientEmail()
   },
+  mounted() {
+    if (this.form.email !== '') this.$refs.formValidator.validate()
+  },
 }
 </script>
 <style>

frontend/src/components/GddSend/TransactionResultSendError.vue

@@ -19,7 +19,7 @@
       <div v-else>{{ errorResult }}</div>
     </div>
     <p class="text-center mt-5">
-      <b-button variant="secondary" @click="$emit('on-reset')">
+      <b-button variant="secondary" @click="$emit('on-back')">
         {{ $t('form.close') }}
       </b-button>
     </p>

frontend/src/components/Inputs/InputAmount.vue

@@ -22,6 +22,7 @@
           @focus="amountFocused = true"
           @blur="normalizeAmount(true)"
           :disabled="disabled"
+          autocomplete="off"
         ></b-form-input>
 
         <b-form-invalid-feedback v-bind="ariaMsg">
@@ -63,7 +64,7 @@ export default {
   },
   data() {
     return {
-      currentValue: '',
+      currentValue: this.value,
       amountValue: 0.0,
       amountFocused: false,
     }

frontend/src/components/Inputs/InputEmail.vue

@@ -21,6 +21,7 @@
         @focus="emailFocused = true"
         @blur="normalizeEmail()"
         :disabled="disabled"
+        autocomplete="off"
       ></b-form-input>
       <b-form-invalid-feedback v-bind="ariaMsg">
         {{ errors[0] }}
@@ -62,7 +63,10 @@ export default {
       this.$emit('input', this.currentValue)
     },
     value() {
-      if (this.value !== this.currentValue) this.currentValue = this.value
+      if (this.value !== this.currentValue) {
+        this.currentValue = this.value
+      }
+      this.$emit('onValidation')
     },
   },
   methods: {

frontend/src/components/Inputs/InputTextarea.spec.js

@@ -58,7 +58,7 @@ describe('InputTextarea', () => {
       })
 
       it('has the value ""', () => {
-        expect(wrapper.vm.currentValue).toEqual('')
+        expect(wrapper.vm.currentValue).toEqual('Long enough')
       })
 
       it('has the label "input-field-label"', () => {
@@ -72,9 +72,8 @@ describe('InputTextarea', () => {
 
     describe('input value changes', () => {
       it('emits input with new value', async () => {
-        await wrapper.find('textarea').setValue('Long enough')
-        expect(wrapper.emitted('input')).toBeTruthy()
-        expect(wrapper.emitted('input')).toEqual([['Long enough']])
+        await wrapper.find('textarea').setValue('New Text')
+        expect(wrapper.emitted('input')).toEqual([['New Text']])
       })
     })
 

frontend/src/components/Inputs/InputTextarea.vue

@@ -41,7 +41,7 @@ export default {
   },
   data() {
     return {
-      currentValue: '',
+      currentValue: this.value,
     }
   },
   computed: {

frontend/src/components/Menu/Sidebar.vue

@@ -19,7 +19,7 @@
             <b-icon icon="layers" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('gdt.gdt') }}</span>
           </b-nav-item>
-          <b-nav-item to="/community#my" class="" active-class="activeRoute">
+          <b-nav-item to="/community" class="" active-class="activeRoute">
             <b-icon icon="people" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('creation') }}</span>
           </b-nav-item>

frontend/src/components/Template/ContentHeader/NavCommunity.vue

@@ -1,20 +1,20 @@
 <template>
-  <div class="nav-community">
+  <div class="nav-community container">
     <b-row class="nav-row">
-      <b-col cols="12" lg="4" md="4">
-        <b-btn active-class="btn-active" block variant="link" to="#edit">
+      <b-col cols="12" lg="4" md="4" class="px-0">
+        <b-btn active-class="btn-active" block variant="link" to="/community#edit">
           <b-icon icon="pencil" class="mr-2" />
           {{ $t('community.submitContribution') }}
         </b-btn>
       </b-col>
-      <b-col cols="12" lg="4" md="4">
-        <b-btn active-class="btn-active" block variant="link" to="#my">
+      <b-col cols="12" lg="4" md="4" class="px-0">
+        <b-btn active-class="btn-active" block variant="link" to="/community#my">
           <b-icon icon="person" class="mr-2" />
           {{ $t('community.myContributions') }}
         </b-btn>
       </b-col>
-      <b-col cols="12" lg="4" md="4">
-        <b-btn active-class="btn-active" block variant="link" to="#all">
+      <b-col cols="12" lg="4" md="4" class="px-0">
+        <b-btn active-class="btn-active" block variant="link" to="/community#all">
           <b-icon icon="people" class="mr-2" />
           {{ $t('community.community') }}
         </b-btn>

frontend/src/pages/Community.spec.js

@@ -4,33 +4,13 @@ import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
 import { listContributions, listAllContributions } from '@/graphql/queries'
 
-import VueRouter from 'vue-router'
-import routes from '../routes/routes'
-
 const localVue = global.localVue
-localVue.use(VueRouter)
 
 const mockStoreDispach = jest.fn()
 const apolloQueryMock = jest.fn()
 const apolloMutationMock = jest.fn()
 const apolloRefetchMock = jest.fn()
 
-const router = new VueRouter({
-  base: '/',
-  routes,
-  linkActiveClass: 'active',
-  mode: 'history',
-  // scrollBehavior: (to, from, savedPosition) => {
-  //   if (savedPosition) {
-  //     return savedPosition
-  //   }
-  //   if (to.hash) {
-  //     return { selector: to.hash }
-  //   }
-  //   return { x: 0, y: 0 }
-  // },
-})
-
 describe('Community', () => {
   let wrapper
 
@@ -55,12 +35,17 @@ describe('Community', () => {
     $i18n: {
       locale: 'en',
     },
+    $router: {
+      push: jest.fn(),
+    },
+    $route: {
+      hash: 'my',
+    },
   }
 
   const Wrapper = () => {
     return mount(Community, {
       localVue,
-      router,
       mocks,
     })
   }

frontend/src/pages/Community.vue

@@ -280,7 +280,7 @@ export default {
           if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
             this.tabIndex = 1
             if (this.$route.hash !== '#my') {
-              this.$router.push({ path: '#my' })
+              this.$router.push({ path: '/community#my' })
             }
             this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!')
           }
@@ -318,6 +318,7 @@ export default {
     })
     this.updateTransactions(0)
     this.tabIndex = 1
+    this.$router.push({ path: '/community#my' })
   },
 }
 </script>