Layoutchanges
This commit is contained in:
chrosey
parent
8cfa2762db
commit
a1f16c37f4
@ -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'
|
||||
});
|
||||
*/
|
||||
5
resources/assets/js/site.js
Normal file
5
resources/assets/js/site.js
Normal 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
12
resources/views/eintragung/create.blade.php
Normal 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
|
||||
@ -9,16 +9,14 @@
|
||||
</head>
|
||||
<body>
|
||||
@section('navbar')
|
||||
<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
|
||||
<div class="">
|
||||
<nav class="navbar navbar-toggleable-sm navbar-light bg-faded">
|
||||
<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>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">Dienstplanung</a>
|
||||
<a class="navbar-brand" href="/">Dienstplanung</a>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<ul class="navbar-nav mr-auto">
|
||||
|
||||
<ul class="navbar-nav ml-auto">
|
||||
@if(Auth::check())
|
||||
<li class="nav-item active">
|
||||
<a class="nav-link" href="{{ route('home') }}">Home <span class="sr-only">(current)</span></a>
|
||||
@ -28,23 +26,18 @@
|
||||
</li>
|
||||
@else
|
||||
<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 class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">Login</a>
|
||||
<a class="nav-link" href="{{ route('login') }}">Anmelden</a>
|
||||
</li>
|
||||
@endif
|
||||
</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>
|
||||
</nav>
|
||||
@show
|
||||
|
||||
<div class="container">
|
||||
<div class="container-fluid" id="content">
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
|
||||
@ -5,31 +5,31 @@
|
||||
<form method="POST" action="{{ route('veranstaltung.store') }}">
|
||||
<div class="row">
|
||||
<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>
|
||||
<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
|
||||
</div>
|
||||
<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 }}">
|
||||
<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<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>
|
||||
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
|
||||
</div>
|
||||
<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 : "" }}">
|
||||
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<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 or ""}}
|
||||
</textarea>
|
||||
|
||||
@ -6,31 +6,31 @@
|
||||
{!! method_field('put') !!}
|
||||
<div class="row">
|
||||
<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>
|
||||
<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
|
||||
</div>
|
||||
<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 }}">
|
||||
<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<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>
|
||||
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
|
||||
</div>
|
||||
<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') }}">
|
||||
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<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>
|
||||
<small id="hinweiseHelp" class="form-text text-muted">Hinweise zur Veranstalung</small>
|
||||
</div>
|
||||
|
||||
@ -4,28 +4,35 @@
|
||||
@section('content')
|
||||
<a class="btn btn-link" href="{{ route('veranstaltung.create') }}">Veranstaltung hinzufügen</a>
|
||||
|
||||
<table class="table">
|
||||
<table class="table-hover table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">Name</th>
|
||||
<th class="text-center">Datum</th>
|
||||
<th class="text-center">Zeit</th>
|
||||
<th class="text-center">Eingetragen</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
@foreach ($veranstaltungen as $v)
|
||||
<tr>
|
||||
<tr class="clickable-link" data-href="{{ route('veranstaltung.show', [$v]) }}">
|
||||
<td>{{ $v->name }}</td>
|
||||
<td>{{ $v->beginn->format('d.m.Y') }}</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">✔</span>
|
||||
@endif
|
||||
</td>
|
||||
<td class="row">
|
||||
<a class="btn btn-link m-0" href="{{ route('veranstaltung.show', [$v]) }}">Details</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>
|
||||
<a class="btn btn-link my-0 py-0" href="{{ route('veranstaltung.edit', [$v]) }}">Bearbeiten</a>
|
||||
|
||||
<form method="POST" action="{{ route('veranstaltung.destroy', $v) }}">
|
||||
{!! method_field('delete') !!}
|
||||
{!! 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>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -35,9 +35,11 @@
|
||||
</dt>
|
||||
<dd class="col-md-10">
|
||||
<ul>
|
||||
@foreach ($eintragungen as $eintrag)
|
||||
<li> {{ $eintrag->user_id OR "keiner"}}
|
||||
@endforeach
|
||||
@forelse ($eintragungen as $eintragung)
|
||||
<li> {{ $eintragung['user']['name'] }}
|
||||
@empty
|
||||
<p>Keine Eintragungen bisher</p>
|
||||
@endforelse
|
||||
</ul>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
@ -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');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user