Skip to content

[Site] Upgrade 2.16 #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ux.symfony.com/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"league/commonmark": "^2.4",
"pagerfanta/twig": "^3.8",
"symfony/asset": "6.4.*",
"symfony/asset-mapper": "6.4.*",
"symfony/asset-mapper": "6.4.3",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
Expand Down
510 changes: 255 additions & 255 deletions ux.symfony.com/composer.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions ux.symfony.com/templates/components/FoodVote.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
type="button"
class="btn btn-secondary"
data-action="live#action"
data-action-name="vote(direction=up)"
data-live-action-param="vote"
data-live-direction-param="up"
>
<twig:Icon name="arrow-up" />
</button>
<button
type="button"
class="btn btn-secondary"
data-action="live#action"
data-action-name="vote(direction=down)"
data-live-action-param="vote"
data-live-direction-param="down"
>
<twig:Icon name="arrow-down" />
</button>
Expand Down
6 changes: 3 additions & 3 deletions ux.symfony.com/templates/components/InlineEditFood.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</div>

<button
data-action="live#action"
data-action-name="prevent|save"
data-action="live#action:prevent"
data-live-action-param="save"
class="btn btn-outline btn-outline-{{ error ? 'danger' : 'secondary' }}"
>Save</button>

Expand All @@ -37,7 +37,7 @@
<h2>{{ food.name }}</h2>
<button
data-action="live#action"
data-action-name="activateEditing"
data-live-action-param="activateEditing"
class="btn btn-link"
title="Click to edit!"
>
Expand Down
4 changes: 2 additions & 2 deletions ux.symfony.com/templates/components/InvoiceCreator.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div {{ attributes }}>
<form data-action="live#action" data-action-name="prevent|saveInvoice">
<form data-action="live#action:prevent" data-live-action-param="saveInvoice">
<div class="mb-3">
<label for="customer-name">Customer name:</label>
<input
Expand Down Expand Up @@ -56,7 +56,7 @@

<button
data-action="live#action"
data-action-name="addLineItem"
data-live-action-param="addLineItem"
class="btn btn-sm btn-secondary"
type="button"
><twig:Icon name="plus" /> Add Item</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,27 @@
{{ quantity }}
{% endif %}
</td>
<td class="text-end">
<td class="text-end text-nowrap">
{% if isEditing %}
<button
data-action="live#action"
data-action-name="save"
data-live-action-param="save"
class="btn btn-success btn-sm"
type="button"
>Save</button>
{% else %}
<button
data-action="live#action"
data-action-name="edit"
data-live-action-param="edit"
class="btn btn-primary btn-sm"
type="button"
>Edit</button>
{% endif %}

<button
data-action="live#emitUp"
data-event="removeLineItem(key={{ key }})"
data-live-event-param="removeLineItem"
data-live-key-param="{{ key }}"
class="btn btn-link text-danger btn-sm ml-2"
type="button"
><twig:Icon name="cross" /></button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
{% if app.debug %}
<div class="LiveMemory-Debug">
{% for i in 1..4 %}
<button type="button" data-action="live#action" data-action-name="play(level={{ i }})">
<button
type="button"
data-action="live#action"
data-live-action-param="play"
data-live-level-param="{{ i }}"
>
{{ max(i+2, 4) }}x{{ min(i+2, 4) }}
</button>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@

{# We keep the back / button to flip until the card is matched #}
{% if not matched|default %}
<button class="LiveMemory-Card__back" data-action="live#action" data-action-name="flip(key={{ key }})">
<button
class="LiveMemory-Card__back"
data-action="live#action"
data-live-action-param="flip"
data-live-key-param="{{ key }}"
>
<img class="LiveMemory-Card__back_img LiveMemory-Card__img"
alt="LiveMemory Card Back - {{ back|upper }}"
src="{{ asset('images/demos/live-memory/back/%s.webp'|format(back)) }}"
Expand Down
14 changes: 11 additions & 3 deletions ux.symfony.com/templates/components/LiveMemory/Score.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

<div class="title">GAME OVER!</div>
<div class="text">TIME ELAPSED</div>
<button data-action="live#action" data-action-name="play(level={{ game.level }})">INSERT COIN</button>
<button
data-action="live#action"
data-live-action-param="play"
data-live-level-param="{{ game.level }}"
>INSERT COIN</button>

{% else %}

Expand All @@ -25,9 +29,13 @@
<twig:LiveMemory:ScoreRow wait="6" label="TOTAL" value="{{ game.totalScore }}" class="total"/>
</div>
{% if game.level != 4 %}
<button data-action="live#action" data-action-name="play(level={{ game.level + 1 }})">NEXT LEVEL</button>
<button
data-action="live#action"
data-live-action-param="play"
data-live-level-param="{{ game.level + 1 }}"
>NEXT LEVEL</button>
{% else %}
<button data-action="live#action" data-action-name="play">NEW GAME</button>
<button data-action="live#action" data-live-action-param="play">NEW GAME</button>
{% endif %}

{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions ux.symfony.com/templates/components/NewCategoryForm.html.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div {{ attributes }}>
<form
data-action="live#action"
data-action-name="prevent|saveCategory"
data-action="live#action:prevent"
data-live-action-param="saveCategory"
>

<div class="mb-3">
Expand Down
4 changes: 2 additions & 2 deletions ux.symfony.com/templates/components/NewProductForm.html.twig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div {{ attributes }}>
<form
data-action="live#action"
data-action-name="prevent|saveProduct"
data-action="live#action:prevent"
data-live-action-param="saveProduct"
>
<div class="row align-items-center">
<div class="col-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
{{ form_start(form, {
attr: {
'novalidate': true,
'data-action': 'live#action',
'data-action-name': 'prevent|saveRegistration',
'data-action': 'live#action:prevent',
'data-live-action-param': 'saveRegistration',
}
}) }}
{{ form_row(form.email) }}
Expand Down
2 changes: 1 addition & 1 deletion ux.symfony.com/templates/components/UploadFiles.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</div>
<button
data-action="live#action"
data-action-name="files|uploadFiles"
data-live-action-param="files|uploadFiles"
class="btn btn-primary"
>Upload files!</button>
</div>