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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vedde 2020-06-22 14:57:21 +02:00
parent 5dcae7895a 3a345b1417
commit 4a8336e677
15 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
skolehjem/app/ExternalLink.php
View File

@ -6,5 +6,12 @@ use Illuminate\Database\Eloquent\Model;
class ExternalLink extends Model class ExternalLink extends Model
{ {
// /**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'name', "link"
];
} }

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

@ -17,7 +17,7 @@ class EventController extends Controller
{ {
$events = Event::query()->paginate($request->input("limit", 20)); $events = Event::query()->paginate($request->input("limit", 20));
return view("admin.event.index", [ "events" => $events]); return view("admin.events.index", [ "events" => $events]);
} }
/** /**
@ -27,7 +27,7 @@ class EventController extends Controller
*/ */
public function create() public function create()
{ {
return view("admin.event.create"); return view("admin.events.create");
} }
/** /**
@ -47,7 +47,7 @@ class EventController extends Controller
$event->save(); $event->save();
return view("admin.event.store"); return view("admin.events.store");
} }
/** /**
@ -58,7 +58,7 @@ class EventController extends Controller
*/ */
public function show(Event $id) public function show(Event $id)
{ {
return view("admin.event.show", [ "event" => $id ]); return view("admin.events.show", [ "event" => $id ]);
} }
/** /**
@ -69,7 +69,7 @@ class EventController extends Controller
*/ */
public function edit(Event $id) public function edit(Event $id)
{ {
return view("admin.event.edit", [ "event" => $id ]); return view("admin.events.edit", [ "event" => $id ]);
} }
/** /**
@ -89,7 +89,7 @@ class EventController extends Controller
$id->update($requestBody); $id->update($requestBody);
$id->save(); $id->save();
return view("admin.event.update"); return view("admin.events.update");
} }
/** /**
@ -103,6 +103,6 @@ class EventController extends Controller
{ {
$id->delete(); $id->delete();
return view("admin.event.destroy"); return view("admin.events.destroy");
} }
} }

18
skolehjem/app/Http/Controllers/ExternalLinkController.php
View File

@ -17,28 +17,36 @@ class ExternalLinkController extends Controller
{ {
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
return view("external-link.index", [ "externalLink" => $externalLink ]); return view("external-links.index", [ "externalLink" => $externalLink ]);
} }
/** /**
* Show the form for creating a new resource. * Show the form for creating a new resource.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/ */
public function create() public function create()
{ {
// return view("external-links.create");
} }
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/ */
public function store(Request $request) public function store(Request $request)
{ {
// $requestBody = $request->validate([
"name" => "required|max:255",
"link" => "required|max:255"
]);
$externalLink = new ExternalLink($requestBody);
$externalLink->save();
return view("external-links.store");
} }
/** /**

14
skolehjem/app/Http/Controllers/UserController.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\User; use App\User;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
class UserController extends Controller class UserController extends Controller
@ -28,7 +29,7 @@ class UserController extends Controller
*/ */
public function index(Request $request) public function index(Request $request)
{ {
$users = User::query()->paginate($request->query("page", 1)); $users = User::query()->paginate($request->query("page", 20));
return view("admin.users.index", [ "users" => $users ]); return view("admin.users.index", [ "users" => $users ]);
} }
@ -51,6 +52,8 @@ class UserController extends Controller
*/ */
public function store(Request $request) public function store(Request $request)
{ {
Log::debug("STORE FUNCTION");
$data = $request->validate([ $data = $request->validate([
"name_first" => "required|max:255", "name_first" => "required|max:255",
"name_last" => "required|max:255", "name_last" => "required|max:255",
@ -60,9 +63,16 @@ class UserController extends Controller
]); ]);
Log::debug("FINISHED VALIDATION?");
$user = new User($data); $user = new User($data);
Log::debug("CREATED USER [NOT PERSISTED YET]");
$user->save(); $user->save();
Log::debug("SAVED USER");
return view("admin.users.store"); return view("admin.users.store");
} }
@ -169,7 +179,7 @@ class UserController extends Controller
if(Auth::attempt($data)) { if(Auth::attempt($data)) {
//TODO: Implement home? //TODO: Implement home?
return view("admin.users.index", [ "user" => Auth::user() ]); return redirect()->route("users.index");
} }
return redirect()->back(303); return redirect()->back(303);

2
skolehjem/resources/js/navmenu/menu.js vendored
View File

@ -2,7 +2,7 @@ document.addEventListener("DOMContentLoaded", function(){
// Handler when the DOM is fully loaded // Handler when the DOM is fully loaded
var path = window.location.pathname; var path = window.location.pathname;
if(path === "/menuplan" || path === "/vagttelefon" || path === "/") if(path === "/menuplans" || path === "/vagttelefon" || path === "/")
{ {
document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); document.getElementById ('toggle').addEventListener ('click', toggleMenu, false);
} }

2
skolehjem/resources/js/sites/menuplan.js vendored
View File

@ -2,7 +2,7 @@ document.addEventListener("DOMContentLoaded", function(){
// Handler when the DOM is fully loaded // Handler when the DOM is fully loaded
var path = window.location.pathname; var path = window.location.pathname;
if(path === "/menuplan") if(path === "/menuplans")
{ {
updateWeek(); updateWeek();
} }

2
skolehjem/resources/sass/admin/content/table.scss vendored
View File

@ -22,7 +22,7 @@
.tbl > tbody > tr > td > a { .tbl > tbody > tr > td > a {
width: 100%; width: 100%;
display: flex; //display: flex;
} }
.tbl > tbody > tr > td > a > img { .tbl > tbody > tr > td > a > img {

4
skolehjem/resources/views/admin/layout/base.blade.php
View File

@ -22,10 +22,10 @@
<div class="segment"> <div class="segment">
<h3 class="text-white">Menuplan</h3> <h3 class="text-white">Menuplan</h3>
<div class="row"> <div class="row">
<a href="" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a> <a href="{{ route("menu-plans.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a>
</div> </div>
<div class="row"> <div class="row">
<a href="" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a> <a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div> </div>
</div> </div>
</div> </div>

0
skolehjem/resources/views/admin/menuplan/create.blade.php → skolehjem/resources/views/admin/menuplans/create.blade.php
View File

0
skolehjem/resources/views/admin/menuplan/show.blade.php → skolehjem/resources/views/admin/menuplans/show.blade.php
View File

0
skolehjem/resources/views/admin/menuplan/update.blade.php → skolehjem/resources/views/admin/menuplans/update.blade.php
View File

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

@ -11,7 +11,7 @@
@section("content") @section("content")
<h1>Opret Bruger:</h1> <h1>Opret Bruger:</h1>
<form method="post" action="/users"> <form method="post" action="{{ route("users.store") }}">
@csrf @csrf
<label for="name_first">Fornavn:</label> <label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" required> <input type="text" name="name_first" id="name_first" required>

6
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -20,8 +20,8 @@
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th> <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th> <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr> </tr>
<tr>
@foreach($users as $user) @foreach($users as $user)
<tr>
<td>{{ $user->id }}</td> <td>{{ $user->id }}</td>
<td>{{ $user->name_first }}</td> <td>{{ $user->name_first }}</td>
<td>{{ $user->name_last }}</td> <td>{{ $user->name_last }}</td>
@ -29,7 +29,9 @@
<td>{{ $user->phone }}</td> <td>{{ $user->phone }}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
@endforeach
</tr> </tr>
@endforeach
</table> </table>
{{ $users->links() }}
@endsection @endsection

50
skolehjem/resources/views/admin/washing-machines/create.blade.php
View File

@ -6,28 +6,36 @@
@endsection @endsection
@section("path") @section("path")
<a href="" class="text-white">Vis Vaskemaskiner</a> / <a href="" class="text-white">Opret Vaskemaskine</a> /
@endsection @endsection
@section("content") @section("content")
<table class="tbl"> <h1>Opret Bruger:</h1>
<tr> <form method="post" action="{{ route("washing-machines.store") }}">
<th>ID</th> @csrf
<th>Fornavn</th> <label for="name_first">Navn:</label>
<th>Efternavn</th> <input type="text" name="name" id="name" max="60" required>
<th>Email</th> <input type="submit" class="btn btn-dark text-white" value="Opret">
<th>Tlf nr</th> </form>
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th> {{-- <table class="tbl">--}}
</tr> {{-- <tr>--}}
<tr> {{-- <th>ID</th>--}}
<td>{ID}</td> {{-- <th>Fornavn</th>--}}
<td>{Fornavn}</td> {{-- <th>Efternavn</th>--}}
<td>{Efternavn}</td> {{-- <th>Email</th>--}}
<td>{Email}</td> {{-- <th>Tlf nr</th>--}}
<td>{TLF}</td> {{-- <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>--}}
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td> {{-- <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>--}}
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> {{-- </tr>--}}
</tr> {{-- <tr>--}}
</table> {{-- <td>{ID}</td>--}}
{{-- <td>{Fornavn}</td>--}}
{{-- <td>{Efternavn}</td>--}}
{{-- <td>{Email}</td>--}}
{{-- <td>{TLF}</td>--}}
{{-- <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>--}}
{{-- <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>--}}
{{-- </tr>--}}
{{-- </table>--}}
@endsection @endsection

6
skolehjem/resources/views/index.blade.php
View File

@ -29,10 +29,10 @@
{{--@extends("admin.users.update")--}} {{--@extends("admin.users.update")--}}
{{--Create Menuplan--}} {{--Create Menuplan--}}
{{--@extends("admin.menuplan.create")--}} {{--@extends("admin.menuplans.create")--}}
{{--Read Menuplan--}} {{--Read Menuplan--}}
{{--@extends("admin.menuplan.show")--}} {{--@extends("admin.menuplans.show")--}}
{{--Update Menuplan--}} {{--Update Menuplan--}}
{{--@extends("admin.menuplan.update")--}} {{--@extends("admin.menuplans.update")--}}