resolve conflict

frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="contribution-messages-formular">
+    <div v-if="form.text !== ''" class="mt-5">
+      <h4>{{ $t('preview') }}</h4>
+      <div class="border border-info m-5">
+        <b-row>
+          <b-col cols="1"><b-avatar square text="AA"></b-avatar></b-col>
+          <b-col cols="11">
+            <pre class="mt-2">
+            {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+            </pre>
+          </b-col>
+        </b-row>
+        <b-row>
+          <b-col>
+            <pre class="ml-3 mt-3 mb-5">{{ form.text }}</pre>
+          </b-col>
+        </b-row>
+      </div>
+    </div>
+    <div>
+      <b-form @submit="onSubmit" @reset="onReset">
+        <b-form-textarea
+          id="textarea"
+          v-model="form.text"
+          placeholder="Enter something..."
+          rows="3"
+          max-rows="6"
+        ></b-form-textarea>
+        <b-button type="submit" variant="primary">{{ $t('form.submit') }}</b-button>
+        <b-button type="reset" variant="danger">{{ $t('form.reset') }}</b-button>
+      </b-form>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesFormular',
+  data() {
+    return {
+      form: {
+        text: '',
+      },
+    }
+  },
+  methods: {
+    onSubmit(event) {
+      event.preventDefault()
+      alert(JSON.stringify(this.form))
+    },
+    onReset(event) {
+      event.preventDefault()
+      this.form.text = ''
+    },
+  },
+}
+</script>

frontend/src/components/ContributionMessages/ContributionMessagesList.vue

@@ -19,10 +19,10 @@
   </div>
 </template>
 <script>
-import ContributionMessagesListItem from './slots/ContributionMessagesListItem.vue'
+import ContributionMessagesListItem from '@/components/ContributionMessages/ContributionMessagesListItem.vue'
-import IsModerator from './slots/IsModerator.vue'
+import IsModerator from '@/components/ContributionMessages/slots/IsModerator.vue'
-import IsNotModerator from './slots/IsNotModerator.vue'
+import IsNotModerator from '@/components/ContributionMessages/slots/IsNotModerator.vue'
-import ContributionMessagesFormular from '../ContributionMessages/ContributionMessagesFormular.vue'
+import ContributionMessagesFormular from '@/components/ContributionMessages/ContributionMessagesFormular.vue'
 export default {
   name: 'ContributionMessagesList',
   components: {

frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue

@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <slot :name="typeId"></slot>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ContributionMessagesListItem',
+  props: {
+    typeId: {
+      type: Number,
+      required: true,
+    },
+  },
+}
+</script>

frontend/src/components/ContributionMessages/slots/IsModerator.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="slot-is-moderator">
+    <b-avatar square text="AA"></b-avatar>
+    <span class="ml-2 mr-2">{{ message.firstName }} {{ message.lastName }}</span>
+    <div class="mt-2">{{ message }}</div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.slot-is-moderator {
+  clear: both;
+  background-color: rgb(250, 158, 207);
+  width: 75%;
+  margin-top: 20px;
+}
+</style>

frontend/src/components/ContributionMessages/slots/IsNotModerator.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="slot-is-not-moderator">
+    <div class="text-right">
+      <b-avatar text="BV"></b-avatar>
+      <span class="ml-2 mr-2 text-bold">{{ message.firstName }} {{ message.lastName }}</span>
+      <div class="mt-2">{{ message }}</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    message: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+}
+</script>
+<style>
+.clear {
+  clear: both;
+}
+.slot-is-not-moderator {
+  clear: both;
+  float: right;
+  background-color: aquamarine;
+  width: 75%;
+  margin-top: 20px;
+  margin-bottom: 20px;
+}
+</style>

frontend/src/components/Contributions/ContributionListItem.vue

@@ -35,14 +35,33 @@
           <div class="pointer" @click="deleteContribution({ id })">
             <b-icon icon="trash" class="h2"></b-icon>
           </div>
+          <div v-if="inProcess && type === 'pending'" class="pointer">
+            <b-icon v-b-toggle="collapsId" icon="chat-dots" class="h2 mr-5"></b-icon>
+          </div>
+        </div>
+
+        <div v-if="inProcess && type === 'pending'">
+          <b-button v-if="inProcess && id > 36" v-b-toggle="collapsId" variant="primary">
+            Bitte beantworte die Nachfrage
+          </b-button>
+          <b-collapse :id="collapsId" class="mt-2">
+            <b-card>
+              <contribution-messages-list />
+            </b-card>
+          </b-collapse>
         </div>
       </div>
     </slot>
   </div>
 </template>
 <script>
+import ContributionMessagesList from '@/components/ContributionMessages/ContributionMessagesList.vue'
+
 export default {
   name: 'ContributionListItem',
+  components: {
+    ContributionMessagesList,
+  },
   props: {
     id: {
       type: Number,
@@ -80,6 +99,11 @@ export default {
       required: false,
     },
   },
+  data() {
+    return {
+      inProcess: true,
+    }
+  },
   computed: {
     type() {
       if (this.deletedAt) return 'deleted'
@@ -102,6 +126,9 @@ export default {
       // return this.contributionDate
       return this.createdAt
     },
+    collapsId() {
+      return 'collapse' + String(this.id)
+    },
   },
   methods: {
     deleteContribution(item) {