diff --git a/CONVENTIONS.md b/CONVENTIONS.md index f1892e244..0fe76a135 100644 --- a/CONVENTIONS.md +++ b/CONVENTIONS.md @@ -55,7 +55,7 @@ Arborescence: - person - personvendee - household_edit_metadata - - index.js + - index.ts ``` ## Organisation des feuilles de styles diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig index 8a64c9543..9587fbecf 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig @@ -68,35 +68,37 @@ {% endif %} - {% block content %} - - {# DISABLED {{ chill_widget('homepage', {} ) }} #} + {# DISABLED {{ chill_widget('homepage', {} ) }} #} - {% include '@ChillMain/Homepage/index.html.twig' %} + {% include '@ChillMain/Homepage/index.html.twig' %} + {% endblock %} {% endblock %} diff --git a/src/Bundle/ChillTicketBundle/chill.webpack.config.js b/src/Bundle/ChillTicketBundle/chill.webpack.config.js index 5f40de9f2..213b81c97 100644 --- a/src/Bundle/ChillTicketBundle/chill.webpack.config.js +++ b/src/Bundle/ChillTicketBundle/chill.webpack.config.js @@ -1,4 +1,4 @@ -// this file loads all assets from the Chill person bundle module.exports = function(encore, entries) { - encore.addEntry('ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts'); + encore.addEntry('mod_ticket', __dirname + '/src/Resources/public/module/ticket/index.ts'); + encore.addEntry('vue_ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts'); }; diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php index a51c3a4a8..6f8ab2a2b 100644 --- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php +++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php @@ -14,13 +14,22 @@ namespace Chill\TicketBundle\Controller; use Chill\TicketBundle\Entity\Ticket; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Twig\Environment; class EditTicketController { + public function __construct( + private Environment $templating, + ) {} + #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')] public function __invoke( Ticket $ticket ): Response { - return new Response('ok'); + return new Response( + $this->templating->render( + '@ChillTicket/Ticket/edit.html.twig', + ) + ); } } diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts new file mode 100644 index 000000000..2361e49da --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts @@ -0,0 +1 @@ +import './banner.scss'; diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts index e69de29bb..7302f2485 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts @@ -0,0 +1,3 @@ +export interface Ticket { + id: number +} diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue new file mode 100644 index 000000000..89210e057 --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue @@ -0,0 +1,11 @@ + + + + + diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts new file mode 100644 index 000000000..4065765f3 --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts @@ -0,0 +1,5 @@ +export const messages = { + fr: { + hello: "Bonjour {name}" + } +}; diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts index e69de29bb..bad5fb9ac 100644 --- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts +++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts @@ -0,0 +1,17 @@ +import {createApp} from "vue"; +import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n"; +import VueToast from 'vue-toast-notification'; +import 'vue-toast-notification/dist/theme-sugar.css'; +import {messages} from "./i18n/messages"; +import App from './App.vue'; + +const i18n = _createI18n(messages) + +const _app = createApp({ + template: '', + }) + .use(i18n) + .use(VueToast) + .component('app', App) + .mount('#ticketRoot'); + diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig new file mode 100644 index 000000000..f7263b387 --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig @@ -0,0 +1,24 @@ + diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig new file mode 100644 index 000000000..a8e38d86a --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig @@ -0,0 +1,15 @@ +{% extends '@ChillTicket/layout.html.twig' %} + +{% block css %} + {{ parent() }} + {{ encore_entry_link_tags('vue_ticket_app') }} +{% endblock %} + +{% block js %} + {{ parent() }} + {{ encore_entry_script_tags('vue_ticket_app') }} +{% endblock %} + +{% block content %} +
+{% endblock %} diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig new file mode 100644 index 000000000..12fb443d4 --- /dev/null +++ b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig @@ -0,0 +1,14 @@ +{% extends '@ChillMain/layout.html.twig' %} + + +{% block top_banner %} + {{ include('@ChillTicket/Banner/banner.html.twig') }} +{% endblock %} + +{% block wrapping_content %} +
+
+ {% block content %}{% endblock %} +
+
+{% endblock %}