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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

This commit is contained in:
Sebastian Davaris 2020-06-24 08:55:07 +02:00
parent 39ecd64d04 ccddf4d2f3
commit 9690a30437
12 changed files with 158 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ class ExternalLinkController extends Controller
{
$externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
return Response::detect("external-links.index", [ "externalLink" => $externalLink ]);
return Response::detect("external-links.index", [ "externalLinks" => $externalLink ]);
}
/**
@ -59,7 +59,7 @@ class ExternalLinkController extends Controller
*/
public function show($id)
{
//
return Response::detect("external-links.show", [ "externallink" => $id]);
}
/**

84
skolehjem/app/Http/Controllers/MenuPlanController.php Normal file
View File

@ -0,0 +1,84 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class MenuPlanController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

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

@ -43,7 +43,7 @@ class UserController extends Controller
*/
public function create()
{
return Response::detect("admin.users.create");
return Response::detect("users.create");
}
/**
@ -75,7 +75,7 @@ class UserController extends Controller
Log::debug("SAVED USER");
return view("admin.users.store");
return view("users.store");
}
/**
@ -88,7 +88,7 @@ class UserController extends Controller
{
$user = User::find($id);
return Respone::detect("admin.users.show", [
return Respone::detect("users.show", [
"user" => $user
]);
}
@ -103,7 +103,7 @@ class UserController extends Controller
{
$user = User::find($id);
return Response::detect("admin.users.edit", [
return Response::detect("users.edit", [
"user" => $user
]);
}
@ -142,7 +142,7 @@ class UserController extends Controller
$user->save();
}
return Response::detect("admin.users.edit", [
return Response::detect("users.edit", [
"user" => $user
]);
}
@ -165,7 +165,7 @@ class UserController extends Controller
$user->delete();
}
return view("admin.users.delete");
return view("users.delete");
}
/*******************************************/

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

@ -19,7 +19,7 @@ class WashingMachineController extends Controller
{
$machines = WashingMachine::query()->paginate($request->query("page", 1));
return Response::detect("admin.washing-machines.index", [ "machines" => $machines ]);
return Response::detect("washing-machines.index", [ "machines" => $machines ]);
}
/**
@ -29,7 +29,7 @@ class WashingMachineController extends Controller
*/
public function create()
{
return Response::detect("admin.washing-machines.create");
return Response::detect("washing-machines.create");
}
/**
@ -47,7 +47,7 @@ class WashingMachineController extends Controller
$machine = new WashingMachine($data);
$machine->save();
return Response::detect("admin.washing-machines.store");
return Response::detect("washing-machines.store");
}
/**
@ -60,7 +60,7 @@ class WashingMachineController extends Controller
{
$machine = WashingMachine::find($id);
return Response::detect("admin.washing-machines.show", [
return Response::detect("washing-machines.show", [
"machine" => $machine
]);
}
@ -75,7 +75,7 @@ class WashingMachineController extends Controller
{
$machine = WashingMachine::find($id);
return Response::detect("admin.washing-machines.edit", [
return Response::detect("washing-machines.edit", [
"machine" => $machine
]);
}
@ -99,7 +99,7 @@ class WashingMachineController extends Controller
$machine->save();
return Response::detect("admin.washing-machines.edit", [
return Response::detect("washing-machines.edit", [
"machine" => $machine
]);
}
@ -115,6 +115,6 @@ class WashingMachineController extends Controller
$machine = WashingMachine::find($id);
$machine->delete();
return Response::detect("admin.washing-machines.destroy");
return Response::detect("washing-machines.destroy");
}
}

10
skolehjem/app/MenuPlan.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class MenuPlan extends Model
{
//
}

31
skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php Normal file
View File

@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateMenuPlans extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('menu_plans', function (Blueprint $table) {
$table->id();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('menu_plans');
}
}

23
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -2,32 +2,33 @@
@extends("admin.layout.header")
@section("title")
Vaskemaskiner - Vis
Events - Vis
@endsection
@section("path")
<a href="" class="text-white">Vis Vaskemaskiner</a> /
<a href="" class="text-white">Vis Events</a> /
@endsection
@section("content")
<table class="tbl">
<tr>
<th>ID</th>
<th>Fornavn</th>
<th>Efternavn</th>
<th>Email</th>
<th>Tlf nr</th>
<th>Event Navn</th>
<th>Event Beskrivelse</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>
</tr>
@foreach($events as $event)
<tr>
<td>{ID}</td>
<td>{Fornavn}</td>
<td>{Efternavn}</td>
<td>{Email}</td>
<td>{TLF}</td>
<td>{{ $event->id }}</td>
<td>{{ $event->name }}</td>
<td>{{ $event->description }}</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>
@endforeach
</table>
{{ $events->links() }}
@endsection

0
skolehjem/resources/views/admin/external-links/create.blade.php Normal file
View File

0
skolehjem/resources/views/admin/external-links/delete.blade.php Normal file
View File

0
skolehjem/resources/views/admin/external-links/edit.blade.php Normal file
View File

0
skolehjem/resources/views/admin/external-links/index.blade.php Normal file
View File

2
skolehjem/routes/web.php
View File

@ -30,3 +30,5 @@ Route::resource("users", "UserController");
Route::resource("events", "EventController");
Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController");
Route::resource("externallinks", "ExternalLinkController");