From 93260ea36fa5493e39d7948038f387adde4cd62d Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 26 Apr 2021 11:46:59 +0200
Subject: [PATCH] move AccompanyingCourse component in his own directory

---
 .../App.vue}                                  | 20 +++-----------
 .../components/AccompanyingCourse.vue         | 26 +++++++++++++++++++
 .../components/PersonItem.vue}                |  2 +-
 .../components/PersonsAssociated.vue          | 17 +++++++++---
 .../components/Requestor.vue                  |  6 +----
 .../public/js/AccompanyingCourse/index.js     |  8 ++++++
 .../public/js/AccompanyingCourse/store/.keep  |  0
 .../Resources/public/js/index.js              |  9 -------
 .../views/AccompanyingCourse/show.html.twig   |  2 +-
 .../ChillPersonBundle/chill.webpack.config.js |  2 +-
 10 files changed, 55 insertions(+), 37 deletions(-)
 rename src/Bundle/ChillPersonBundle/Resources/public/js/{AccompanyingCourse.vue => AccompanyingCourse/App.vue} (63%)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue
 rename src/Bundle/ChillPersonBundle/Resources/public/js/{components/PersonAction.vue => AccompanyingCourse/components/PersonItem.vue} (95%)
 rename src/Bundle/ChillPersonBundle/Resources/public/js/{ => AccompanyingCourse}/components/PersonsAssociated.vue (80%)
 rename src/Bundle/ChillPersonBundle/Resources/public/js/{ => AccompanyingCourse}/components/Requestor.vue (75%)
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/js/index.js

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue
similarity index 63%
rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue
index 2b7c4f604..971eca1c7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue
@@ -1,30 +1,18 @@
 <template>
-   <div class="vue-component">
-      <h3>Parcours</h3>
-      <dl>
-         <dt>id</dt>
-            <dd>{{ accompanying_course.id }}</dd>
-         <dt>opening_date</dt>
-            <dd>{{ accompanying_course.opening_date }}</dd>
-         <dt>closing_date</dt>
-            <dd>{{ accompanying_course.closing_date }}</dd>
-         <dt>remark</dt>
-            <dd>{{ accompanying_course.remark }}</dd>
-         <dt>closing_motive</dt>
-            <dd>{{ accompanying_course.closing_motive }}</dd>
-      </dl>
-   </div>
+   <accompanying-course v-bind:accompanying_course="accompanying_course"/>
    <persons-associated v-bind:persons_associated="accompanying_course.persons"/>
    <requestor v-bind:accompanying_course="accompanying_course"/>
 </template>
 
 <script>
+import AccompanyingCourse from './components/AccompanyingCourse.vue';
 import PersonsAssociated from './components/PersonsAssociated.vue';
 import Requestor from './components/Requestor.vue';
 
 export default {
-   name: 'AccompanyingCourse',
+   name: 'App',
    components: { 
+      AccompanyingCourse,
       PersonsAssociated, 
       Requestor
    },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue
new file mode 100644
index 000000000..d08798c00
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue
@@ -0,0 +1,26 @@
+<template>
+   <div class="vue-component">
+      <h3>Parcours</h3>
+      <dl>
+         <dt>id</dt>
+            <dd>{{ accompanying_course.id }}</dd>
+         <dt>opening_date</dt>
+            <dd>{{ accompanying_course.opening_date }}</dd>
+         <dt>closing_date</dt>
+            <dd>{{ accompanying_course.closing_date }}</dd>
+         <dt>remark</dt>
+            <dd>{{ accompanying_course.remark }}</dd>
+         <dt>closing_motive</dt>
+            <dd>{{ accompanying_course.closing_motive }}</dd>
+      </dl>
+   </div>
+</template>
+
+<script>
+export default {
+   name: 'AccompanyingCourse',
+   props: {
+      accompanying_course: Object
+   }
+}
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonAction.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue
similarity index 95%
rename from src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonAction.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue
index be356895c..f75f0779b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonAction.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue
@@ -16,7 +16,7 @@
 
 <script>
 export default {
-   name: 'PersonAction',
+   name: 'PersonItem',
    props: {
       person: { type: Object, required: true }
    },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue
similarity index 80%
rename from src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonsAssociated.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue
index f26f39d6c..f4ccf6964 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue
@@ -15,7 +15,11 @@
          </tr>
       </thead>
       <tbody> 
-         <person-action v-for="person in persons_associated" :key="person.id" :person="person" @remove="removePerson" />
+         <person-item 
+            v-for="person in persons_associated" 
+            v-bind:person="person" 
+            v-bind:key="person.id" 
+            @remove="removePerson" />
       </tbody>
    </table>
    
@@ -27,15 +31,20 @@
 </template>
 
 <script>
-import PersonAction from "./PersonAction.vue"
+import PersonItem from "./PersonItem.vue"
 
 export default {
    name: 'PersonsAssociated',
+   components: { 
+      PersonItem 
+   },
    props: { 
       persons_associated: Array 
    },
-   components: { 
-      PersonAction 
+   data() {
+      return {
+         persons: this.persons_associated
+      }
    },
    computed: {
       async counter() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue
similarity index 75%
rename from src/Bundle/ChillPersonBundle/Resources/public/js/components/Requestor.vue
rename to src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue
index 30fe1298e..75a95e241 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue
@@ -10,11 +10,7 @@
 export default {
    name: 'Requestor',
    props: {
-      'accompanying_course': Object
-   },
-   computed: {
-   },
-   methods: {
+      accompanying_course: Object
    }
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js
new file mode 100644
index 000000000..4335113f7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js
@@ -0,0 +1,8 @@
+import App from './App.vue';
+import { createApp } from 'vue';
+
+const app = createApp({
+   template: `<app></app>`
+})
+.component('app', App)
+.mount('#accompanying-course');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep b/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/index.js b/src/Bundle/ChillPersonBundle/Resources/public/js/index.js
deleted file mode 100644
index c10f555f3..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/js/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import AccompanyingCourse from './AccompanyingCourse.vue';
-import { createApp } from 'vue';
-
-const app = createApp({
-   name: 'App',
-   template: `<accompanying-course></accompanying-course>`
-})
-.component('accompanying-course', AccompanyingCourse)
-.mount('#app');
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig
index 87017bbc1..a33b65cff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/show.html.twig
@@ -8,7 +8,7 @@
 
    <h1>{{ block('title') }}</h1>
    
-   <div id="app"></div>    
+   <div id="accompanying-course"></div>    
 
    {{ encore_entry_script_tags('accompanying_course') }}
 
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 69be65e92..9d7a33d02 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -8,5 +8,5 @@ module.exports = function(encore, entries)
         ChillPersonAssets: __dirname + '/Resources/public'
     });
     
-    encore.addEntry('accompanying_course', __dirname + '/Resources/public/js/index.js');
+    encore.addEntry('accompanying_course', __dirname + '/Resources/public/js/AccompanyingCourse/index.js');
 };