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

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

This commit is contained in:
Neerholt 2020-08-19 10:44:07 +02:00
parent a8fc584304 ae306c8f1b
commit ec4fdca414
12 changed files with 94 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
skolehjem/app/Http/Controllers/ResourceController.php
View File

@ -101,6 +101,70 @@ class ResourceController extends Controller
return $resource;
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public static function storeMime(Request $request, ResourceCategory $category)
{
$file = $request->file("resource");
$resourceExtension = ResourceExtension::query()->where("extension", "=", $file->extension())->first();
//Create resourceExtension if it doesn't exist
if($resourceExtension === null) {
$category = substr($file->getMimeType(), 0, strpos($file->getMimeType(), "/"));
$resourceCategory = ResourceCategory::query()->where("name", "=", $category)->first();
//If the uploaded file doesn't match the requested mime type
if($resourceCategory) {
if ($resourceCategory->name !== $category)
return null;
} else {
return null;
}
//Create resourceCategory if it doesn't exist
if($resourceCategory === null){
$data = [
"name" => $category,
"description" => "",
"slug" => ""
];
$resourceCategory = new ResourceCategory($data);
$resourceCategory->save();
}
$data = [
"extension" => $file->extension(),
"description" => "",
"resource_category_id" => $resourceCategory->id
];
$resourceExtension = new ResourceExtension($data);
$resourceExtension->save();
}
$resource = new Resource();
$resource->extension_id = $resourceExtension->id;
$fileName = time().'_'.$file->getClientOriginalName();
$filePath = $file->storeAs('uploads', $fileName, 'public');
/* /uploads/filename.ext */
$resource->filename = '/' . $filePath;
$resource->save();
return $resource;
}
/**
* Display the specified resource.
*

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

@ -3,6 +3,8 @@
namespace App\Http\Controllers;
use App\Helpers\Detector;
use App\ResourceCategory;
use App\ResourceExtension;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
@ -338,8 +340,14 @@ class UserController extends Controller
return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Dit password er hermed ændret!</b></p>');
}
} else if($request->file("resource")) { // Else if you're editing the profile pic
$user->update([ "resource_id" => ResourceController::store($request)->id ]);
$resource = ResourceController::storeMime($request, ResourceCategory::query()->where("name", "=", "image")->first());
if($resource !== null) {
$user->update(["resource_id" => $resource->id]);
}
else {
return redirect()->route("users.accounteditpic");
}
return redirect()->route("users.account");
} else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.

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

@ -22,7 +22,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1 id="errormesseages" >Opret Aktivitet:</h1>
<form method="post" action="{{ route("events.store") }}" enctype="multipart/form-data">
@csrf
@ -47,7 +47,7 @@
<input id="disable" type="submit" class="btn btn-dark text-white" value="Opret">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

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

@ -22,7 +22,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1>Rediger Aktivitet:</h1>
<form method="post" action="{{route("events.update", ["event" => $event])}}">
@csrf
@ -46,7 +46,7 @@
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

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

@ -22,7 +22,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1 id="errormesseages" >Opret Vejledning</h1>
<form method="post" action="{{ route("guides.store") }}" enctype="multipart/form-data">
@csrf
@ -42,7 +42,7 @@
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

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

@ -22,7 +22,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1>Rediger vejledning:</h1>
<form method="post" action="{{route("guides.update", ["guide" => $guide])}}">
@csrf
@ -42,7 +42,7 @@
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

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

@ -22,7 +22,6 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<h1 id="errormesseages" >Opret Menuplan:</h1>
<form action="{{ action('MenuPlanController@store') }}" method="post" enctype="multipart/form-data">
@csrf

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

@ -22,7 +22,6 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<h1>Rediger Menuplan:</h1>
<form method="post" action="{{ route("menu-plans.update", [ "menu_plan" => $menuplan ]) }}">
@csrf

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

@ -15,7 +15,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1 id="errormesseages" >Opret Nyhed</h1>
<form method="post" action="{{ route("news.store") }}">
@csrf
@ -27,7 +27,7 @@
<input type="submit" id="disable" class="btn btn-dark text-white" value="Opret">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

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

@ -15,7 +15,7 @@
margin-bottom: 1rem;
}
</style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
<h1>Rediger nyhed:</h1>
<form method="post" action="{{route("news.update", ["news" => $news])}}">
@csrf
@ -28,7 +28,7 @@
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
<script src="{{ asset("/js/quill/quill.js") }}"></script>
<script>
var container = document.getElementById("editor");
var fullEditor = new Quill(container, {

6
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -80,6 +80,12 @@
{{ __('msg.logud') }}
</a>
</div>
<style>
option, textarea {
color: black;
}
</style>
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>
@if(request()->cookie("mode") == "dark")

3
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -45,12 +45,14 @@
<script src="{{ asset("/js/moment-with-locales.min.js") }}"></script>
<script src="{{ asset("/js/da.min.js") }}"></script>
<script>
//Global vars to use outside functions
var momentDate = null;
var dateText = null;
//Custom forEach
NodeList.prototype.forEach = Array.prototype.forEach;
//Generates the calender when the site loads
function generateCalendar(weekOffset = 0) {
const week = (moment().week() + weekOffset);
@ -109,6 +111,7 @@
calendar.appendChild(calendarBody);
}
//When a date is selected
function onDateSelect(date, dayHolder, datetext) {
//Set selected date and dateText
momentDate = date;