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:
frederikpyt 2020-10-07 08:25:14 +02:00
parent 1d92c12ecf f70d6a7a95
commit 233bc2b35e
25 changed files with 166 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ class ContactController extends Controller
if(!$saved){
return redirect()->route("contacts.store");
}else{
$contact = Contact::query()->paginate(20);
$contact = Contact::query()->get();
return redirect()->route("contacts.index", ['contacts' => $contact]);
}
@ -114,7 +114,7 @@ class ContactController extends Controller
if(!$saved){
return redirect()->route("contacts.update", [ "contacts" => $contact ]);
}else{
$contact = Contact::query()->paginate(20);
$contact = Contact::query()->get();
return redirect()->route("contacts.index", ['contacts' => $contact]);
}

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

@ -89,7 +89,7 @@ class EventController extends Controller
}
$event->save();
$events = Event::query()->paginate(20);
$events = Event::query()->get();
if($request->newsoption == true){
$news = new News();
@ -184,7 +184,7 @@ class EventController extends Controller
$event->update($data);
$event->save();
$events = Event::query()->paginate(20);
$events = Event::query()->get();
if($request->newsoption == true){
$news = new News();

60
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -30,7 +30,7 @@ class GuideController extends Controller
*/
public function index(Request $request)
{
$guides = Guide::query()->orderBy("created_at", "desc")->paginate(20);
$guides = Guide::query()->orderBy("created_at", "desc")->get();
return Response::detect("guides.index", [ "guides" => $guides]);
}
@ -53,8 +53,6 @@ class GuideController extends Controller
*/
public function store(Request $request)
{
//Me no sure what to store mester big smoke :)
$requestGuide = $request->validate([
"name" => "required|max:255",
"guide_articles" => "required",
@ -73,7 +71,7 @@ class GuideController extends Controller
if(!$saved) {
return redirect()->route("guides.store");
} else {
$guides = Guide::query()->paginate(20);
$guides = Guide::query()->get();
if($request->newsoption == true){
$news = new News();
@ -140,7 +138,7 @@ class GuideController extends Controller
if(!$saved){
return redirect()->route("guides.update", [ "guide" => $guide ]);
}else{
$guides = Guide::query()->paginate(20);
$guides = Guide::query()->get();
if($request->newsoption == true){
$news = new News();
@ -217,5 +215,57 @@ class GuideController extends Controller
}
}
// Runs the ajax call when changing the select field in guides.index (app)
public function showCategory(Request $request){
if($request->ajax()) {
// Get all guides where the category is what you want
if ($request->category != 'All')
$guides = Guide::query()->orderBy("created_at", "desc")->where('guide_category_id', '=', $request->category)->get();
else
$guides = Guide::query()->orderBy("created_at", "desc")->get();
$output = '';
// Begin showing all guides with the given category
if(!$guides->isEmpty()) {
foreach ($guides as $guide) {
$output .= '<div class="card">';
if ($guide->resource_id !== null) {
$output .= '<div class="header" style="background-size: cover; background-position: center; background-image: url(' . asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) . ');">' .
'<h3 style="text-shadow: 2px 2px 2px #00788A;">' . $guide->name . '</h3>' .
'</div>';
} else {
$output .= '<div class="header">' .
'<h3>' . $guide->name . '</h3>' .
'</div>';
}
$output .= '<div class="container">';
$tags = ['<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'];
$output .= '' . \App\Helpers::closetags(substr(strip_tags($guide->guide_articles, $tags), 0, 300)) . '' .
'<div class="row" style="justify-content: center;">';
if (request()->cookie('languagesSetting') == "dk")
$output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
elseif (request()->cookie('languagesSetting') == "en")
$output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Read more</a>';
else
$output .= '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("guides.show", ["guide" => $guide->id ]) .'">Læs mere</a>';
$output .= '</div>'.
'</div>'.
'</div>';
}
} else { // If there are no guides with the given category, then display error message
if (request()->cookie('languagesSetting') == "dk")
$output .= '<p style="margin-bottom: auto; text-align: center">Der er ingen vejledninger af denne kategori</p>';
elseif (request()->cookie('languagesSetting') == "en")
$output .= '<p style="margin-bottom: auto; text-align: center">There are no guides of this category</p>';
else
$output .= '<p style="margin-bottom: auto; text-align: center">Der er ingen vejledninger af denne kategori</p>';
}
return Response($output);
}
}
}

6
skolehjem/app/Http/Controllers/GuidesCategoryController.php
View File

@ -29,7 +29,7 @@ class GuidesCategoryController extends Controller
*/
public function index()
{
$guideCate = GuidesCategory::query()->paginate(20);
$guideCate = GuidesCategory::query()->get();
return Response::detect("guides-category.index", [ "guidesCategory" => $guideCate]);
}
@ -61,7 +61,7 @@ class GuidesCategoryController extends Controller
if(!$saved) {
return redirect()->route("guides-category.store");
} else {
$guides = Guide::query()->paginate(20);
$guides = Guide::query()->get();
return redirect()->route("guides.index", ['guides' => $guides]);
}
@ -109,7 +109,7 @@ class GuidesCategoryController extends Controller
if(!$saved){
return redirect()->route("guides-category.edit", $id);
}else{
$guides = Guide::query()->paginate(20);
$guides = Guide::query()->get();
return redirect()->route("guides.index", ['guides' => $guides]);
}

6
skolehjem/app/Http/Controllers/LocationController.php
View File

@ -31,7 +31,7 @@ class LocationController extends Controller
*/
public function index(Request $request)
{
$locations = Location::query()->paginate(20);
$locations = Location::query()->get();
return Response::detect("locations.index", [ "locations" => $locations ]);
}
@ -67,7 +67,7 @@ class LocationController extends Controller
return redirect()->route("washing-machines.index");
else { // Else - Add it
$location->save();
$locations = Location::query()->paginate(20);
$locations = Location::query()->get();
return redirect()->route("washing-machines.index", ['locations' => $locations]);//washing-machines.index kan byttes ud med locations.index
}
}
@ -119,7 +119,7 @@ class LocationController extends Controller
$location->update($data);
$location->save();
$locations = Location::query()->paginate(20);
$locations = Location::query()->get();
return redirect()->route("washing-machines.index", ["locations" => $locations]); //washing-machines.index kan byttes ud med locations.index
}
}

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

@ -74,7 +74,7 @@ class MenuPlanController extends Controller
return redirect()->route("menu-plans.index");
else {
$menuPlan->save();
$menuPlans = MenuPlan::query()->paginate(20);
$menuPlans = MenuPlan::query()->get();
$menuArray = [];
@ -154,7 +154,7 @@ class MenuPlanController extends Controller
$menuplan->update($data);
$menuplan->save();
$menuPlans = MenuPlan::query()->paginate(20);
$menuPlans = MenuPlan::query()->get();
//Create news
if($request->newsoption == true){

2
skolehjem/app/Http/Controllers/PermissionController.php
View File

@ -22,7 +22,7 @@ class PermissionController extends Controller
*/
public function index(Request $request)
{
$permission = Permission::query()->paginate(20);
$permission = Permission::query()->get();
return Response::detect("permission.index", [ "permission" => $permission ]);
}

2
skolehjem/app/Http/Controllers/ResourceCategoryController.php
View File

@ -26,7 +26,7 @@ class ResourceCategoryController extends Controller
*/
public function index(Request $request)
{
$categories = ResourceCategory::query()->paginate($request->input("limit", 20));
$categories = ResourceCategory::query()->get();
return Response::detect("resource-categories.index", ["category"=> $categories]);
}

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

@ -29,7 +29,7 @@ class ResourceController extends Controller
*/
public function index(Request $request)
{
$resources = Resource::query()->paginate($request->input("limit", 20));
$resources = Resource::query()->get();
return Response::detect("resources.index", [ "resources" => $resources ]);
}

2
skolehjem/app/Http/Controllers/ResourceExtensionController.php
View File

@ -26,7 +26,7 @@ class ResourceExtensionController extends Controller
*/
public function index(Request $request)
{
$extensions = ResourceExtension::query()->paginate($request->input("limit", 20));
$extensions = ResourceExtension::query()->get();
return Response::detect("resource-extensions.index", ["extension" => $extensions]);
}

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

@ -80,7 +80,7 @@ class RolesController extends Controller
}
}
$roles = Role::query()->paginate(20);
$roles = Role::query()->get();
return redirect()->route("roles.index", ['roles' => $roles]);
}
}
@ -158,7 +158,7 @@ class RolesController extends Controller
$role->update($data);
$role->save();
$roles = Role::query()->paginate(20);
$roles = Role::query()->get();
return redirect()->route("roles.index", ['roles' => $roles]);
}

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

@ -19,7 +19,7 @@ class RootController extends Controller
$perPage = 5;
//All news
$newsCollection = News::query()->orderBy('id', 'desc')->paginate($perPage);
$newsCollection = News::query()->orderBy('id', 'desc')->get();
//Runs through all the news and deletes the old stuff
foreach ($newsCollection as $new)

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

@ -71,8 +71,6 @@ class UserController extends Controller
"email" => "required",
"password" => "required|max:60",
"phone" => "required|max:8|min:8",
//"eduenddate" => "",
//"education" => "required"
]);
@ -97,9 +95,6 @@ class UserController extends Controller
$user->assignRole($roles);
$user->save();
return redirect()->route('users.index');
}
@ -132,7 +127,6 @@ class UserController extends Controller
if($id == 1)
return redirect()->route("users.index");
return Response::detect("users.edit", [
"user" => $user,
"roles" => $roles,
@ -162,6 +156,7 @@ class UserController extends Controller
$allUsersEmail = User::query()->where('email', '=', $request->email)->where('id', '!=', $id)->get();
$allUsersPhone = User::query()->where('phone', '=', $request->phone)->where('id', '!=', $id)->get();
// If you're editing yourself or you have permission to edit others...
if($id === Auth::id() || auth()->user()->hasPermissionTo("user.edit")) {
if ($request->roles != null && auth()->user()->hasPermissionTo("user.edit")) { //You can only edit roles on the admin site, so if there is an input roles, then update user info and edit roles
if(count($allUsersEmail) > 0)
@ -190,7 +185,7 @@ class UserController extends Controller
}
}
}
$users = User::query()->paginate(20);
$users = User::query()->get();
return redirect()->route("users.index");
}
@ -234,8 +229,6 @@ class UserController extends Controller
return redirect()->route("root.index");
}
if (request()->cookie('languagesSetting') == "dk")
return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Email eller Password matchede ikke!</b></p>');
if (request()->cookie('languagesSetting') == "en")
@ -382,7 +375,7 @@ class UserController extends Controller
else
return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Dine oplysninger er hermed ændret!</b></p>');
}
$users = User::query()->paginate(20);
$users = User::query()->get();
return redirect()->route("users.index");
}

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

@ -34,7 +34,7 @@ class WashingMachineController extends Controller
*/
public function index(Request $request)
{
$machines = WashingMachine::query()->paginate(20);
$machines = WashingMachine::query()->get();
return Response::detect("washing-machines.index", [ "machines" => $machines ]);
}
@ -73,7 +73,7 @@ class WashingMachineController extends Controller
return redirect()->route("washing-machines.store");
else { // Else - Add it
$machine->save();
$machines = WashingMachine::query()->paginate(20);
$machines = WashingMachine::query()->get();
return redirect()->route("washing-machines.index", ['machines' => $machines]);
}
}
@ -131,7 +131,7 @@ class WashingMachineController extends Controller
else { // Else - Change the name
$machine->update($data);
$machine->save();
$machines = WashingMachine::query()->paginate(20);
$machines = WashingMachine::query()->get();
return redirect()->route("washing-machines.index", ["machines" => $machines]);
}
}

6
skolehjem/app/Http/Controllers/WashingReservationController.php
View File

@ -81,7 +81,7 @@ class WashingReservationController extends Controller
return redirect()->route("washing-reservations.create", ["washing_reservation" => $machineReservation])->with('ReservationExists', '<p class="text-center"><b>Der findes allerede en reservation til denne tid, men denne vaskemaskine!</b></p>');
} else {
$machineReservation->save();
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
$reservations = WashingReservation::query()->get();
return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]);
}
@ -136,7 +136,7 @@ class WashingReservationController extends Controller
$machineReservation = WashingReservation::find($id);
$machineReservation->delete();
$reservations = WashingReservation::query()->paginate( 20);
$reservations = WashingReservation::query()->get();
if(app('router')->getRoutes()->match(app('request')->create(url()->previous()))->getName() == "washing-reservations.appindex")
return redirect()->route("washing-reservations.appindex");
@ -214,7 +214,7 @@ class WashingReservationController extends Controller
{
WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
$reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->paginate(10);
$reservations = WashingReservation::query()->where("user_id", "=", auth()->user()->id)->orderBY('time' , 'asc')->get();
return Response::detect("washing-reservations.index", [ "reservations" => $reservations]);
}

9
skolehjem/public/css/webappdark.css vendored
View File

@ -80,6 +80,15 @@ select {
margin-bottom: 1rem;
}
.select2-container--default, .select2-search, .selection, .select2-selection--single, .select2-results__options * {
color: white !important;
background-color: #2F3136 !important;
}
.select2-selection__rendered {
color: white !important;
}
input.appinput {
border: none;
border-bottom: white solid 2px;

2
skolehjem/resources/lang/dk/msg.php
View File

@ -10,6 +10,8 @@ return[
"vejledning" => "Vejledninger",
"konto" => "Konto",
"logud" => "Log ud",
"allekategorier" => "Alle kategorier",
"kategorier" => "Kategorier",
"dereringenmenuplanerdenneuge" => "Der er ingen menuplaner denne uge",
"dereringenaktiviteter" => "Der er ingen aktiviteter",
"setilmeldteaktiviteter" => "Se Tilmeldte Aktiviteter",

4
skolehjem/resources/lang/en/msg.php
View File

@ -6,7 +6,7 @@ return[
"reservationer" => "Reservations",
"kontoret" => "Contacts",
"vagttelefon" => "Emergency phone",
"vejledning" => "Guide",
"vejledning" => "Guides",
"home" => "Home",
"logud" => "Log out",
"konto" => "Account",
@ -14,6 +14,8 @@ return[
"trisdag" => "Tuesday",
"onsdag" => "Wednesday",
"torsdag" => "Thursday",
"allekategorier" => "All categories",
"kategorier" => "Categories",
"dereringenmenuplanerdenneuge" => "There is no menu for this week",
"uge" => "week",
"ugestor" => "Week",

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

@ -30,7 +30,7 @@
<label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input type="text" name="name" id="title" required>
<div>
<select name="guide_category_id" id="guidesCategory">
<select name="guide_category_id" id="guidesCategory" required>
<option disabled selected value> -- Vælg en kategori -- </option>
@foreach(\App\GuidesCategory::query()->get() as $guideCategory)
<option value="{{ $guideCategory->id }}">{{ $guideCategory->guidesCategoryName }}</option>

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

@ -31,7 +31,7 @@
<label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input value="{{$guide->name}}" type="text" name="name" id="title" required>
<div>
<select name="guide_category_id" id="guidesCategory">
<select name="guide_category_id" id="guidesCategory" required>
<option disabled selected value> -- Vælg en kategori -- </option>
@foreach(\App\GuidesCategory::query()->get() as $guideCategory)
{{ $selected = "" }}

1
skolehjem/resources/views/admin/washing-machines/index.blade.php
View File

@ -92,7 +92,6 @@
</tr>
@endforeach
</table>
{{ $machines->links() }}
</div>

81
skolehjem/resources/views/app/guides/index.blade.php
View File

@ -31,33 +31,80 @@
ol {
padding-right: 8px;
}
input, select {
/* margin-bottom: 0;*/
}
.select2-container--default .select2-results>.select2-results__options {
max-height: 120px !important;
}
</style>
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/js/select2.min.js"></script>
<script>
// In your Javascript (external .js resource or <script> tag)
$(document).ready(function() {
$('.js-example-basic-single').select2();
});
</script>
<main style="min-height: calc(100% - 61.34px);">
<h1 class="text-center sde-blue mt-0" style="margin-bottom: 2rem;">{{__('msg.vejledning')}}</h1>
@if(!$guides->isEmpty())
@foreach($guides as $guide)
<div class="card">
@if($guide->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $guide->name}}</h3>
</div>
@else
<div class="header">
<h3>{{ $guide->name}}</h3>
@if (count(\App\GuidesCategory::query()->get()) > 1)
<h4 class="mt-0 mb-0">{{ __("msg.kategorier") }}</h4>
<select id="categorySelect" class="js-example-basic-single" name="state" style="margin-bottom: 2rem !important;">
<option value="All" selected>{{ __("msg.allekategorier") }}</option>
@foreach (\App\GuidesCategory::query()->get() as $Category)
<option value="{{ $Category->id }}">{{ $Category->guidesCategoryName }}</option>
@endforeach
</select>
@endif
<div id="main">
@foreach($guides as $guide)
<div class="card">
@if($guide->resource_id !== null)
<div class="header" style="background-size: cover; background-position: center; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $guide->resource_id)->first()->filename) }}');">
<h3 style="text-shadow: 2px 2px 2px #00788A;">{{ $guide->name}}</h3>
</div>
@endif
<div class="container">
@php $tags = [ '<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'] @endphp
{!! \App\Helpers::closetags(substr(strip_tags($guide->guide_articles, $tags), 0, 300)) !!}
<div class="row" style="justify-content: center;">
<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
@else
<div class="header">
<h3>{{ $guide->name}}</h3>
</div>
@endif
<div class="container">
@php $tags = [ '<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'] @endphp
{!! \App\Helpers::closetags(substr(strip_tags($guide->guide_articles, $tags), 0, 300)) !!}
<div class="row" style="justify-content: center;">
<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">{{__('msg.læsmere')}}</a>
</div>
</div>
</div>
</div>
@endforeach
@endforeach
</div>
@else
<p style="margin: 0 18px; margin-bottom: auto; text-align: center">{{__('msg.dereringenvejledninger')}}.</p>
@endif
<button onclick="window.history.back()" style="margin-top: auto;" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
</main>
<script>
$('#categorySelect').on('change', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{ route("guides.showCategory") }}',
data: { 'category':$value },
success:function (data) {
$('#main').html(data);
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

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

@ -9,7 +9,6 @@
@else
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
@endif
<script type="text/javascript">
function setMain() {
var main = document.getElementsByTagName("main")[0];
@ -89,7 +88,6 @@
option, textarea {
color: black;
}
</style>
@yield("content")
<script src="{{ mix("/js/app.js") }}"></script>

3
skolehjem/resources/views/app/news/index.blade.php
View File

@ -176,7 +176,8 @@
@endif
<div class="container" style="margin-top: 8px;">
{!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!}
@php $tags = [ '<p>', '<b>', '<em>', '<a>', '<u>', '<s>', '<sub>', '<ul>', '<li>', '<sup>', '<div>', '<blockquote>', '<ol>', '<strong>', '<br>', '<h1>', '<h2>', '<h3>', '<h4>', '<h5>', '<h6>', '<h7>', '<span>'] @endphp
{!! \App\Helpers::closetags(substr(strip_tags($new->content, $tags), 0, 300)) !!}
@if ($new->type == 'Guide') {{-- Else if's displaying guides, then show `Læs mere` --}}
<div class="row" style="justify-content: center; padding-top: 12px; border-top: 1px solid rgba(0, 0, 0, .2);">
<a style="font-weight: 700;" href="{{route("guides.show", ["guide" => $new->arrangement_id])}}" class="sde-blue">{{__('msg.læsmere')}}</a>

1
skolehjem/routes/web.php
View File

@ -46,6 +46,7 @@ Route::post("/signupStore", "UserController@signupStore")->name("users.signupSto
//Search
Route::get("/machineapi", "WashingMachineController@search")->name("washing-machines.search");
Route::get("/showCategory", "GuideController@showCategory")->name("guides.showCategory");
//Cookies
Route::get("/languages", "UserController@setLanguages")->name("users.setLanguages");