From 0fc63475858cc93b1a90871eb62e732139f3f19e Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sat, 26 Dec 2020 22:33:25 +0100 Subject: [PATCH] create vue-link-formatter module, integrated home link fields into vuejs --- ...ty_view_display.node.frontpage.default.yml | 53 ++- config/sync/core.extension.yml | 1 + .../custom/vue_link_formatter/LICENSE.txt | 339 ++++++++++++++++++ .../Field/FieldFormatter/VueLinkFormatter.php | 153 ++++++++ ...ink-formatter-vue-link-formatter.html.twig | 20 ++ .../vue_link_formatter.info.yml | 9 + .../vue_link_formatter.module | 60 ++++ .../custom/materiotheme/assets/dist/main.css | 10 - .../custom/materiotheme/assets/dist/main.js | 2 +- .../assets/styles/base/_fonts.scss | 10 - .../vuejs/components/Pages/Home.vue | 21 ++ 11 files changed, 644 insertions(+), 34 deletions(-) create mode 100644 web/modules/custom/vue_link_formatter/LICENSE.txt create mode 100644 web/modules/custom/vue_link_formatter/src/Plugin/Field/FieldFormatter/VueLinkFormatter.php create mode 100644 web/modules/custom/vue_link_formatter/templates/link-formatter-vue-link-formatter.html.twig create mode 100644 web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml create mode 100644 web/modules/custom/vue_link_formatter/vue_link_formatter.module diff --git a/config/sync/core.entity_view_display.node.frontpage.default.yml b/config/sync/core.entity_view_display.node.frontpage.default.yml index a1c5a575..e44bc022 100644 --- a/config/sync/core.entity_view_display.node.frontpage.default.yml +++ b/config/sync/core.entity_view_display.node.frontpage.default.yml @@ -14,9 +14,9 @@ dependencies: - node.type.frontpage module: - field_group - - link - text - user + - vue_link_formatter third_party_settings: field_group: group_intro: @@ -274,25 +274,43 @@ content: weight: 5 label: hidden settings: - trim_length: 80 + link_text: '' + methode: onClickLink + event_modifiers: + prevent: prevent + stop: stop + capture: 0 + self: 0 + once: 0 + passive: 0 + trim_length: '80' url_only: false url_plain: false - rel: '' - target: '' + rel: 0 + target: 0 third_party_settings: { } - type: link + type: vue_link_formatter region: content field_database_links: weight: 7 label: hidden settings: - trim_length: 80 + link_text: '' + methode: onClickLink + event_modifiers: + prevent: prevent + stop: stop + capture: 0 + self: 0 + once: 0 + passive: 0 + trim_length: '80' url_only: false url_plain: false - rel: '' - target: '' + rel: 0 + target: 0 third_party_settings: { } - type: link + type: vue_link_formatter region: content field_pricing: weight: 5 @@ -305,13 +323,22 @@ content: weight: 4 label: hidden settings: - trim_length: 80 + link_text: '' + methode: onClickLink + event_modifiers: + prevent: prevent + stop: stop + capture: 0 + self: 0 + once: 0 + passive: 0 + trim_length: '80' url_only: false url_plain: false - rel: '' - target: '' + rel: 0 + target: 0 third_party_settings: { } - type: link + type: vue_link_formatter region: content field_showrooms: weight: 3 diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index e0821d7a..5c29e945 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -184,6 +184,7 @@ module: views_bulk_operations: 0 views_conditional: 0 views_ef_fieldset: 0 + vue_link_formatter: 0 workflow: 0 workflow_access: 0 workflow_operations: 0 diff --git a/web/modules/custom/vue_link_formatter/LICENSE.txt b/web/modules/custom/vue_link_formatter/LICENSE.txt new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/web/modules/custom/vue_link_formatter/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/web/modules/custom/vue_link_formatter/src/Plugin/Field/FieldFormatter/VueLinkFormatter.php b/web/modules/custom/vue_link_formatter/src/Plugin/Field/FieldFormatter/VueLinkFormatter.php new file mode 100644 index 00000000..36ed73e4 --- /dev/null +++ b/web/modules/custom/vue_link_formatter/src/Plugin/Field/FieldFormatter/VueLinkFormatter.php @@ -0,0 +1,153 @@ + 80, + 'link_text' => '', + 'event_modifiers' => NULL, + 'methode' => '', + ] + parent::defaultSettings(); + } + + public function settingsForm(array $parentForm, FormStateInterface $form_state) { + $parentForm = parent::settingsForm($parentForm, $form_state); + $settings = $this->getSettings(); + + $form['link_text'] = [ + '#type' => 'textfield', + '#title' => $this->t('Link text, leave empty for default'), + '#default_value' => $settings['link_text'], + ]; + + $form['methode'] = [ + '#type' => 'textfield', + '#title' => $this->t('Vue methode for @click vue-attribute.'), + '#default_value' => $settings['methode'], + '#required' => TRUE, + ]; + + $form['event_modifiers'] = [ + '#type' => 'checkboxes', + '#title' => $this->t('Event modifiers'), + '#default_value' => $settings['event_modifiers'], + // '#empty_option' => $this->t('None'), + '#options' => [ + 'prevent' => $this->t('.prevent'), + 'stop' => $this->t('.stop'), + 'capture' => $this->t('.capture'), + 'self' => $this->t('.self'), + 'once' => $this->t('.once'), + 'passive' => $this->t('.passive'), + ], + ]; + + return $form + $parentForm; + } + + public function settingsSummary() { + $settings = $this->getSettings(); + $summary = []; + if (!empty($settings['link_text'])) { + $summary[] = $this->t('Link text: @text"', ['@text' => $settings['link_text']]); + } + if (!empty($settings['methode'])) { + $summary[] = $this->t('Click Methode: @text', ['@text' => $settings['methode']]); + } + if (!empty($settings['event_modifiers'])) { + $summary[] = $this->t('Event modifier: @text', ['@text' => implode('.', $settings['event_modifiers'])]); + } + + // TODO: add key event + + return $summary; + } + + /** + * {@inheritdoc} + */ + public function viewElements(FieldItemListInterface $items, $langcode) { + $element = array(); + $entity = $items->getEntity(); + $settings = $this->getSettings(); + + foreach ($items as $delta => $item) { + // By default use the full URL as the link text. + $url = $this->buildUrl($item); + $link_title = $url->toString(); + + // If the link text field value is available, use it for the text. + if (empty($settings['url_only']) && !empty($item->title)) { + // Unsanitized token replacement here because the entire link title + // gets auto-escaped during link generation in + // \Drupal\Core\Utility\LinkGenerator::generate(). + $link_title = \Drupal::token()->replace($item->title, [$entity->getEntityTypeId() => $entity], ['clear' => TRUE]); + } + + if (!empty($settings['link_text'])) { + $link_title = $this->t($settings['link_text']); + } + + // The link_separate formatter has two titles; the link text (as in the + // field values) and the URL itself. If there is no link text value, + // $link_title defaults to the URL, so it needs to be unset. + // The URL version may need to be trimmed as well. + if (empty($item->title) && empty($settings['link_text'])) { + $link_title = NULL; + } + $url_title = $url->toString(); + if (!empty($settings['trim_length'])) { + $link_title = Unicode::truncate($link_title, $settings['trim_length'], FALSE, TRUE); + $url_title = Unicode::truncate($url_title, $settings['trim_length'], FALSE, TRUE); + } + + $element[$delta] = array( + '#theme' => 'link_formatter_vue_link_formatter', + '#title' => $link_title, + '#url_title' => $url_title, + '#url' => $url, + '#methode' => $settings['methode'], + '#event_modifiers' => $settings['event_modifiers'], + ); + + + $attributes = []; + if (!empty($item->_attributes)) { + // Set our RDFa attributes on the element that is being built. + $url->setOption('attributes', $item->_attributes); + + // Unset field item attributes since they have been included in the + // formatter output and should not be rendered in the field template. + unset($item->_attributes); + } + } + return $element; + } + +} diff --git a/web/modules/custom/vue_link_formatter/templates/link-formatter-vue-link-formatter.html.twig b/web/modules/custom/vue_link_formatter/templates/link-formatter-vue-link-formatter.html.twig new file mode 100644 index 00000000..22c866a7 --- /dev/null +++ b/web/modules/custom/vue_link_formatter/templates/link-formatter-vue-link-formatter.html.twig @@ -0,0 +1,20 @@ +{# +/** + * @file + * Default theme implementation of a link with separate title and URL elements. + * + * Available variables: + * - link: The link that has already been formatted by l(). + * - title: (optional) A descriptive or alternate title for the link, which may + * be different than the actual link text. + * + * @see template_preprocess() + * @see template_preprocess_link_formatter_link_separate() + * + * @ingroup themeable + */ +#} + + + {{ title }} + diff --git a/web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml b/web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml new file mode 100644 index 00000000..3a8b4f4e --- /dev/null +++ b/web/modules/custom/vue_link_formatter/vue_link_formatter.info.yml @@ -0,0 +1,9 @@ +name: Vue Link Formatter +type: module +description: 'Provides a simple vue link field formatter with vue attributes as @click.' +core: 8.x +core_version_requirement: ^8 || ^9 +package: Fields +# version: VERSION +dependencies: + - field diff --git a/web/modules/custom/vue_link_formatter/vue_link_formatter.module b/web/modules/custom/vue_link_formatter/vue_link_formatter.module new file mode 100644 index 00000000..25cec307 --- /dev/null +++ b/web/modules/custom/vue_link_formatter/vue_link_formatter.module @@ -0,0 +1,60 @@ + [ + 'variables' => [ + 'title' => NULL, + 'url_title' => NULL, + 'url' => NULL, + 'methode' => NULL, + 'event_modifiers' => NULL, + ], + ], + ]; +} + +/** + * Prepares variables for button link field templates. + * + * This template outputs a separate title and link. + * + * Default template: link-formatter-button-link.html.twig. + * + * @param array $variables + * An associative array containing: + * - title: (optional) A descriptive or alternate title for the link, which + * may be different than the actual link text. + * - url_title: The anchor text for the link. + * - url: A \Drupal\Core\Url object. + */ +function template_preprocess_link_formatter_vue_link_formatter(&$variables) { + $url = $variables['url']; + $attributes = $url->getOption('attributes'); + $attributes['class'][] = 'btn'; + $attributes['href'] = $url->toString(); + + $modifiers = []; + foreach ($variables['event_modifiers'] as $modifier => $value) { + if ($value) { + $modifiers[] = $modifier; + } + } + $attributes['@click.' . implode('.', $modifiers)] = $variables['methode']; + + $url->setOption('attributes', $attributes); + $variables['link'] = Link::fromTextAndUrl($variables['title'], $url )->toString(); + $variables['attributes'] = new Attribute($attributes); +} diff --git a/web/themes/custom/materiotheme/assets/dist/main.css b/web/themes/custom/materiotheme/assets/dist/main.css index 8583abfd..657f832e 100644 --- a/web/themes/custom/materiotheme/assets/dist/main.css +++ b/web/themes/custom/materiotheme/assets/dist/main.css @@ -1204,16 +1204,6 @@ body { font-style: normal; line-height: 1.3; } -a.btn { - display: inline-block; - font-size: 0.9em; - font-weight: bold; - padding: 0.7em 1em; - margin-bottom: 0.3em; - background-color: #fff; - color: #000; - border-radius: 5px; } - aside.messages { border: none; } diff --git a/web/themes/custom/materiotheme/assets/dist/main.js b/web/themes/custom/materiotheme/assets/dist/main.js index be10db91..7080a60a 100644 --- a/web/themes/custom/materiotheme/assets/dist/main.js +++ b/web/themes/custom/materiotheme/assets/dist/main.js @@ -1190,7 +1190,7 @@ eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n value: true\n})); /***/ ((__unused_webpack_module, exports, __webpack_require__) => { "use strict"; -eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n value: true\n}));\nexports.default = void 0;\n\nvar _vue = _interopRequireDefault(__webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nvar _default = {\n props: ['html'],\n // get the html from parent with props\n data: function data() {\n return {\n template: null // compiled template from html used in render\n\n };\n },\n beforeMount: function beforeMount() {\n var _this = this;\n\n // console.log('Home beforeMount');\n // compile the html src (coming from parent with props or from ajax call)\n if (this.html) {\n // console.log('html', this.html);\n this.template = _vue.default.compile(this.html);\n this.$options.staticRenderFns = [];\n this._staticTrees = [];\n this.template.staticRenderFns.map(function (fn) {\n return _this.$options.staticRenderFns.push(fn);\n });\n }\n },\n render: function render(h) {\n if (!this.template) {\n return h('span', 'Loading ...');\n } else {\n return this.template.render.call(this);\n }\n }\n};\nexports.default = _default;\n\n//# sourceURL=webpack://materio.com/./web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue?./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js??vue-loader-options"); +eval("\n\nObject.defineProperty(exports, \"__esModule\", ({\n value: true\n}));\nexports.default = void 0;\n\nvar _vue = _interopRequireDefault(__webpack_require__(/*! vue */ \"./node_modules/vue/dist/vue.js\"));\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }\n\nvar _default = {\n props: ['html'],\n // get the html from parent with props\n data: function data() {\n return {\n template: null // compiled template from html used in render\n\n };\n },\n beforeMount: function beforeMount() {\n var _this = this;\n\n // console.log('Home beforeMount');\n // compile the html src (coming from parent with props or from ajax call)\n if (this.html) {\n // console.log('html', this.html);\n this.template = _vue.default.compile(this.html);\n this.$options.staticRenderFns = [];\n this._staticTrees = [];\n this.template.staticRenderFns.map(function (fn) {\n return _this.$options.staticRenderFns.push(fn);\n });\n }\n },\n render: function render(h) {\n if (!this.template) {\n return h('span', 'Loading ...');\n } else {\n return this.template.render.call(this);\n }\n },\n methods: {\n onClickLink: function onClickLink(e) {\n console.log(\"onClickLink\", e, this.$router);\n var path = null;\n this.$router.options.routes.forEach(function (route) {\n // console.log('route.path', route.path);\n if (route.path == e.originalTarget.pathname) {\n path = e.originalTarget.pathname; // TODO: check if path is current\n // TODO: as we can't break forEach is not the good method here\n }\n }, this);\n\n if (path) {\n this.$router.push({\n path: path\n });\n }\n }\n }\n};\nexports.default = _default;\n\n//# sourceURL=webpack://materio.com/./web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue?./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/lib/index.js??vue-loader-options"); /***/ }), diff --git a/web/themes/custom/materiotheme/assets/styles/base/_fonts.scss b/web/themes/custom/materiotheme/assets/styles/base/_fonts.scss index 48c9dcbd..c1bc126c 100644 --- a/web/themes/custom/materiotheme/assets/styles/base/_fonts.scss +++ b/web/themes/custom/materiotheme/assets/styles/base/_fonts.scss @@ -5,13 +5,3 @@ body{ font-style: normal; line-height: 1.3; } -a.btn{ - display: inline-block; - font-size: 0.9em; - font-weight: bold; - padding: 0.7em 1em; - margin-bottom: 0.3em; - background-color: #fff; - color: #000; - border-radius: 5px; -} diff --git a/web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue b/web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue index bde1a03e..2d9be884 100644 --- a/web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue +++ b/web/themes/custom/materiotheme/vuejs/components/Pages/Home.vue @@ -26,6 +26,27 @@ export default { }else{ return this.template.render.call(this) } + }, + methods: { + onClickLink(e){ + console.log("onClickLink", e, this.$router); + let path = null; + + this.$router.options.routes.forEach(route => { + // console.log('route.path', route.path); + if (route.path == e.originalTarget.pathname) { + path = e.originalTarget.pathname + // TODO: check if path is current + // TODO: as we can't break forEach is not the good method here + } + }, this) + + if (path) { + this.$router.push({ + path: path + }) + } + } } }