vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	skolehjem/app/Notifications/PushNews.php
This commit is contained in:
Neerholt 2021-05-10 12:18:21 +02:00
parent 3908a6b00c 4e8e2831da
commit d1b083bae1
21 changed files with 102 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skolehjem/app/Http/Controllers/EventController.php
View File

@ -162,7 +162,6 @@ class EventController extends Controller
*/ */
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
$data = $request->all(); $data = $request->all();
$event = Event::find($id); $event = Event::find($id);

24
skolehjem/app/Http/Controllers/RootController.php
View File

@ -4,10 +4,12 @@ namespace App\Http\Controllers;
use App\Event; use App\Event;
use App\Guide; use App\Guide;
use App\MultipleEvents;
use App\MultipleEventsParent; use App\MultipleEventsParent;
use App\News; use App\News;
use App\Resource; use App\Resource;
use App\User; use App\User;
use App\WashingReservation;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\File;
@ -45,6 +47,28 @@ class RootController extends Controller
} else } else
File::makeDirectory(public_path('uploads'), 0777, true, true); File::makeDirectory(public_path('uploads'), 0777, true, true);
// Delete events, reservations, news and multiple events (not parent) - If they have been in the DB too long
$deleteevents = Event::where('date', '<', date("Y-m-d H:i:s", strtotime("-1 month")))->get();
$deletereservations = WashingReservation::where('time', '<', date("Y-m-d H:i:s", strtotime("-1 hour")))->get();
$deletenews = News::where('news_expiration_date', '<', date("Y-m-d H:i:s"))->get();
$deletemultievent = MultipleEvents::where('date', '<', strtotime("-1 month"))->get();
foreach ($deleteevents as $event) {
$event->delete();
}
foreach ($deletereservations as $reservation) {
$reservation->delete();
}
foreach ($deletenews as $new) {
$new->delete();
}
foreach ($deletemultievent as $multievent) {
$multievent->delete();
}
//All news //All news
$newsCollection = News::query()->orderBy('id', 'desc')->get(); $newsCollection = News::query()->orderBy('id', 'desc')->get();

4
skolehjem/app/Notifications/PushNews.php
View File

@ -33,9 +33,9 @@ class PushNews extends Notification
return (new WebPushMessage) return (new WebPushMessage)
->title('Ny Nyhed') ->title('Ny Nyhed')
->icon('/images/icons/appIcon.svg') ->icon('/images/icons/appIcon.svg')
->body('Der er kommet en ny nyhed i ekapp\'en')
->badge('/images/icons/appIcon.svg')
->vibrate([100, 200, 100, 200, 300]) ->vibrate([100, 200, 100, 200, 300])
->body('Der er en ny nyhed i ekapp\'en')
->badge('/images/icons/appIcon.png')
->action('Klik her for at se nyheder', route('root.index')); ->action('Klik her for at se nyheder', route('root.index'));
} }

10
skolehjem/resources/views/admin/contacts/create.blade.php
View File

@ -21,15 +21,15 @@
<form name="contact" method="post" action="{{ route("contacts.store") }}"> <form name="contact" method="post" action="{{ route("contacts.store") }}">
@csrf @csrf
<label for="contactname">Kontakt Navn:</label> <label for="contactname">Kontakt Navn:</label>
<input type="text" name="contactname" id="contactname" placeholder="Navn" maxlength="255" required> <input type="text" name="contactname" id="contactname" placeholder="Navn" value="{{ old('contactname') }}" maxlength="255" required>
<label for="title">Titel:</label> <label for="title">Titel:</label>
<input type="text" name="title" id="title" placeholder="Titel" maxlength="255" required> <input type="text" name="title" id="title" placeholder="Titel" value="{{ old('title') }}" maxlength="255" required>
<label for="email">Email:</label> <label for="email">Email:</label>
<input type="email" name="email" id="email" placeholder="x@y.z" maxlength="255" required> <input type="email" name="email" id="email" placeholder="x@y.z" value="{{ old('email') }}" maxlength="255" required>
<label for="tel">Telefon nr:</label> <label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" maxlength="8" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}"> <input type="tel" name="phone" id="tel" placeholder="12345678" maxlength="8" value="{{ old('phone') }}" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}">
<label for="teltimes">Telefon tider: (Forblives blank, hvis der ikke er nogen bestemte tider) - Brug Shift+Enter for at teksten vises lige neden under hinanden på hjemmesiden</label> <label for="teltimes">Telefon tider: (Forblives blank, hvis der ikke er nogen bestemte tider) - Brug Shift+Enter for at teksten vises lige neden under hinanden på hjemmesiden</label>
<textarea name="phonetimes" id="editor"></textarea> <textarea name="phonetimes" id="editor">{!! old('phonetimes') !!}</textarea>
<input type="submit" class="btn btn-dark text-white" value="Opret"> <input type="submit" class="btn btn-dark text-white" value="Opret">
</form> </form>

10
skolehjem/resources/views/admin/contacts/edit.blade.php
View File

@ -22,15 +22,15 @@
@csrf @csrf
@method("put") @method("put")
<label for="contactname">Kontakt Navn:</label> <label for="contactname">Kontakt Navn:</label>
<input type="text" name="contactname" id="contactname" placeholder="Navn" value="{{ $contact->contactname }}" required> <input type="text" name="contactname" id="contactname" placeholder="Navn" value="{{ old('contactname', $contact->contactname) }}" required>
<label for="title">Titel:</label> <label for="title">Titel:</label>
<input type="text" name="title" id="title" placeholder="Titel" value="{{ $contact->title }}" required> <input type="text" name="title" id="title" placeholder="Titel" value="{{ old('title', $contact->title) }}" required>
<label for="email">Email:</label> <label for="email">Email:</label>
<input type="email" name="email" id="email" placeholder="x@y.z" value="{{ $contact->email }}" required> <input type="email" name="email" id="email" placeholder="x@y.z" value="{{ old('email', $contact->email) }}" required>
<label for="tel">Telefon nr:</label> <label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" value="{{ $contact->phone }}" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}"> <input type="tel" name="phone" id="tel" placeholder="12345678" value="{{ old('phone', $contact->phone) }}" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}">
<label for="teltimes">Telefon tider: (Forblives blank, hvis der ikke er nogen bestemte tider) - Brug Shift+Enter for at teksten vises lige neden under hinanden på hjemmesiden</label> <label for="teltimes">Telefon tider: (Forblives blank, hvis der ikke er nogen bestemte tider) - Brug Shift+Enter for at teksten vises lige neden under hinanden på hjemmesiden</label>
<textarea name="phonetimes" id="editor">{{ $contact->phonetimes }}</textarea> <textarea name="phonetimes" id="editor">{{ old('phonetimes', $contact->phonetimes) }}</textarea>
<input type="submit" class="btn btn-dark text-white" value="Rediger"> <input type="submit" class="btn btn-dark text-white" value="Rediger">
</form> </form>

10
skolehjem/resources/views/admin/events/create.blade.php
View File

@ -28,15 +28,15 @@
@csrf @csrf
<label for="name">Aktivitet Navn:</label> <label for="name">Aktivitet Navn:</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label> <label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input type="text" name="name" id="name" max="60" maxlength="255" required> <input type="text" name="name" id="name" max="60" maxlength="255" value="{{ old('name') }}" required>
<label for="accountable">Aktivitet Ansvarlig:</label> <label for="accountable">Aktivitet Ansvarlig:</label>
<input type="text" name="accountable" id="accountable" maxlength="255" required> <input type="text" name="accountable" id="accountable" maxlength="255" value="{{ old('accountable') }}" required>
<label for="description">Aktivitet Beskrivelse:</label> <label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere teksten du vil lave op til et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere teksten du vil lave op til et link først.</small>
<div id="editor"></div> <div id="editor">{!! old('description') !!}</div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea> <textarea name="description" class="d-none" id="hiddenArea">{{ old('description') }}</textarea>
<label for="date">Aktivitets dato:</label> <label for="date">Aktivitets dato:</label>
<input type="datetime-local" name="date" id="date" required> <input type="datetime-local" name="date" id="date" value="{{ old('date') }}" required>
<label class="toggle"> <label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption"> <input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label"> <span class="toggle__label">

10
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -29,17 +29,17 @@
@method("PUT") @method("PUT")
<label for="name">Aktivitet Navn:</label> <label for="name">Aktivitet Navn:</label>
<label hidden id="error" for="errormesseages">Dette Aktivitet navn findes allerede</label> <label hidden id="error" for="errormesseages">Dette Aktivitet navn findes allerede</label>
<input value="{{$event->name}}" type="text" name="name" id="name" required> <input value="{{ old('name', $event->name)}}" type="text" name="name" id="name" required>
<label for="accountable">Aktivitet Ansvarlig:</label> <label for="accountable">Aktivitet Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required> <input value="{{ old('accountable', $event->accountable) }}" type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label> <label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $event->description !!}</div> <div id="editor">{!! old( 'description', $event->description) !!}</div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea> <textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet Dato:</label> <label for="date">Aktivitet Dato:</label>
<input value="{{ strftime("%Y-%m-%dT%H:%M:%S", strtotime($event->date)) }}" type="datetime-local" name="date" id="date" required> <input value="{{ strftime("%Y-%m-%dT%H:%M:%S", strtotime(old('date', $event->date))) }}" type="datetime-local" name="date" id="date" required>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede (Forbliv tom hvis billede ikke skal ændres):</label> <label id="fileuploadee"for="fileuploade">Baggrundsbillede (Forbliv tom hvis billede ikke skal ændres):</label>
<input id="fileuploade" type="file" name="resource" accept="image/*" value="{{$event->resource_id}}"> <input id="fileuploade" type="file" name="resource" accept="image/*" value="{{ $event->resource_id }}">
<label class="toggle"> <label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption"> <input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label"> <span class="toggle__label">

2
skolehjem/resources/views/admin/guides-category/create.blade.php
View File

@ -15,7 +15,7 @@
@csrf @csrf
<label for="name">Kategoriens navn:</label> <label for="name">Kategoriens navn:</label>
<label hidden id="error" for="errormesseages">Kategorien findes allerede</label> <label hidden id="error" for="errormesseages">Kategorien findes allerede</label>
<input type="text" name="guidesCategoryName" id="name" placeholder="Ankomst" maxlength="255" required> <input type="text" name="guidesCategoryName" id="name" placeholder="Ankomst" maxlength="255" value="{{ old('guidesCategoryName') }}" required>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret kategori"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret kategori">
</form> </form>
@endsection @endsection

2
skolehjem/resources/views/admin/guides-category/edit.blade.php
View File

@ -16,7 +16,7 @@
@method("put") @method("put")
<label for="name">Kategori navn:</label> <label for="name">Kategori navn:</label>
<label hidden id="error" for="errormesseages">Kategorien findes allerede</label> <label hidden id="error" for="errormesseages">Kategorien findes allerede</label>
<input type="text" name="guidesCategoryName" id="guidesCategoryName" value="{{ $guideCategory->guidesCategoryName }}" required> <input type="text" name="guidesCategoryName" id="guidesCategoryName" value="{{ old('guidesCategoryName', $guideCategory->guidesCategoryName) }}" required>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
</form> </form>
@endsection @endsection

6
skolehjem/resources/views/admin/guides/create.blade.php
View File

@ -29,7 +29,7 @@
@csrf @csrf
<label for="title">Titel på guiden</label> <label for="title">Titel på guiden</label>
<label hidden id="error" for="errormesseages">Navn findes allerede</label> <label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input type="text" name="name" id="title" maxlength="255"required> <input type="text" name="name" id="title" maxlength="255" value="{{ old('name') }}" required>
<div id="selectDiv"> <div id="selectDiv">
<select name="guide_category_id" id="guidesCategory" required> <select name="guide_category_id" id="guidesCategory" required>
<option disabled selected value> -- Vælg en kategori -- </option> <option disabled selected value> -- Vælg en kategori -- </option>
@ -41,7 +41,7 @@
</div> </div>
<label for="editor">Vejledning</label> <label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div> <div id="editor"> {!! old('guide_articles') !!}</div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea> <textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label class="toggle"> <label class="toggle">
<input id="isNews" class="toggle__input" type="checkbox" name="newsoption" onclick="change()"> <input id="isNews" class="toggle__input" type="checkbox" name="newsoption" onclick="change()">
@ -51,7 +51,7 @@
</label> </label>
<div class="form-group d-flex flex-column" id="delete_event"> <div class="form-group d-flex flex-column" id="delete_event">
<label for="date">Dato til når nyheden skal slettes (valgfri):</label> <label for="date">Dato til når nyheden skal slettes (valgfri):</label>
<input type="datetime-local" name="news_expiration_date" id="date"> <input type="datetime-local" name="news_expiration_date" id="date" value="{{ old('news_expiration_date') }}">
</div> </div>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label> <label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
<input id="fileuploade" type="file" name="resource" accept="image/*"> <input id="fileuploade" type="file" name="resource" accept="image/*">

4
skolehjem/resources/views/admin/guides/edit.blade.php
View File

@ -29,7 +29,7 @@
@method("PUT") @method("PUT")
<label for="title">Navn</label> <label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Navn findes allerede</label> <label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input value="{{$guide->name}}" type="text" name="name" id="title" required> <input value="{{ old('name', $guide->name)}}" type="text" name="name" id="title" required>
<div> <div>
<select name="guide_category_id" id="guidesCategory" required> <select name="guide_category_id" id="guidesCategory" required>
<option disabled selected value> -- Vælg en kategori -- </option> <option disabled selected value> -- Vælg en kategori -- </option>
@ -45,7 +45,7 @@
</div> </div>
<label for="editor">Vejledning</label> <label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $guide->guide_articles !!}</div> <div id="editor">{!! old('guide_articles', $guide->guide_articles) !!}</div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea> <textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede (Forbliv tom hvis billede ikke skal ændres):</label> <label id="fileuploadee"for="fileuploade">Baggrundsbillede (Forbliv tom hvis billede ikke skal ændres):</label>
<input id="fileuploade" type="file" name="resource" accept="image/*" value="{{$guide->resource_id}}"> <input id="fileuploade" type="file" name="resource" accept="image/*" value="{{$guide->resource_id}}">

2
skolehjem/resources/views/admin/locations/create.blade.php
View File

@ -15,7 +15,7 @@
@csrf @csrf
<label for="name">Lokationsnavn:</label> <label for="name">Lokationsnavn:</label>
<label hidden id="error" for="errormesseages">Lokation findes allerede</label> <label hidden id="error" for="errormesseages">Lokation findes allerede</label>
<input type="text" name="name" id="name" placeholder="Bygning A" maxlength="255" required> <input type="text" name="name" id="name" placeholder="Bygning A" value="{{ old('name') }}" maxlength="255" required>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form> </form>
@endsection @endsection

2
skolehjem/resources/views/admin/locations/edit.blade.php
View File

@ -16,7 +16,7 @@
@method("put") @method("put")
<label for="name">Lokationsnavn:</label> <label for="name">Lokationsnavn:</label>
<label hidden id="error" for="errormesseages">Lokation findes allerede</label> <label hidden id="error" for="errormesseages">Lokation findes allerede</label>
<input type="text" name="name" id="name" value="{{ $location->name }}" required> <input type="text" name="name" id="name" value="{{ old('name', $location->name) }}" required>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
</form> </form>
@endsection @endsection

10
skolehjem/resources/views/admin/menuplans/create.blade.php
View File

@ -27,15 +27,15 @@
@csrf @csrf
<label for="week">Uge nr.</label> <label for="week">Uge nr.</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label> <label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" placeholder="1" maxlength="2" required> <input type="number" name="week" id="week" min="1" max="53" placeholder="1" value="{{ old('week') }}" maxlength="2" required>
<label for="monday">Mandag:</label> <label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" maxlength="250" required> <input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" value="{{ old('monday') }}" maxlength="250" required>
<label for="tuesday">Tirsdag:</label> <label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" maxlength="250" required> <input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" value="{{ old('tuesday') }}" maxlength="250" required>
<label for="wednesday">Onsdag:</label> <label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" maxlength="250" required> <input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" value="{{ old('wednesday') }}" maxlength="250" required>
<label for="thursday">Torsdag:</label> <label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" maxlength="250" required> <input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" value="{{ old('thursday') }}" maxlength="250" required>
<label class="toggle"> <label class="toggle">
<input class="toggle__input" id="isNews" type="checkbox" name="newsoption" onclick="change()"> <input class="toggle__input" id="isNews" type="checkbox" name="newsoption" onclick="change()">
<span class="toggle__label"> <span class="toggle__label">

10
skolehjem/resources/views/admin/menuplans/edit.blade.php
View File

@ -28,15 +28,15 @@
@method("PUT") @method("PUT")
<label for="mandag">Uge:</label> <label for="mandag">Uge:</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label> <label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required> <input type="number" name="week" id="week" min="1" max="53" value="{{ old('week', $menuplan->week) }}" required>
<label for="monday">Mandag:</label> <label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required value="{{ $menuplan->monday }}"> <input type="text" name="monday" id="monday" placeholder="Hawaii Pizza" required value="{{ old('monday', $menuplan->monday) }}">
<label for="tuesday">Tirsdag:</label> <label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required value="{{ $menuplan->tuesday }}"> <input type="text" name="tuesday" id="tuesday" placeholder="Pasta Bolognese" required value="{{ old('tuesday', $menuplan->tuesday) }}">
<label for="wednesday">Onsdag:</label> <label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required value="{{ $menuplan->wednesday }}"> <input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required value="{{ old('wednesday', $menuplan->wednesday) }}">
<label for="thursday">Torsdag:</label> <label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required value="{{ $menuplan->thursday }}"> <input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required value="{{ old('thursday', $menuplan->thursday) }}">
<label class="toggle"> <label class="toggle">
<input class="toggle__input" type="checkbox" name="newsoption"> <input class="toggle__input" type="checkbox" name="newsoption">
<span class="toggle__label"> <span class="toggle__label">

30
skolehjem/resources/views/admin/multiple-events/create.blade.php
View File

@ -37,10 +37,12 @@
</style> </style>
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet"> <link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1 id="errormesseages" >Opret ugentligt aktivitet: [Vi er i uge <?php echo date('W'); ?>]</h1> <h1 id="errormesseages" >Opret ugentligt aktivitet: [Vi er i uge <?php echo date('W'); ?>]</h1>
<form method="post" action="{{ route("multiple-events.store") }}" enctype="multipart/form-data"> <form method="post" action="{{ route("multiple-events.store") }}" enctype="multipart/form-data">
<!--datetime-local--> <!--datetime-local-->
@csrf @csrf
<input type="number" name="week" placeholder="Uge" maxlength="2" max="53" required> <input type="number" name="week" placeholder="Uge" maxlength="2" value="{{ old('week') }}" max="53" required>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label> <label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label>
<input id="fileuploade" type="file" name="resource" accept="image/*"> <input id="fileuploade" type="file" name="resource" accept="image/*">
<table id="table"> <table id="table">
@ -51,13 +53,25 @@
<th>Tidsrum (Start)</th> <th>Tidsrum (Start)</th>
<th><button type="button" class="btn btn-inline btn-sde-blue" id="add2">Tilføj Række</button></th> <th><button type="button" class="btn btn-inline btn-sde-blue" id="add2">Tilføj Række</button></th>
</tr> </tr>
<tr> @if (!empty(old('name')))
<td><input type="text" name="name[]" maxlength="255"></td> @for ($i = 0; $i < count(old('name')); $i++)
<td><input type="text" name="description[]"></td> <tr>
<td><input type="text" name="accountable[]" maxlength="255"></td> <td><input type="text" name="name[]" value="{{ old('name.'.$i) }}" maxlength="255"></td>
<td><input type="datetime-local" name="date[]"></td> <td><input type="text" name="description[]" value="{{ old('description.'.$i) }}"></td>
<td><button type="button" onclick="removeRow(this)" class="btn btn-inline bg-red">Fjern Række</button></td> <td><input type="text" name="accountable[]" value="{{ old('accountable.'.$i) }}" maxlength="255"></td>
</tr> <td><input type="datetime-local" name="date[]" value="{{ old('date.'.$i) }}"></td>
<td><button type="button" onclick="removeRow(this)" class="btn btn-inline bg-red">Fjern Række</button></td>
</tr>
@endfor
@else
<tr>
<td><input type="text" name="name[]" maxlength="255"></td>
<td><input type="text" name="description[]"></td>
<td><input type="text" name="accountable[]" maxlength="255"></td>
<td><input type="datetime-local" name="date[]"></td>
<td><button type="button" onclick="removeRow(this)" class="btn btn-inline bg-red">Fjern Række</button></td>
</tr>
@endif
</table> </table>
<label class="toggle"> <label class="toggle">

6
skolehjem/resources/views/admin/news/create.blade.php
View File

@ -21,11 +21,11 @@
@csrf @csrf
<label for="title">Titel på nyheden:</label> <label for="title">Titel på nyheden:</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label> <label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input type="text" name="subname" id="title" placeholder="OBS: Menuplanen er ændret" maxlength="255" required> <input type="text" name="subname" id="title" placeholder="OBS: Menuplanen er ændret" value="{{ old('subname') }}" maxlength="255" required>
<label for="date">Dato til når nyheden skal slettes (valgfri)</label> <label for="date">Dato til når nyheden skal slettes (valgfri)</label>
<input type="datetime-local" name="news_expiration_date" id="date"> <input type="datetime-local" name="news_expiration_date" value="{{ old('news_expiration_date') }}" id="date">
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div> <div id="editor">{!! old('content') !!}</div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea> <textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret"> <input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form> </form>

6
skolehjem/resources/views/admin/news/edit.blade.php
View File

@ -22,11 +22,11 @@
@method("PUT") @method("PUT")
<label for="title">Navn</label> <label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label> <label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input value="{{$news->subname}}" type="text" name="subname" id="title" required> <input value="{{ old('subname', $news->subname) }}" type="text" name="subname" id="title" required>
<label for="date">Rediger datoen til når nyheden skal slettes (Hvis nyheden ikke skal slettes efter en bestemt dato, slet ALT i dato felete, så det er tomt!)</label> <label for="date">Rediger datoen til når nyheden skal slettes (Hvis nyheden ikke skal slettes efter en bestemt dato, slet ALT i dato felete, så det er tomt!)</label>
<input type="datetime-local" value="{{$news->news_expiration_date}}" name="news_expiration_date" id="date"> <input type="datetime-local" value="{{ old('news_expiration_date', $news->news_expiration_date)}}" name="news_expiration_date" id="date">
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small> <small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $news->content !!}</div> <div id="editor">{!! old('content', $news->content) !!}</div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea> <textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger"> <input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form> </form>

8
skolehjem/resources/views/admin/users/create.blade.php
View File

@ -32,12 +32,12 @@
<form method="post" action="{{ route("users.store") }}" onsubmit="return checkInputs()" enctype="multipart/form-data"> <form method="post" action="{{ route("users.store") }}" onsubmit="return checkInputs()" enctype="multipart/form-data">
@csrf @csrf
<label for="name_first">Fornavn:</label> <label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" placeholder="Fornavn" maxlength="255" required> <input type="text" name="name_first" id="name_first" placeholder="Fornavn" value="{{ old('name_first') }}" maxlength="255" required>
<label for="name_last">Efternavn:</label> <label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" maxlength="255" required> <input type="text" name="name_last" id="name_last" placeholder="Efternavn" value="{{ old('name_last') }}" maxlength="255" required>
<label for="email">Email:</label> <label for="email">Email:</label>
<label hidden id="erroremail">Der findes allerede en bruger med denne email!</label> <label hidden id="erroremail">Der findes allerede en bruger med denne email!</label>
<input type="email" name="email" id="email" placeholder="x@y.z" required> <input type="email" name="email" id="email" placeholder="x@y.z" value="{{ old('email') }}" required>
<label for="password1">Adgangskode:</label> <label for="password1">Adgangskode:</label>
<label hidden id="errornotsamepass" for="errormesseages" >Der stod ikke det samme i Adgangskode & Bekræft Adgangskode!</label> <label hidden id="errornotsamepass" for="errormesseages" >Der stod ikke det samme i Adgangskode & Bekræft Adgangskode!</label>
<div class="input-group text-left"> <div class="input-group text-left">
@ -51,7 +51,7 @@
</div> </div>
<label for="phone">Telefon nr:</label> <label for="phone">Telefon nr:</label>
<label hidden id="errorphone">Der findes allerede en bruger med dette telefon nr!</label> <label hidden id="errorphone">Der findes allerede en bruger med dette telefon nr!</label>
<input type="tel" name="phone" id="phone" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" maxlength="8" required> <input type="tel" name="phone" id="phone" placeholder="12345678" value="{{ old('phone') }}" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" maxlength="8" required>
<label for="roles">Rolle:</label> <label for="roles">Rolle:</label>
<select id="roles" class="js-example-basic-multiple mb-2" name="roles[]" multiple="multiple" required> <select id="roles" class="js-example-basic-multiple mb-2" name="roles[]" multiple="multiple" required>
<optgroup label="Roller"> <optgroup label="Roller">

2
skolehjem/resources/views/app/users/register.blade.php
View File

@ -10,7 +10,7 @@
<img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" alt="Syddansk Erhvervsskole"> <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" alt="Syddansk Erhvervsskole">
</div> </div>
<form action="" method="post" onsubmit="return validateRegisterForm(this)" > <form action="" method="post" onsubmit="return validateRegisterForm(this)" >
<input class="appinput" type="email" name="email" placeholder="Email"> <input class="appinput" type="email" name="email" value="{{ old('email') }}" placeholder="Email">
<input class="appinput" type="password" name="password" placeholder="Password"> <input class="appinput" type="password" name="password" placeholder="Password">
<input class="appinput" type="password" name="confirmpassword" placeholder="Confirm password"> <input class="appinput" type="password" name="confirmpassword" placeholder="Confirm password">
<input class="btn btn-dark" type="submit" value="Sign up"> <input class="btn btn-dark" type="submit" value="Sign up">

8
skolehjem/resources/views/app/users/signup.blade.php
View File

@ -16,12 +16,12 @@
<label hidden id="erroremail">E-mail already exists</label> <label hidden id="erroremail">E-mail already exists</label>
<label hidden id="errornotsamepass" for="errormesseages">Password dosen't match</label> <label hidden id="errornotsamepass" for="errormesseages">Password dosen't match</label>
<label hidden id="errorphone">Phone number already in use</label> <label hidden id="errorphone">Phone number already in use</label>
<input class="appinput" type="text" name="name_first" placeholder="Firstname" required> <input class="appinput" type="text" name="name_first" value="{{ old('name_first') }}" placeholder="Firstname" required>
<input class="appinput" type="text" name="name_last" placeholder="Lastname" required> <input class="appinput" type="text" name="name_last" value="{{ old('name_last') }}" placeholder="Lastname" required>
<input class="appinput" type="email" id="email" name="email" placeholder="E-mail" required> <input class="appinput" type="email" id="email" name="email" value="{{ old('email') }}" placeholder="E-mail" required>
<input class="appinput" type="password" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" name="password" id="password1" placeholder="Password" required> <input class="appinput" type="password" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" name="password" id="password1" placeholder="Password" required>
<input class="appinput" type="password" name="password2" id="password2" placeholder="Confirm password" required> <input class="appinput" type="password" name="password2" id="password2" placeholder="Confirm password" required>
<input class="appinput" type="tel" id="phone" name="phone" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required class="mb-2rem"> <input class="appinput" type="tel" id="phone" name="phone" value="{{ old('phone') }}" placeholder="Phone number" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required class="mb-2rem">
<input class="btn btn-dark" type="submit" id="disable" value="Sign up"> <input class="btn btn-dark" type="submit" id="disable" value="Sign up">
<input onclick="window.history.back()" class="btn btn-dark text-center" value="Back"> <input onclick="window.history.back()" class="btn btn-dark text-center" value="Back">
</form> </form>