chrosey/dienstplan
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Layoutchanges

Browse Source
This commit is contained in:
chrosey 2017-07-08 10:27:28 +02:00
parent 8cfa2762db
commit a1f16c37f4
9 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/app.js
View File

@ -3,7 +3,7 @@
* First we will load all of this project's JavaScript dependencies which * First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when * includes Vue and other libraries. It is a great starting point when
* building robust, powerful web applications using Vue and Laravel. * building robust, powerful web applications using Vue and Laravel.
*/
require('./bootstrap'); require('./bootstrap');
@ -13,10 +13,10 @@ window.Vue = require('vue');
* Next, we will create a fresh Vue application instance and attach it to * Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application * the page. Then, you may begin adding components to this application
* or customize the JavaScript scaffolding to fit your unique needs. * or customize the JavaScript scaffolding to fit your unique needs.
*/
Vue.component('example', require('./components/Example.vue')); Vue.component('example', require('./components/Example.vue'));
const app = new Vue({ const app = new Vue({
el: '#app' el: '#app'
}); });
*/

5
resources/assets/js/site.js Normal file
View File

@ -0,0 +1,5 @@
// Site.js
$("#content").on('click-row.bs.table', function(e, row, $element) {
window.location = $element.data('href');
});

12
resources/views/eintragung/create.blade.php Normal file
View File

@ -0,0 +1,12 @@
@extends('layouts.app')
@section('title', 'Neue Eintragung')
@section('content')
<form method="POST" action="{{ route('eintragung.store') }}">
<div class="row">
</div>
{!! csrf_field()!!}
<button type="submit" class="btn btn-primary">Submit</button>
</form>
@endsection

19
resources/views/layouts/app.blade.php
View File

@ -9,16 +9,14 @@
</head> </head>
<body> <body>
@section('navbar') @section('navbar')
<nav class="navbar navbar-toggleable-md navbar-light bg-faded"> <nav class="navbar navbar-toggleable-sm navbar-light bg-faded">
<div class="">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<a class="navbar-brand" href="#">Dienstplanung</a> <a class="navbar-brand" href="/">Dienstplanung</a>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav ml-auto">
@if(Auth::check()) @if(Auth::check())
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a> <a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a>
@ -28,23 +26,18 @@
</li> </li>
@else @else
<li class="nav-item active"> <li class="nav-item active">
<a class="nav-link" href="{{ route('register') }}">Register</a> <a class="nav-link" href="{{ route('register') }}">Registrieren</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">Login</a> <a class="nav-link" href="{{ route('login') }}">Anmelden</a>
</li> </li>
@endif @endif
</ul> </ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Suchen</button>
</form>
</div>
</div> </div>
</nav> </nav>
@show @show
<div class="container"> <div class="container-fluid" id="content">
@yield('content') @yield('content')
</div> </div>

10
resources/views/veranstaltung/create.blade.php
View File

@ -5,31 +5,31 @@
<form method="POST" action="{{ route('veranstaltung.store') }}"> <form method="POST" action="{{ route('veranstaltung.store') }}">
<div class="row"> <div class="row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<label for="name">Veranstaltungsname</label> <label class="col-form-label" for="name">Veranstaltungsname</label>
<input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required> <input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required>
<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small> <small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="gaeste">Anzahl der Gäste</label> <label class="col-form-label" for="gaeste">Anzahl der Gäste</label>
<input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste ?: 100 }}"> <input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste ?: 100 }}">
<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small> <small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="beginn">Veranstaltungsbeginn</label> <label class="col-form-label" for="beginn">Veranstaltungsbeginn</label>
<input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ \Carbon\Carbon::parse($beginn)->format('Y-m-d\TH:i:s') }}" required> <input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ \Carbon\Carbon::parse($beginn)->format('Y-m-d\TH:i:s') }}" required>
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small> <small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="ende">Veranstaltungsende</label> <label class="col-form-label" for="ende">Veranstaltungsende</label>
<input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ !empty($ende) ? $ende : "" }}"> <input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ !empty($ende) ? $ende : "" }}">
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small> <small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="Hinweise">Hinweise</label> <label class="col-form-label" for="Hinweise">Hinweise</label>
<textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3"> <textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3">
{{ $hinweise or ""}} {{ $hinweise or ""}}
</textarea> </textarea>

10
resources/views/veranstaltung/edit.blade.php
View File

@ -6,31 +6,31 @@
{!! method_field('put') !!} {!! method_field('put') !!}
<div class="row"> <div class="row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
<label for="name">Veranstaltungsname</label> <label class="col-form-label" for="name">Veranstaltungsname</label>
<input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required> <input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required>
<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small> <small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="gaeste">Anzahl der Gäste</label> <label class="col-form-label" for="gaeste">Anzahl der Gäste</label>
<input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste }}"> <input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste }}">
<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small> <small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="beginn">Veranstaltungsbeginn</label> <label class="col-form-label" for="beginn">Veranstaltungsbeginn</label>
<input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ (new \Carbon\Carbon($beginn))->format('Y-m-d\TH:i') }}" required> <input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ (new \Carbon\Carbon($beginn))->format('Y-m-d\TH:i') }}" required>
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small> <small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="ende">Veranstaltungsende</label> <label class="col-form-label" for="ende">Veranstaltungsende</label>
<input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ (new \Carbon\Carbon($ende))->format('Y-m-d\TH:i') }}"> <input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ (new \Carbon\Carbon($ende))->format('Y-m-d\TH:i') }}">
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small> <small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label for="Hinweise">Hinweise</label> <label class="col-form-label" for="Hinweise">Hinweise</label>
<textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3">{{ $hinweise }}</textarea> <textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3">{{ $hinweise }}</textarea>
<small id="hinweiseHelp" class="form-text text-muted">Hinweise zur Veranstalung</small> <small id="hinweiseHelp" class="form-text text-muted">Hinweise zur Veranstalung</small>
</div> </div>

19
resources/views/veranstaltung/index.blade.php
View File

@ -4,28 +4,35 @@
@section('content') @section('content')
<a class="btn btn-link" href="{{ route('veranstaltung.create') }}">Veranstaltung hinzufügen</a> <a class="btn btn-link" href="{{ route('veranstaltung.create') }}">Veranstaltung hinzufügen</a>
<table class="table"> <table class="table-hover table">
<thead> <thead>
<tr> <tr>
<th class="text-center">Name</th> <th class="text-center">Name</th>
<th class="text-center">Datum</th> <th class="text-center">Datum</th>
<th class="text-center">Zeit</th> <th class="text-center">Zeit</th>
<th class="text-center">Eingetragen</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@foreach ($veranstaltungen as $v) @foreach ($veranstaltungen as $v)
<tr> <tr class="clickable-link" data-href="{{ route('veranstaltung.show', [$v]) }}">
<td>{{ $v->name }}</td> <td>{{ $v->name }}</td>
<td>{{ $v->beginn->format('d.m.Y') }}</td> <td>{{ $v->beginn->format('d.m.Y') }}</td>
<td>{{ $v->beginn->format('H:i') }}</td> <td>{{ $v->beginn->format('H:i') }}</td>
<td class="text-center">
@if(!$v->ist_eingetragen)
<a class="btn btn-link my-0 py-0" href="{{ route('veranstaltung.enter', [$v]) }}">Eintragen</a>
@else
<span class="text-success">&#10004;</span>
@endif
</td>
<td class="row"> <td class="row">
<a class="btn btn-link m-0" href="{{ route('veranstaltung.show', [$v]) }}">Details</a> <a class="btn btn-link my-0 py-0" href="{{ route('veranstaltung.edit', [$v]) }}">Bearbeiten</a>
<a class="btn btn-link m-0" href="{{ route('veranstaltung.edit', [$v]) }}">Bearbeiten</a>
<a class="btn btn-link m-0" href="{{ route('veranstaltung.enter', [$v]) }}">Eintragen</a>
<form method="POST" action="{{ route('veranstaltung.destroy', $v) }}"> <form method="POST" action="{{ route('veranstaltung.destroy', $v) }}">
{!! method_field('delete') !!} {!! method_field('delete') !!}
{!! csrf_field() !!} {!! csrf_field() !!}
<button class="btn btn-link text-danger">Löschen</button> <button class="btn btn-link text-danger my-0 py-0">Löschen</button>
</form> </form>
</td> </td>
</tr> </tr>

8
resources/views/veranstaltung/show.blade.php
View File

@ -35,9 +35,11 @@
</dt> </dt>
<dd class="col-md-10"> <dd class="col-md-10">
<ul> <ul>
@foreach ($eintragungen as $eintrag) @forelse ($eintragungen as $eintragung)
<li> {{ $eintrag->user_id OR "keiner"}} <li> {{ $eintragung['user']['name'] }}
@endforeach @empty
<p>Keine Eintragungen bisher</p>
@endforelse
</ul> </ul>
</dd> </dd>
</dl> </dl>

7
webpack.mix.js
View File

@ -12,8 +12,9 @@ const { mix } = require('laravel-mix');
*/ */
mix.scripts([ mix.scripts([
'node_modules/jquery/dist/jquery.min.js', 'node_modules/jquery/dist/jquery.min.js',
'node_modules/bootstrap/dist/js/bootstrap.js', 'node_modules/tether/dist/js/tether.min.js',
'resources/assets/js/app.js' 'node_modules/bootstrap/dist/js/bootstrap.min.js'
'resources/assets/js/site.js'
], 'public/js/app.js') ], 'public/js/app.js')
.sass('resources/assets/sass/app.scss', 'public/css'); .sass('resources/assets/sass/app.scss', 'public/css');