diff --git a/skolehjem/app/Album.php b/skolehjem/app/Album.php deleted file mode 100644 index 0465646..0000000 --- a/skolehjem/app/Album.php +++ /dev/null @@ -1,34 +0,0 @@ -belongsTo('App\Album'); - } - - public function images() - { - return $this->hasMany('App\Image'); - } - - public function videos() - { - return $this->hasMany('App\Video'); - } -} diff --git a/skolehjem/app/CalendarDate.php b/skolehjem/app/CalendarDate.php deleted file mode 100644 index 74ec905..0000000 --- a/skolehjem/app/CalendarDate.php +++ /dev/null @@ -1,16 +0,0 @@ -middleware([ "auth" ]); - - $this->middleware("permission:link.external.list")->only("index"); - $this->middleware("permission:link.external.create")->only(["create", "store"]); - $this->middleware("permission:link.external.show")->only("show"); - $this->middleware("permission:link.external.edit")->only(["edit", "update"]); - $this->middleware("permission:link.external.delete")->only("destroy"); - } - - /** - * Display a listing of the resource. - * - * @param Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function index(Request $request) - { - $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); - - return Response::detect("external-links.index", [ "links" => $externalLink ]); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function create() - { - return Response::detect("external-links.create"); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View - */ - public function store(Request $request) - { - $requestBody = $request->validate([ - "name" => "required|max:255", - "link" => "required|max:255" - ]); - - $externalLink = new ExternalLink($requestBody); - $saved = $externalLink->save(); - - if(!$saved){ - return Response::detect("external-links.store"); - }else{ - $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); - return Response::detect("external-links.index", ['links' => $externalLink]); - } - - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - return Response::detect("external-links.show", [ "link" => $id]); - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - $link = ExternalLink::find($id); - return Response::detect("external-links.edit", ["link" => $link]); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - $data = $request->all(); - - $link = ExternalLink::find($id); - $link->update($data); - $saved = $link->save(); - - if(!$saved){ - return Response::detect("external-links.update", [ "link" => $link]); - }else{ - $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); - return Response::detect("external-links.index", ['links' => $externalLink]); - } - - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - $link = ExternalLink::find($id); - $link->delete(); - return redirect()->route("external-links.index"); - } -} diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index e0f6605..084b33e 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -57,7 +57,7 @@ class GuideController extends Controller //Me no sure what to store mester big smoke :) $requestGuide = $request->validate([ "name" => "required|max:255", - "guideArticles" => "required", + "guide_articles" => "required", ]); $guide = new Guide($requestGuide); @@ -105,7 +105,7 @@ class GuideController extends Controller { $data = $request->validate([ "name" => "required|max:255", - "guideArticles" => "required", + "guide_articles" => "required", ]); $guidee = Guide::query()->where("id", "=", $guide->id)->first(); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 1d4d495..1151bed 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -233,11 +233,32 @@ class UserController extends Controller $user = User::query()->where('email', '=', $request->email)->first(); if($user == null){ - return redirect()->back(); + return redirect()->back()->with('errornosuchuser', '

Denne email findes ikke i systemet!

'); } //Send email - //TODO: Implement mail. + $email = $user->email; + $pswd = ""; + + //Generate password + $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; + $n = 6; + $randomString = ''; + + for ($i = 0; $i < $n; $i++) { + $index = rand(0, strlen($characters) - 1); + $randomString .= $characters[$index]; + } + + $pswd = $randomString; + + $user->setPasswordAttribute($pswd); + $user->update(); + + $subject = "SDE Skolehjem reset password"; + $msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDin adgangskode er nu: " . $pswd; + + mail($email, $subject, $msg); return redirect()->route('users.login'); } diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index b730161..22a0119 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -67,15 +67,13 @@ class WashingReservationController extends Controller $machineReservation = new WashingReservation($data); $machineReservation->user_id = auth()->user()->id; - $machineReservation->save(); - $saved = $machineReservation->save(); + $allMachineReservations = WashingReservation::query()->where('time', '=', $request->time)->where('machine_id', '=', $request->machine_id)->get(); - if (!$saved) { - return Response::detect("washing-reservations.store", [ - "washing_reservation" => $machineReservation - ]); + if (count($allMachineReservations) > 0) { + return redirect()->route("washing-reservations.create", ["washing_reservation" => $machineReservation])->with('ReservationExists', '

Der findes allerede en reservation til denne tid, men denne vaskemaskine!

'); } else { + $machineReservation->save(); $reservations = WashingReservation::query()->paginate($request->input("limit", 20)); return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]); @@ -174,7 +172,7 @@ class WashingReservationController extends Controller foreach ($reservations as $reservation){ array_push($times, $reservation->time); } - //2020-07-28% + $output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times]); return Response($output); } diff --git a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php deleted file mode 100644 index 5a8c158..0000000 --- a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ /dev/null @@ -1,34 +0,0 @@ -string('email')->index(); - $table->string('token'); - $table->timestamp('created_at')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('password_resets'); - } -} diff --git a/skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php b/skolehjem/database/migrations/2020_06_08_073954_create_washing_machines.php similarity index 100% rename from skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php rename to skolehjem/database/migrations/2020_06_08_073954_create_washing_machines.php diff --git a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php index a1d3b14..f1d5fdb 100644 --- a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php +++ b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php @@ -19,10 +19,9 @@ class CreateWashingReservations extends Migration $table->id(); $table->timestamp("time"); $table->timestamps(); - $table->unsignedBigInteger('machine_id'); - $table->foreign("machine_id")->references('id')->on('washing_machines'); - $table->unsignedBigInteger('user_id'); - $table->foreign("user_id")->references('id')->on('users'); + + $table->foreignid("machine_id")->constrained("washing_machines", "id"); + $table->foreignid("user_id")->constrained("users", "id"); $table->unique(['time', 'machine_id']); }); } diff --git a/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php b/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php deleted file mode 100644 index a6abe3b..0000000 --- a/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('calendar_dates'); - } -} diff --git a/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php b/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php deleted file mode 100644 index 3750d0f..0000000 --- a/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('calendar_events'); - } -} diff --git a/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php b/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php deleted file mode 100644 index b6da609..0000000 --- a/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php +++ /dev/null @@ -1,35 +0,0 @@ -id(); - $table->string("name"); - $table->string("link"); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('external_links'); - } -} diff --git a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php deleted file mode 100644 index bd5f02a..0000000 --- a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php +++ /dev/null @@ -1,34 +0,0 @@ -id(); - $table->timestamps(); - $table->foreignId('user_id')->constrained(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('albums'); - } -} diff --git a/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php b/skolehjem/database/migrations/2020_07_01_064512_create_resource_extension.php similarity index 84% rename from skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php rename to skolehjem/database/migrations/2020_07_01_064512_create_resource_extension.php index da3fa6c..e38d0aa 100644 --- a/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php +++ b/skolehjem/database/migrations/2020_07_01_064512_create_resource_extension.php @@ -19,10 +19,9 @@ class CreateResourceExtension extends Migration $table->id(); $table->string("extension", 60)->unique(); $table->text("description"); - $table->unsignedInteger("resource_category_id"); $table->timestamps(); - $table->foreign("resource_category_id")->references("id")->on("resource_categories"); + $table->foreignid("resource_category_id")->constrained("resource_categories", "id"); }); } diff --git a/skolehjem/database/migrations/2020_07_01_062544_create_resource.php b/skolehjem/database/migrations/2020_07_01_064544_create_resource.php similarity index 84% rename from skolehjem/database/migrations/2020_07_01_062544_create_resource.php rename to skolehjem/database/migrations/2020_07_01_064544_create_resource.php index acdef5a..59666fb 100644 --- a/skolehjem/database/migrations/2020_07_01_062544_create_resource.php +++ b/skolehjem/database/migrations/2020_07_01_064544_create_resource.php @@ -18,10 +18,9 @@ class CreateResource extends Migration Schema::create('resources', function (Blueprint $table) { $table->id(); $table->string("filename")->unique(); - $table->unsignedInteger("extension_id"); $table->timestamps(); - $table->foreign("extension_id")->references("id")->on("resource_extensions"); + $table->foreignid("extension_id")->constrained("resource_extensions", "id"); }); } diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php index 39bef20..1850a2c 100644 --- a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php +++ b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php @@ -15,13 +15,11 @@ class CreateUserEventsTable extends Migration { Schema::create('user_events', function (Blueprint $table) { $table->id(); - $table->integer("user_id"); - $table->integer("event_id"); $table->timestamps(); - $table->foreign("user_id")->references("id")->on("users"); - $table->foreign("event_id")->references("id")->on("events"); + $table->foreignid("user_id")->constrained("users", "id"); + $table->foreignid("event_id")->constrained("events", "id"); }); } diff --git a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php index 29d3524..e602214 100644 --- a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php +++ b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php @@ -17,7 +17,7 @@ class CreateGuidesTable extends Migration $table->id(); $table->timestamps(); $table->string('name'); - $table->longText('guideArticles'); + $table->longText('guide_articles'); }); } diff --git a/skolehjem/resources/views/admin/external-links/create.blade.php b/skolehjem/resources/views/admin/external-links/create.blade.php deleted file mode 100644 index 318a6a6..0000000 --- a/skolehjem/resources/views/admin/external-links/create.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Link - Opret -@endsection - -@section("path") - Opret Link / -@endsection - -@section("content") -

Opret Link:

-
- @csrf - - - - - -
-@endsection diff --git a/skolehjem/resources/views/admin/external-links/delete.blade.php b/skolehjem/resources/views/admin/external-links/delete.blade.php deleted file mode 100644 index 2573007..0000000 --- a/skolehjem/resources/views/admin/external-links/delete.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Link - Fjern -@endsection - -@section("path") - Fjern Link / -@endsection - -@section("content") -@endsection diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php deleted file mode 100644 index 250ec21..0000000 --- a/skolehjem/resources/views/admin/external-links/edit.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Link - Rediger -@endsection - -@section("path") - Rediger Link / -@endsection - -@section("content") -

Rediger Link:

-
$link])}}"> - @csrf - @method("PUT") - - - - - -
-@endsection diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php deleted file mode 100644 index 4e4dcad..0000000 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Link - Vis -@endsection - -@section("path") - Vis Link / -@endsection - -@section("content") -
- CreateOpret Ektern Link -
- - - - - - - - @foreach($links as $link) - - - - - - - @endforeach -
TitleLinkUpdateDelete
{{$link->name}}{{$link->link}} $link ]) }}">Update
$link ]) }}" class="w-100 nostyle"> - @csrf - @method("delete") - - -
-
- - {{ $links->links() }} -@endsection diff --git a/skolehjem/resources/views/admin/external-links/store.blade.php b/skolehjem/resources/views/admin/external-links/store.blade.php deleted file mode 100644 index efdc62b..0000000 --- a/skolehjem/resources/views/admin/external-links/store.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Link - Opret -@endsection - -@section("path") - Opret External Link / -@endsection - -@section("content") - Link blev (ikke) oprettet. -@endsection diff --git a/skolehjem/resources/views/admin/external-links/update.blade.php b/skolehjem/resources/views/admin/external-links/update.blade.php deleted file mode 100644 index d0f6663..0000000 --- a/skolehjem/resources/views/admin/external-links/update.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - link - Rediger -@endsection - -@section("path") - $link]) }}" class="text-white">External link / -@endsection - -@section("content") - Din link blev (ikke) redigeret. -@endsection diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index 7086817..21431ba 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -21,7 +21,7 @@ @csrf - + diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index 8592eeb..1ae8006 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -23,7 +23,7 @@ - + diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 81e0863..554104c 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -29,9 +29,6 @@

Reservationer

-
-

Eksterne Links

-

Kontakter

diff --git a/skolehjem/resources/views/admin/users/forgot.blade.php b/skolehjem/resources/views/admin/users/forgot.blade.php index 286ff7b..20dc1fa 100644 --- a/skolehjem/resources/views/admin/users/forgot.blade.php +++ b/skolehjem/resources/views/admin/users/forgot.blade.php @@ -9,10 +9,11 @@
Syddansk Erhvervsskole
-
+ @csrf
+ {!! session()->get("errornosuchuser") !!} @endsection diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index 228f69c..d9a59fd 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -14,7 +14,7 @@

Vejledninger

@foreach($guides as $guide)

{{ $guide->name }}

- {!! $guide->guideArticles !!} + {!! $guide->guide_articles !!}
@endforeach diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index 25a48ad..ffe2275 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -7,6 +7,7 @@ @section("content")

Booking Liste

+ {!! session()->get('ReservationExists') !!}