diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index c1620c1b..f028e2c5 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -3,7 +3,7 @@ * First we will load all of this project's JavaScript dependencies which * includes Vue and other libraries. It is a great starting point when * building robust, powerful web applications using Vue and Laravel. - */ + require('./bootstrap'); @@ -13,10 +13,10 @@ window.Vue = require('vue'); * Next, we will create a fresh Vue application instance and attach it to * the page. Then, you may begin adding components to this application * or customize the JavaScript scaffolding to fit your unique needs. - */ Vue.component('example', require('./components/Example.vue')); const app = new Vue({ el: '#app' }); +*/ \ No newline at end of file diff --git a/resources/assets/js/site.js b/resources/assets/js/site.js new file mode 100644 index 00000000..0d18927a --- /dev/null +++ b/resources/assets/js/site.js @@ -0,0 +1,5 @@ +// Site.js + +$("#content").on('click-row.bs.table', function(e, row, $element) { + window.location = $element.data('href'); +}); \ No newline at end of file diff --git a/resources/views/eintragung/create.blade.php b/resources/views/eintragung/create.blade.php new file mode 100644 index 00000000..34ff8c9a --- /dev/null +++ b/resources/views/eintragung/create.blade.php @@ -0,0 +1,12 @@ +@extends('layouts.app') +@section('title', 'Neue Eintragung') + +@section('content') +
+
+
+ + {!! csrf_field()!!} + +
+@endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d19e87fa..ab5fc9c8 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -9,16 +9,14 @@ @section('navbar') - @show -
+
@yield('content')
diff --git a/resources/views/veranstaltung/create.blade.php b/resources/views/veranstaltung/create.blade.php index 4b048241..38c00bc1 100644 --- a/resources/views/veranstaltung/create.blade.php +++ b/resources/views/veranstaltung/create.blade.php @@ -5,31 +5,31 @@
- + Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.
- + Die ungefähre Anzahl an Gästen zur Veranstaltung
- + Der Zeitpunkt, an dem die Veranstaltung beginnt.
- + Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)
- + diff --git a/resources/views/veranstaltung/edit.blade.php b/resources/views/veranstaltung/edit.blade.php index bdfba76f..98fa8cdf 100644 --- a/resources/views/veranstaltung/edit.blade.php +++ b/resources/views/veranstaltung/edit.blade.php @@ -6,31 +6,31 @@ {!! method_field('put') !!}
- + Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.
- + Die ungefähre Anzahl an Gästen zur Veranstaltung
- + Der Zeitpunkt, an dem die Veranstaltung beginnt.
- + Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)
- + Hinweise zur Veranstalung
diff --git a/resources/views/veranstaltung/index.blade.php b/resources/views/veranstaltung/index.blade.php index 727a5e21..ae7946d7 100644 --- a/resources/views/veranstaltung/index.blade.php +++ b/resources/views/veranstaltung/index.blade.php @@ -4,28 +4,35 @@ @section('content') Veranstaltung hinzufügen - +
+ @foreach ($veranstaltungen as $v) - + + diff --git a/resources/views/veranstaltung/show.blade.php b/resources/views/veranstaltung/show.blade.php index 619511f6..1e4b77a3 100644 --- a/resources/views/veranstaltung/show.blade.php +++ b/resources/views/veranstaltung/show.blade.php @@ -35,9 +35,11 @@
    - @foreach ($eintragungen as $eintrag) -
  • {{ $eintrag->user_id OR "keiner"}} - @endforeach + @forelse ($eintragungen as $eintragung) +
  • {{ $eintragung['user']['name'] }} + @empty +

    Keine Eintragungen bisher

    + @endforelse
diff --git a/webpack.mix.js b/webpack.mix.js index e4d1751a..26571654 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -12,8 +12,9 @@ const { mix } = require('laravel-mix'); */ mix.scripts([ - 'node_modules/jquery/dist/jquery.min.js', - 'node_modules/bootstrap/dist/js/bootstrap.js', - 'resources/assets/js/app.js' + 'node_modules/jquery/dist/jquery.min.js', + 'node_modules/tether/dist/js/tether.min.js', + 'node_modules/bootstrap/dist/js/bootstrap.min.js' + 'resources/assets/js/site.js' ], 'public/js/app.js') .sass('resources/assets/sass/app.scss', 'public/css');
Name Datum ZeitEingetragen
{{ $v->name }} {{ $v->beginn->format('d.m.Y') }} {{ $v->beginn->format('H:i') }} + @if(!$v->ist_eingetragen) + Eintragen + @else + ✔ + @endif + - Details - Bearbeiten - Eintragen + Bearbeiten + {!! method_field('delete') !!} {!! csrf_field() !!} - +