Skip to content

Commit 70c86e9

Browse files
MrKrisKrisuMrKrisKrisu
authored
♻️ some html improvements / validations (#3572)
2 parents ea4853f + 6ec0761 commit 70c86e9

File tree

3 files changed

+64
-127
lines changed

3 files changed

+64
-127
lines changed

‎resources/views/dashboard.blade.php

Lines changed: 13 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,68 +6,11 @@
66
<div class="container">
77
<div class="row justify-content-center">
88
<div class="col-md-8 col-lg-7">
9-
@if(session()->has('checkin-collision'))
10-
<div class="alert alert-danger" id="checkin-collision-alert">
11-
<h2 class="fs-4">
12-
<i class="fa-solid fa-triangle-exclamation"></i>
13-
{{__('overlapping-checkin')}}
14-
</h2>
15-
16-
{{__('overlapping-checkin.description', ['lineName' => session()->get('checkin-collision')['lineName']])}}
17-
{{__('overlapping-checkin.description2')}}
18-
{{__('no-points-warning')}}
19-
20-
<hr/>
21-
22-
<form method="POST" action="{{route('trains.checkin')}}">
23-
@csrf
24-
<input type="hidden" name="force" value="true"/>
25-
<input type="hidden" name="tripID"
26-
value="{{session()->get('checkin-collision')['validated']['tripID']}}"/>
27-
<input type="hidden" name="start"
28-
value="{{session()->get('checkin-collision')['validated']['start']}}"/>
29-
<input type="hidden" name="departure"
30-
value="{{session()->get('checkin-collision')['validated']['departure']}}"/>
31-
<input type="hidden" name="destination"
32-
value="{{session()->get('checkin-collision')['validated']['destination']}}"/>
33-
<input type="hidden" name="arrival"
34-
value="{{session()->get('checkin-collision')['validated']['arrival']}}"/>
35-
<input type="hidden" name="body"
36-
value="{{session()->get('checkin-collision')['validated']['body'] ?? ''}}"/>
37-
<input type="hidden" name="business_check"
38-
value="{{session()->get('checkin-collision')['validated']['business_check']}}"/>
39-
<input type="hidden" name="checkinVisibility"
40-
value="{{session()->get('checkin-collision')['validated']['checkinVisibility']}}"/>
41-
@isset(session()->get('validated')['tweet_check'])
42-
<input type="hidden" name="tweet_check"
43-
value="{{session()->get('checkin-collision')['validated']['tweet_check']}}"/>
44-
@endif
45-
@isset(session()->get('validated')['toot_check'])
46-
<input type="hidden" name="toot_check"
47-
value="{{session()->get('checkin-collision')['validated']['toot_check']}}"/>
48-
@endif
49-
<input type="hidden" name="event"
50-
value="{{session()->get('checkin-collision')['validated']['event'] ?? ''}}"/>
51-
52-
<div class="d-grid gap-2">
53-
<button class="btn btn-success" type="submit">
54-
<i class="fa-solid fa-check"></i>
55-
{{__('overlapping-checkin.force-yes')}}
56-
</button>
57-
<button class="btn btn-secondary" type="button"
58-
onclick="$('#checkin-collision-alert').remove()">
59-
<i class="fa-solid fa-xmark"></i>
60-
{{__('overlapping-checkin.force-no')}}
61-
</button>
62-
</div>
63-
</form>
64-
</div>
65-
@endif
66-
679
<div id="station-board-new">
6810
<Apialerts></Apialerts>
6911
<Stationautocomplete :dashboard="true" :show-gps-button="true"></Stationautocomplete>
7012
</div>
13+
7114
@if($future->count() >= 1)
7215
<div class="accordion accordion-flush" id="accordionFutureCheckIns">
7316
<div class="accordion-item">
@@ -96,15 +39,15 @@ class="accordion-collapse collapse"
9639
@endif
9740

9841
@if(config('trwl.year_in_review.alert'))
99-
<div class="alert alert-info">
42+
<div class="alert alert-info" role="region" aria-label="{{ __('year-review') }}">
10043
<h4 class="alert-heading">
101-
<i class="fa-solid fa-champagne-glasses"></i>
102-
Träwelling {{__('year-review')}}
44+
<i class="fa-solid fa-champagne-glasses" aria-hidden="true"></i>
45+
Träwelling {{ __('year-review') }}
10346
</h4>
104-
<p>{{__('year-review.teaser')}}</p>
47+
<p>{{ __('year-review.teaser') }}</p>
10548
<a class="btn btn-outline-primary btn-block" href="/your-year/">
106-
<i class="fa-solid fa-arrow-pointer text-primary"></i>
107-
{{__('year-review.open')}}
49+
<i class="fa-solid fa-arrow-pointer text-primary" aria-hidden="true"></i>
50+
{{ __('year-review.open') }}
10851
</a>
10952
</div>
11053
@endif
@@ -113,14 +56,15 @@ class="accordion-collapse collapse"
11356
{{ $statuses->links() }}
11457

11558
@if($showGlobalButton)
116-
<div class="alert alert-info">
59+
<div class="alert alert-info" role="region" aria-label="{{ __('dashboard.empty') }}">
11760
<h4 class="alert-heading">
118-
<i class="fa-solid fa-binoculars"></i>
61+
<i class="fa-solid fa-binoculars" aria-hidden="true"></i>
11962
{{ __('dashboard.empty') }}
12063
</h4>
12164
<p>{{ __('dashboard.empty.teaser') }}</p>
122-
<p>{{ __('dashboard.empty.discover1') }}
123-
<a href="{{route('statuses.active')}}">
65+
<p>
66+
{{ __('dashboard.empty.discover1') }}
67+
<a href="{{ route('statuses.active') }}">
12468
{{ __('menu.active') }}
12569
</a>
12670
{{ __('dashboard.empty.discover3') }}.
@@ -133,4 +77,4 @@ class="accordion-collapse collapse"
13377
</div>
13478
</div>
13579
</div>
136-
@endsection
80+
@endsection

‎resources/views/includes/statuses.blade.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
@foreach($statuses as $status)
22
@if($showDates && ($loop->first || !$status->checkin->departure->isSameDay($statuses[$loop->index - 1]->checkin->departure)))
33
<h2 class="mb-2 fs-5">
4-
{{userTime($status->checkin->departure, __('dateformat.with-weekday'))}}
5-
@if(Route::is('profile') && $user->is(Auth::user()))
6-
<a href="{{route('stats.daily', ['dateString' => $status->checkin->departure->toDateString()])}}"
7-
class="text-trwl"
8-
>
4+
{{ userTime($status->checkin->departure, __('dateformat.with-weekday')) }}
5+
@if(Route::is('profile') && isset($user) && $user->is(Auth::user()))
6+
<a href="{{ route('stats.daily', ['dateString' => $status->checkin->departure->toDateString()]) }}"
7+
class="text-trwl" aria-label="{{ __('stats.daily') }}">
98
<i class="fa-solid fa-map-location-dot" aria-hidden="true"></i>
109
</a>
1110
@endif

0 commit comments

Comments
 (0)