diff --git a/site/blueprints/pages/event.yml b/site/blueprints/pages/event.yml index de8e3ca..229b620 100644 --- a/site/blueprints/pages/event.yml +++ b/site/blueprints/pages/event.yml @@ -88,5 +88,5 @@ tabs: type: number width: 1/4 mapadoButton: - type: mapado-connect + type: mapado-check width: 1/2 diff --git a/site/plugins/mapado-connect/.editorconfig b/site/plugins/mapado-check/.editorconfig similarity index 100% rename from site/plugins/mapado-connect/.editorconfig rename to site/plugins/mapado-check/.editorconfig diff --git a/site/plugins/mapado-connect/.gitattributes b/site/plugins/mapado-check/.gitattributes similarity index 100% rename from site/plugins/mapado-connect/.gitattributes rename to site/plugins/mapado-check/.gitattributes diff --git a/site/plugins/mapado-connect/.gitignore b/site/plugins/mapado-check/.gitignore similarity index 100% rename from site/plugins/mapado-connect/.gitignore rename to site/plugins/mapado-check/.gitignore diff --git a/site/plugins/mapado-connect/LICENSE.md b/site/plugins/mapado-check/LICENSE.md similarity index 100% rename from site/plugins/mapado-connect/LICENSE.md rename to site/plugins/mapado-check/LICENSE.md diff --git a/site/plugins/mapado-connect/README.md b/site/plugins/mapado-check/README.md similarity index 100% rename from site/plugins/mapado-connect/README.md rename to site/plugins/mapado-check/README.md diff --git a/site/plugins/mapado-connect/SECURITY.md b/site/plugins/mapado-check/SECURITY.md similarity index 100% rename from site/plugins/mapado-connect/SECURITY.md rename to site/plugins/mapado-check/SECURITY.md diff --git a/site/plugins/mapado-check/composer.json b/site/plugins/mapado-check/composer.json new file mode 100755 index 0000000..a1b7c0a --- /dev/null +++ b/site/plugins/mapado-check/composer.json @@ -0,0 +1,21 @@ +{ + "name": "adrienpayet/mapado-check", + "description": "Mapado check", + "license": "MIT", + "type": "kirby-plugin", + "version": "1.0.0", + "authors": [ + { + "name": "Adrien Payet", + "email": "contact@adrien-payet.fr" + } + ], + "require": { + "getkirby/composer-installer": "^1.1" + }, + "config": { + "allow-plugins": { + "getkirby/composer-installer": true + } + } +} diff --git a/site/plugins/mapado-connect/composer.lock b/site/plugins/mapado-check/composer.lock similarity index 100% rename from site/plugins/mapado-connect/composer.lock rename to site/plugins/mapado-check/composer.lock diff --git a/site/plugins/mapado-check/index.css b/site/plugins/mapado-check/index.css new file mode 100644 index 0000000..e8e75e5 --- /dev/null +++ b/site/plugins/mapado-check/index.css @@ -0,0 +1,4 @@ + +button[data-v-402405a5] { + margin-top: 2rem; +} diff --git a/site/plugins/mapado-connect/index.js b/site/plugins/mapado-check/index.js similarity index 71% rename from site/plugins/mapado-connect/index.js rename to site/plugins/mapado-check/index.js index 4c6e08b..37df54a 100644 --- a/site/plugins/mapado-connect/index.js +++ b/site/plugins/mapado-check/index.js @@ -16,7 +16,7 @@ }; } const _sfc_main = { - __name: "MapadoConnectField", + __name: "MapadoCheckButton", props: { mapadoToken: String }, @@ -33,6 +33,17 @@ id.value = idInput.value; }); }, 100); + function formatDateString(inputString) { + const splitString = inputString.split(" "); + const startDay = splitString[2]; + const startMonth = splitString[3]; + const startYear = splitString[4]; + const endDay = splitString[9]; + const endMonth = splitString[10]; + const endYear = splitString[11]; + const formattedString = `du ${startDay} ${startMonth} ${startYear} au ${endDay} ${endMonth} ${endYear}`; + return formattedString; + } function connect() { icon.value = "loader"; theme.value = "yellow"; @@ -44,7 +55,7 @@ redirect: "follow" }; fetch( - "https://ticketing.mapado.net/v1/ticketings/" + id.value + "?fields=title,type,sellingDeviceSchedule,eventDateList{startDate,bookableStock}", + "https://ticketing.mapado.net/v1/ticketings/" + id.value + "?fields=title,slug,sellingDeviceSchedule", requestOptions ).then((response) => { console.log(response); @@ -62,8 +73,12 @@ }).then((result) => { icon.value = "check"; theme.value = "green"; - text.value = "Événement correspondant sur Mapado : " + result.title + ""; + const scheduleFirstKey = Object.keys(result.sellingDeviceSchedule)[0]; + const schedule = formatDateString( + result.sellingDeviceSchedule[scheduleFirstKey].fr.toLowerCase() + ); console.log(result); + text.value = `Événement correspondant sur Mapado : ${result.title}, ${schedule}. Gérer sur Mapado.`; }).catch((error) => { icon.value = "alert"; theme.value = "red"; @@ -75,7 +90,7 @@ }, 2e3); }); } - return { __sfc: true, id, icon, theme, text, connect }; + return { __sfc: true, id, icon, theme, text, formatDateString, connect }; } }; var _sfc_render = function render() { @@ -90,13 +105,13 @@ _sfc_staticRenderFns, false, null, - "f2640b99" + "402405a5" ); - __component__.options.__file = "/Users/adrienpayet/code/ntb/site/plugins/mapado-connect/src/components/MapadoConnectField.vue"; - const MapadoConnectField = __component__.exports; - window.panel.plugin("getkirby/pluginkit", { + __component__.options.__file = "/Users/adrienpayet/code/ntb/site/plugins/mapado-check/src/components/MapadoCheckButton.vue"; + const MapadoCheckButton = __component__.exports; + window.panel.plugin("adrienpayet/mapado-check", { fields: { - "mapado-connect": MapadoConnectField + "mapado-check": MapadoCheckButton } }); })(); diff --git a/site/plugins/mapado-connect/index.php b/site/plugins/mapado-check/index.php similarity index 72% rename from site/plugins/mapado-connect/index.php rename to site/plugins/mapado-check/index.php index ce49a9c..276c1ac 100755 --- a/site/plugins/mapado-connect/index.php +++ b/site/plugins/mapado-check/index.php @@ -1,8 +1,8 @@ [ - 'mapado-connect' => [ + 'mapado-check' => [ "props" => [ "mapadoToken" => function() { return $this->model()->site()->mapadoToken()->value(); diff --git a/site/plugins/mapado-connect/package.json b/site/plugins/mapado-check/package.json similarity index 100% rename from site/plugins/mapado-connect/package.json rename to site/plugins/mapado-check/package.json diff --git a/site/plugins/mapado-connect/src/components/MapadoConnectField.vue b/site/plugins/mapado-check/src/components/MapadoCheckButton.vue similarity index 69% rename from site/plugins/mapado-connect/src/components/MapadoConnectField.vue rename to site/plugins/mapado-check/src/components/MapadoCheckButton.vue index 102a526..6124b1c 100755 --- a/site/plugins/mapado-connect/src/components/MapadoConnectField.vue +++ b/site/plugins/mapado-check/src/components/MapadoCheckButton.vue @@ -34,6 +34,22 @@ setTimeout(() => { }); }, 100); +function formatDateString(inputString) { + const splitString = inputString.split(" "); + + const startDay = splitString[2]; + const startMonth = splitString[3]; + const startYear = splitString[4]; + + const endDay = splitString[9]; + const endMonth = splitString[10]; + const endYear = splitString[11]; + + const formattedString = `du ${startDay} ${startMonth} ${startYear} au ${endDay} ${endMonth} ${endYear}`; + + return formattedString; +} + function connect() { icon.value = "loader"; theme.value = "yellow"; @@ -49,7 +65,7 @@ function connect() { fetch( "https://ticketing.mapado.net/v1/ticketings/" + id.value + - "?fields=title,type,sellingDeviceSchedule,eventDateList{startDate,bookableStock}", + "?fields=title,slug,sellingDeviceSchedule", requestOptions ) .then((response) => { @@ -69,11 +85,12 @@ function connect() { .then((result) => { icon.value = "check"; theme.value = "green"; - text.value = - "Événement correspondant sur Mapado : " + - result.title + - ""; + const scheduleFirstKey = Object.keys(result.sellingDeviceSchedule)[0]; + const schedule = formatDateString( + result.sellingDeviceSchedule[scheduleFirstKey].fr.toLowerCase() + ); console.log(result); + text.value = `Événement correspondant sur Mapado : ${result.title}, ${schedule}. Gérer sur Mapado.`; }) .catch((error) => { icon.value = "alert"; diff --git a/site/plugins/mapado-check/src/index.js b/site/plugins/mapado-check/src/index.js new file mode 100755 index 0000000..7824eab --- /dev/null +++ b/site/plugins/mapado-check/src/index.js @@ -0,0 +1,7 @@ +import MapadoCheckButton from "./components/MapadoCheckButton.vue"; + +window.panel.plugin("adrienpayet/mapado-check", { + fields: { + "mapado-check": MapadoCheckButton, + }, +}); diff --git a/site/plugins/mapado-connect/composer.json b/site/plugins/mapado-connect/composer.json deleted file mode 100755 index fa07b14..0000000 --- a/site/plugins/mapado-connect/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "getkirby/pluginkit", - "description": "Kirby Example Plugin", - "license": "MIT", - "type": "kirby-plugin", - "version": "1.0.0", - "authors": [ - { - "name": "Your Name", - "email": "you@example.com" - } - ], - "require": { - "getkirby/composer-installer": "^1.1" - }, - "config": { - "allow-plugins": { - "getkirby/composer-installer": true - } - } -} diff --git a/site/plugins/mapado-connect/index.css b/site/plugins/mapado-connect/index.css deleted file mode 100644 index a835db5..0000000 --- a/site/plugins/mapado-connect/index.css +++ /dev/null @@ -1,4 +0,0 @@ - -button[data-v-f2640b99] { - margin-top: 2rem; -} diff --git a/site/plugins/mapado-connect/src/index.js b/site/plugins/mapado-connect/src/index.js deleted file mode 100755 index cc6507d..0000000 --- a/site/plugins/mapado-connect/src/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import MapadoConnectField from "./components/MapadoConnectField.vue"; - -window.panel.plugin("getkirby/pluginkit", { - fields: { - "mapado-connect": MapadoConnectField, - }, -});