diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/App.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api/accompanyingCourse.js similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/api/accompanyingCourse.js rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api/accompanyingCourse.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/AccompanyingCourse.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonItem.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonItem.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/PersonsAssociated.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/components/Requestor.vue rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js similarity index 89% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js index fcd83a785..f3859f6db 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js @@ -1,6 +1,6 @@ import { createApp } from 'vue' import { createI18n } from 'vue-i18n' -import { datetimeFormats, messages } from '../_components/i18n.js' +import { datetimeFormats, messages } from './js/i18n' import createStore from './store' import App from './App.vue'; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/_components/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js similarity index 68% rename from src/Bundle/ChillPersonBundle/Resources/public/js/_components/i18n.js rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index fedee69e3..7d050fc66 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/js/_components/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -1,21 +1,6 @@ -const datetimeFormats = { - fr: { - short: { - year: "numeric", - month: "numeric", - day: "numeric" - }, - long: { - year: "numeric", - month: "short", - day: "numeric", - weekday: "short", - hour: "numeric", - minute: "numeric", - hour12: false - } - } -} +import { datetimeFormats } from 'ChillPersonAssets/vuejs/_js/i18n' + +// TODO howto merge message object from import ?? const messages = { fr: { title: { @@ -37,19 +22,17 @@ const messages = { startdate: "Date d'entrée", enddate: "Date de sortie", addPerson: "Ajouter un usager", - }, action: { - actions: "Actions", + actions: "Actions", show: "Voir", edit: "Modifier", create: "Créer", remove: "Enlever", delete: "Supprimer", - } } -} +}; export { datetimeFormats, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js similarity index 100% rename from src/Bundle/ChillPersonBundle/Resources/public/js/AccompanyingCourse/store/index.js rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js new file mode 100644 index 000000000..5a675159e --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js @@ -0,0 +1,24 @@ +const datetimeFormats = { + fr: { + short: { + year: "numeric", + month: "numeric", + day: "numeric" + }, + long: { + year: "numeric", + month: "short", + day: "numeric", + weekday: "short", + hour: "numeric", + minute: "numeric", + hour12: false + } + } +}; +// const messages = {} ... + +export { + datetimeFormats, + // messages +}; diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js index 9d7a33d02..53aed5d91 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/AccompanyingCourse/index.js'); + encore.addEntry('accompanying_course', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js'); };