From 320d11671aa37e72b5f0ab3799376c23d95c8087 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 25 Jan 2022 10:54:08 +0100 Subject: [PATCH 1/4] prepare homepage_widget template --- .../Resources/public/chill/chillmain.scss | 15 ++++++ .../Resources/views/Homepage/index.html.twig | 46 +++++++++++++++++++ .../views/Homepage/sticky_button.html.twig | 10 ++++ .../Resources/views/layout.html.twig | 40 ++++++++-------- 4 files changed, 91 insertions(+), 20 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 39f8b3f8a..99d31e103 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -490,3 +490,18 @@ div.popover { div.v-toast { z-index: 10000!important; } + +// +div.sticky-buttons { + position: fixed; + bottom: 3em; + right: 2em; + .btn-circle { + width: 60px; height: 60px; + border-radius: 50%; + text-align: center; + padding: 0.9rem 1rem; + display: block; + margin-bottom: 0.35rem; + } +} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig new file mode 100644 index 000000000..24aa8aec9 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig @@ -0,0 +1,46 @@ +
+ + {# vue component #} +
+ + + + {% include '@ChillMain/Homepage/sticky_button.html.twig' %} +
+ +{% block css %} +{% endblock %} + +{% block js %} +{% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig new file mode 100644 index 000000000..27dd4fe5d --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/sticky_button.html.twig @@ -0,0 +1,10 @@ +
+ + + + + + +
\ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index a123ce405..15d57cff3 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -59,26 +59,26 @@ {% endif %} {% block content %} - -
-
Appel téléphonique
-
- - {{ chill_widget('homepage', {} ) }} + + + {# DISABLED {{ chill_widget('homepage', {} ) }} #} + + {% include '@ChillMain/Homepage/index.html.twig' %} + {% endblock %} From 0e2772336f0ae69c603db242ea62ca28123f18a7 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 25 Jan 2022 11:27:31 +0100 Subject: [PATCH 2/4] create new app vue homepage_widget, with store --- .../public/page/homepage_widget/index.js | 16 +++++++ .../public/vuejs/HomepageWidget/App.vue | 46 +++++++++++++++++++ .../public/vuejs/HomepageWidget/js/i18n.js | 11 +++++ .../public/vuejs/HomepageWidget/js/store.js | 14 ++++++ .../Resources/views/Homepage/index.html.twig | 35 +------------- .../ChillMainBundle/chill.webpack.config.js | 1 + 6 files changed, 90 insertions(+), 33 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js new file mode 100644 index 000000000..698302ebb --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js @@ -0,0 +1,16 @@ +import { createApp } from 'vue'; +import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'; +import { appMessages } from 'ChillMainAssets/vuejs/HomepageWidget/js/i18n'; +import { store } from 'ChillMainAssets/vuejs/HomepageWidget/js/store'; +import App from 'ChillMainAssets/vuejs/HomepageWidget/App'; + +const i18n = _createI18n(appMessages); + +const app = createApp({ + template: ``, +}) +.use(store) +.use(i18n) +.component('app', App) +.mount('#homepage_widget') +; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue new file mode 100644 index 000000000..dee05b285 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js new file mode 100644 index 000000000..0eff7fa96 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js @@ -0,0 +1,11 @@ +const appMessages = { + fr: { + + } +}; + +Object.assign(appMessages.fr); + +export { + appMessages +}; \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js new file mode 100644 index 000000000..bb9af47e6 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js @@ -0,0 +1,14 @@ +import 'es6-promise/auto'; +import { createStore } from 'vuex'; + +const debug = process.env.NODE_ENV !== 'production'; + +const store = createStore({ + strict: debug, + state: {}, + getters: {}, + mutations: {}, + actions: {}, +}); + +export { store }; \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig index 24aa8aec9..ba53f8fdd 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig @@ -3,44 +3,13 @@ {# vue component #}
- - {% include '@ChillMain/Homepage/sticky_button.html.twig' %} {% block css %} + {{ encore_entry_link_tags('page_homepage_widget') }} {% endblock %} {% block js %} + {{ encore_entry_script_tags('page_homepage_widget') }} {% endblock %} \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js index 113d326c1..93f71dd94 100644 --- a/src/Bundle/ChillMainBundle/chill.webpack.config.js +++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js @@ -53,6 +53,7 @@ module.exports = function(encore, entries) encore.addEntry('page_login', __dirname + '/Resources/public/page/login/index.js'); encore.addEntry('page_location', __dirname + '/Resources/public/page/location/index.js'); encore.addEntry('page_workflow_show', __dirname + '/Resources/public/page/workflow-show/index.js'); + encore.addEntry('page_homepage_widget', __dirname + '/Resources/public/page/homepage_widget/index.js'); buildCKEditor(encore); From 502f2aceed94b4a68b1df301978045246c89c82c Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 25 Jan 2022 12:44:39 +0100 Subject: [PATCH 3/4] init sub-components and active tab mechanism --- .../public/vuejs/HomepageWidget/App.vue | 85 ++++++++++++++++--- .../HomepageWidget/MyAccompanyingCourses.vue | 13 +++ .../public/vuejs/HomepageWidget/MyCustoms.vue | 13 +++ .../vuejs/HomepageWidget/MyEvaluations.vue | 13 +++ .../vuejs/HomepageWidget/MyNotifications.vue | 13 +++ .../public/vuejs/HomepageWidget/MyTasks.vue | 13 +++ .../public/vuejs/HomepageWidget/MyWorks.vue | 13 +++ .../public/vuejs/HomepageWidget/js/i18n.js | 6 +- 8 files changed, 155 insertions(+), 14 deletions(-) create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue index dee05b285..ea50a7bf7 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue @@ -2,43 +2,102 @@ - +
+ + + + + + + + + + + + +
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue new file mode 100644 index 000000000..31107b564 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue new file mode 100644 index 000000000..cc7831104 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue new file mode 100644 index 000000000..019628a28 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue new file mode 100644 index 000000000..a8b811fbd --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue new file mode 100644 index 000000000..c61cf51b2 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue new file mode 100644 index 000000000..9f7f71bc4 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js index 0eff7fa96..e67b7f5d3 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js @@ -1,6 +1,10 @@ const appMessages = { fr: { - + my_works: "Actions d'accompagnement", + my_evaluations: "Évaluations", + my_task: "Tâches", + my_accompanying_courses: "Parcours", + my_notifications: "Notifications", } }; From fb720a382f0ebffe030aa3c47b2981b8454323de Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 25 Jan 2022 14:32:57 +0100 Subject: [PATCH 4/4] sticky buttons smaller --- .../ChillMainBundle/Resources/public/chill/chillmain.scss | 4 ++-- .../Resources/public/vuejs/HomepageWidget/App.vue | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss index 99d31e103..a1d9ee519 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss @@ -497,10 +497,10 @@ div.sticky-buttons { bottom: 3em; right: 2em; .btn-circle { - width: 60px; height: 60px; + width: 50px; height: 50px; border-radius: 50%; text-align: center; - padding: 0.9rem 1rem; + padding: 0.45rem 0.7rem; display: block; margin-bottom: 0.35rem; } diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue index ea50a7bf7..cf8ad2a1d 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue @@ -102,4 +102,7 @@ export default { \ No newline at end of file