aboutsummaryrefslogtreecommitdiff
path: root/resources/views
diff options
context:
space:
mode:
authorMateja Marić <mail@matejamaric.com>2021-03-22 15:21:40 +0100
committerGitHub <noreply@github.com>2021-03-22 15:21:40 +0100
commit6ab102bc4be617255d5eab77faebb1cada65b370 (patch)
tree09fcff5953cc6ca3702335e717ca72f865124d1c /resources/views
parent21e9e94e76a21516edc3d1e4d0462a0ba75aafa4 (diff)
parentdb976a9fb0434df0095ea9f1b8858213d57e7535 (diff)
downloadyota-laravel-master.tar.gz
yota-laravel-master.zip
Merge pull request #4 from MatejaMaric/use-vueHEADv2.0.0master
Use Vue.js and Vuex.
Diffstat (limited to 'resources/views')
-rw-r--r--resources/views/layouts/app.blade.php3
-rw-r--r--resources/views/pages/activities.blade.php25
-rw-r--r--resources/views/pages/reservations.blade.php94
-rw-r--r--resources/views/pages/reserve.blade.php17
4 files changed, 7 insertions, 132 deletions
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 79235ac..0a8bbda 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="stylesheet" href="{{ mix('css/app.css') }}" type="text/css">
@yield('styles')
<title>YOTA - @yield('title')</title>
@@ -10,7 +11,7 @@
<body>
@yield('navbar', View::make('inc.navbar'))
@yield('jumbotron')
- <div class="container pt-3">
+ <div id="vue" class="container pt-3">
@yield('content')
</div>
<script src="{{ mix('js/manifest.js') }}"></script>
diff --git a/resources/views/pages/activities.blade.php b/resources/views/pages/activities.blade.php
index 7e7a0ed..275431a 100644
--- a/resources/views/pages/activities.blade.php
+++ b/resources/views/pages/activities.blade.php
@@ -5,30 +5,7 @@
@section('navbar', View::make('inc.navbar'))
@section('content')
-<input type="hidden" name="csrf-token" content="{{ csrf_token() }}">
-<label for="call-sign">Filter by special callsign: </label>
-<select id="call-sign">
- <option value="all">All</option>
- @if (count($signs) > 0)
- @foreach ($signs as $sign)
- <option value="{{ $sign->sign }}">{{ $sign->sign }}</option>
- @endforeach
- @endif
-</select>
-<div id="sign-desc-div"></div>
+<activities-view></activities-view>
-<div class="table-responsive mt-2">
- <table id="ajax-table" class="table table-striped table-bordered" style="white-space:nowrap;">
- <thead class="thead-dark">
- <tr><th>Operator</th><th>From</th><th>To</th><th>Special Callsign</th><th>Frequencies</th><th>Modes</th><th>QSO</th></tr>
- </thead>
- <tbody>
- </tbody>
- </table>
-</div>
@endsection()
-
-@section('scripts')
- <script src="{{ asset('js/activities.js') }}"></script>
-@endsection
diff --git a/resources/views/pages/reservations.blade.php b/resources/views/pages/reservations.blade.php
index addc9a9..475e5d7 100644
--- a/resources/views/pages/reservations.blade.php
+++ b/resources/views/pages/reservations.blade.php
@@ -4,98 +4,6 @@
@section('navbar', View::make('inc.navbar'))
-@section('scripts')
- <script src="{{ asset('js/reservations.js') }}"></script>
-@endsection
-
@section('content')
-<input type="hidden" name="csrf-token" content="{{ csrf_token() }}">
-<label for="call-sign">Filter by special callsign: </label>
-<select id="call-sign">
- <option value="all">All</option>
- @if (count($signs) > 0)
- @foreach ($signs as $sign)
- <option value="{{ $sign->sign }}">{{ $sign->sign }}</option>
- @endforeach
- @endif
-</select>
-<div id="notice" class="float-right font-weight-bold"></div>
-
-<div class="table-responsive mt-2">
- <table id="ajax-table" class="table table-striped table-bordered" style="white-space:nowrap;"><!-- table-hover -->
- <thead class="thead-dark">
- <tr>
- <th>ID</th>
- <th>Approved</th>
- <th>Operator Callsign</th>
- <th>QSO</th>
- <th>From</th>
- <th>To</th>
- <th>Special Callsign</th>
- <th>Frequencies</th>
- <th>Modes</th>
- <th>Operator Name</th>
- <th>Operator Email</th>
- <th>Operator Phone</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
-</div>
-{{--@if (count($data) > 0)--}}
-{{--<div class="table-responsive">--}}
- {{--<table class="table table-striped table-bordered" style="white-space:nowrap;"><!-- table-hover -->--}}
- {{--<thead class="thead-dark">--}}
- {{--<tr>--}}
- {{--<th>ID</th>--}}
- {{--<th>Approved</th>--}}
- {{--<th>Operator Callsign</th>--}}
- {{--<th>QSO</th>--}}
- {{--<th>From</th>--}}
- {{--<th>To</th>--}}
- {{--<th>Frequencies</th>--}}
- {{--<th>Modes</th>--}}
- {{--<th>Special Callsign</th>--}}
- {{--<th>Operator Name</th>--}}
- {{--<th>Operator Email</th>--}}
- {{--<th>Operator Phone</th>--}}
- {{--<th>Actions</th>--}}
- {{--</tr>--}}
- {{--</thead>--}}
- {{--<tbody>--}}
- {{--@foreach ($data as $row)--}}
- {{--<tr>--}}
- {{--<td class="align-middle">{{ $row->id }}</td>--}}
- {{--@if ($row->approved)--}}
- {{--<td class="align-middle"><input type="checkbox" checked></td> --}}
- {{--@else--}}
- {{--<td class="align-middle"><input type="checkbox"></td> --}}
- {{--@endif--}}
- {{--<td class="align-middle">{{ $row->operatorCall }}</td>--}}
- {{--<td class="align-middle">{{ $row->qso }}</td>--}}
- {{--<td class="align-middle">{{ $row->fromTime }}</td>--}}
- {{--<td class="align-middle">{{ $row->toTime }}</td>--}}
- {{--<td class="align-middle">{{ $row->frequencies }}</td>--}}
- {{--<td class="align-middle">{{ $row->modes }}</td>--}}
- {{--<td class="align-middle">{{ $row->specialCall }}</td>--}}
- {{--<td class="align-middle">{{ $row->operatorName }}</td>--}}
- {{--<td class="align-middle">{{ $row->operatorEmail }}</td>--}}
- {{--<td class="align-middle">{{ $row->operatorPhone }}</td>--}}
- {{--<td>--}}
- {{--<button class="btn btn-primary">Update</button>--}}
- {{--<button class="btn btn-warning">Restore</button>--}}
- {{--<button class="btn btn-danger">Delete</button>--}}
- {{--</td>--}}
- {{--</tr>--}}
- {{--@endforeach--}}
- {{--</tbody>--}}
- {{--</table>--}}
-{{--</div>--}}
-{{--@else--}}
-{{--<div class="text-center">--}}
- {{--<strong>There are currently no reservations.</strong>--}}
-{{--</div>--}}
-{{--@endif--}}
+ <reservations-view></reservations-view>
@endsection()
diff --git a/resources/views/pages/reserve.blade.php b/resources/views/pages/reserve.blade.php
index 823e8b9..17cab9a 100644
--- a/resources/views/pages/reserve.blade.php
+++ b/resources/views/pages/reserve.blade.php
@@ -17,24 +17,14 @@
@endif
<form action="{{ route('reserve') }}" method="POST">
@csrf
+
<!-- SPECIAL CALL -->
-<div class="form-group">
- <label for="special-call">Special Callsign:</label>
- <select class="form-control @error('scall') is-invalid @enderror" id="special-call" name="scall" required>
- @foreach ($signs as $sign)
- <option value="{{ $sign->sign }}" {{ old('scall') == $sign->sign ? 'selected' : '' }}>{{ $sign->sign }}</option>
- @endforeach
- </select>
+ <call-sign-description name="scall" old="{{ old('scall') }}" @error('scall') is-invalid="true" @enderror >
+ </call-sign-description>
@error('scall')
<div class="alert alert-danger mt-2">{{ $message }}</div>
@enderror
-</div>
-<div class="card mb-3">
- <div class="card-body pb-1">
- <div class="card-text" id="call-desc"></div>
- </div>
-</div>
@error('time')
<div class="alert alert-danger mt-2">{{ $message }}</div>
@@ -163,5 +153,4 @@
format: 'H:i'
});
</script>
- <script src="{{ asset('js/reserve.js') }}"></script>
@endsection