Skip to content

Commit

Permalink
fix group slide
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kerrialn
Kerrialn committed Jan 11, 2024
1 parent 68dcb0a commit db1ad45
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 43 deletions.
2 changes: 1 addition & 1 deletion assets/styles/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $success: #00695c !default;
$info: $cyan !default;
$warning: $yellow !default;
$danger: #c62828 !default;
$light: $gray-100 !default;
$light: $white !default;
$dark: $gray-900 !default;

$min-contrast-ratio: 1.65 !default;
Expand Down
8 changes: 4 additions & 4 deletions templates/components/event_request_response_form.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
<img src="{{ eventRequest.owner.avatar }}" class=" border" height="50"/>
</div>
<div>
<div>{{ eventRequest.owner.fullName }}</div>
<div>{{ eventRequest.createdAt|format_datetime }}</div>
<div class="fw-bold">{{ eventRequest.owner.fullName }}</div>
<div>{{ eventRequest.createdAt|time_ago }}</div>
</div>
</div>
<a href="#" data-action="live#action" data-action-name="prevent|submit(isAttending=false)"
class="list-group-item border-0 border-start rounded-0 list-group-item-action text-center w-25">
<div class="bi bi-check-circle fs-4 text-primary"></div>
<div>{{ 'accept-request'|trans }}</div>
<div class="fw-bold">{{ 'accept-request'|trans|upper }}</div>
</a>
<a href="#" data-action="live#action" data-action-name="prevent|submit(isAttending=false)"
class="list-group-item border-0 border-start rounded-0 list-group-item-action text-center w-25">
<div class="bi bi-x-circle fs-4 text-danger"></div>
<div>{{ 'decline-request'|trans }}</div>
<div class="fw-bold">{{ 'decline-request'|trans|upper }}</div>
</a>
{% endif %}
</div>
4 changes: 2 additions & 2 deletions templates/events/index.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@
<div class="card-footer bg-white p-0">
<div class="btn-group w-100">
<a {{ stimulus_action('slider', 'previous', 'click') }}
class="btn w-100 btn-light bg-white rounded-0 previous bi bi-chevron-left fs-4"></a>
class="btn w-100 btn-light rounded-0 previous bi bi-chevron-left fs-4"></a>
<a {{ stimulus_action('slider', 'next', 'click') }}
class="btn w-100 btn-light bg-white rounded-0 next bi bi-chevron-right fs-4"></a>
class="btn w-100 btn-light rounded-0 next bi bi-chevron-right fs-4"></a>
</div>
</div>
</div>
Expand Down
66 changes: 34 additions & 32 deletions templates/events/show.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
{% endif %}
<div class="list-group-item d-flex justify-content-start align-items-center">
<div class="me-2">{{ event.startAt|format_date(timezone=regional.regionalSettingValueObject.timezone,pattern=day_date_pattern) }} </div>
<div>{{ event.startAt|format_time(timezone=regional.regionalSettingValueObject.timezone,pattern=time_pattern) }} - {{ event.endAt|format_time(timezone=regional.regionalSettingValueObject.timezone,pattern=time_pattern) }}</div>
<div>{{ event.startAt|format_time(timezone=regional.regionalSettingValueObject.timezone,pattern=time_pattern) }}
- {{ event.endAt|format_time(timezone=regional.regionalSettingValueObject.timezone,pattern=time_pattern) }}</div>
</div>
<div class="list-group-item d-flex d-flex justify-content-between align-items-center"
{{ stimulus_controller('clipboard', {
Expand Down Expand Up @@ -130,24 +131,7 @@
</div>
</div>

{% if app.user and not event.isAttending(app.user) and not event.isOrganiser(app.user) %}
{% if not event.requestedToAttend(app.user) %}
<div class="list-group">
<div class="list-group-item">
<a href="{{ path('event_rsvp_request', {id : event.id}) }}"
class="btn w-100 btn-primary">{{ 'request-to-attend'|trans }}</a>
</div>
</div>
{% else %}
<div class="list-group">
<div class="list-group-item text-center">
<div>{{ 'event-request-sent-explainer'|trans }}</div>
<a href="{{ path('cancel_event_rsvp_request', {id : event.attendRequest(app.user).id}) }}"
class="btn w-100 btn-outline-danger">{{ 'cancel-request'|trans }}</a>
</div>
</div>
{% endif %}
{% endif %}

</div>
<div class="col-12 col-md-6">

Expand Down Expand Up @@ -215,11 +199,11 @@
</div>
<div class="nav-item" role="presentation">
<button class="nav-link d-flex justify-content-between align-items-center"
id="requested-tab" data-bs-toggle="pill"
data-bs-target="#requested"
id="requests-tab" data-bs-toggle="pill"
data-bs-target="#requests"
type="button" role="tab" aria-controls="pills-requested"
aria-selected="true">
<span class="fw-bold me-3">{{ 'requested'|trans|capitalize }}</span>
<span class="fw-bold me-3">{{ 'requests'|trans|capitalize }}</span>
<span class="fw-bold badge rounded-pill text-bg-dark">{{ event.eventRequests.count|compact_notation }}</span>
</button>
</div>
Expand Down Expand Up @@ -311,19 +295,37 @@
{% endif %}
</div>
</div>
<div class="tab-pane fade" id="requested" role="tabpanel"
<div class="tab-pane fade" id="requests" role="tabpanel"
aria-labelledby="pills-home-tab"
tabindex="0">

<div class="list-group list-group-flush">
{% for request in event.eventRequests %}
<div class="list-group-item p-0">
{{ component('event_request_response_form', {
eventRequest: request
}) }}
</div>
{% else %}
<div class="list-group-item text-center text-muted">{{ 'no-requests'|trans }}</div>
{% endfor %}
{% if app.user and not event.isAttending(app.user) and not event.isOrganiser(app.user) %}
{% if not event.requestedToAttend(app.user) %}
<div class="list-group-item text-center">{{ 'request-explainer-text'|trans }}</div>
<div class="list-group-item">
<a href="{{ path('event_rsvp_request', {id : event.id}) }}"
class="btn w-100 btn-primary">{{ 'request-to-attend'|trans }}</a>
</div>
{% else %}
<div class="list-group-item text-center">{{ 'event-request-sent-explainer'|trans|capitalize }}</div>
<div class="list-group-item text-center">
<a href="{{ path('cancel_event_rsvp_request', {id : event.attendRequest(app.user).id}) }}"
class="btn w-100 btn-outline-danger">{{ 'cancel-request'|trans }}</a>
</div>
{% endif %}
{% endif %}
{% if app.user and event.isOrganiser(app.user) %}
{% for request in event.eventRequests %}
<div class="list-group-item p-0">
{{ component('event_request_response_form', {
eventRequest: request
}) }}
</div>
{% else %}
<div class="list-group-item text-center text-muted">{{ 'no-requests'|trans }}</div>
{% endfor %}
{% endif %}
</div>
</div>
{% endif %}
Expand Down
5 changes: 1 addition & 4 deletions templates/macro/group.macro.twig
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{% macro minCard(eventGroup) %}
<div class="card card-hover h-100">
<img class="object-fit-cover card-img-top" src="{{ eventGroup.base64Image }}"/>
<div class="card-body text-center">
{% if eventGroup.base64Image %}
<img class="border object-fit-cover mb-2" height="50" width="50"
src="{{ eventGroup.base64Image }}"/>
{% endif %}
<div class="fw-bold">{{ eventGroup.name }}</div>
</div>
<div class="card-body border-top text-center p-2">
Expand Down
6 changes: 6 additions & 0 deletions translations/messages+intl-icu.en.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,10 @@
'token-invitation-text' => 'Hey! Looks like you\'ve been invited to this event by { name } sign up up to let them know if you\'re going.',
'create-account-to-join-group' => 'sign up to join this group',
'sign-up' => 'sign up',
'cancel-request' => 'cancel request',
'accept-request' => 'accept',
'decline-request' => 'decline',
'request-to-attend' => 'request to join',
'requests' => 'requests',
'request-explainer-text' => 'Ask the event organiser if you can join their event.',
];

0 comments on commit db1ad45

Please sign in to comment.