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 

 Conflicts:
	skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
	skolehjem/resources/views/admin/news/create.blade.php
	skolehjem/resources/views/admin/news/edit.blade.php
This commit is contained in:
victor 2020-10-07 15:28:47 +02:00
parent 22694bd0fb 3e44501cd4
commit 2681472772
23 changed files with 79 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/database/migrations/2013_07_01_061911_create_resource_categories.php
View File

@ -18,7 +18,7 @@ class CreateResourceCategories extends Migration
Schema::create('resource_categories', function (Blueprint $table) {
$table->id();
$table->string("name", 60)->unique();
$table->text("description");
$table->longText("description");
$table->string("slug", 255)->unique();
$table->timestamps();
});

2
skolehjem/database/migrations/2013_07_01_064512_create_resource_extension.php
View File

@ -18,7 +18,7 @@ class CreateResourceExtension extends Migration
Schema::create('resource_extensions', function (Blueprint $table) {
$table->id();
$table->string("extension", 60)->unique();
$table->text("description");
$table->longText("description");
$table->timestamps();
$table->foreignid("resource_category_id")->constrained("resource_categories", "id");

4
skolehjem/database/migrations/2019_08_19_000000_create_failed_jobs_table.php
View File

@ -18,8 +18,8 @@ class CreateFailedJobsTable extends Migration
{
Schema::create('failed_jobs', function (Blueprint $table) {
$table->id();
$table->text('connection');
$table->text('queue');
$table->longText('connection');
$table->longText('queue');
$table->longText('payload');
$table->longText('exception');
$table->timestamp('failed_at')->useCurrent();

2
skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
View File

@ -23,7 +23,7 @@ class CreateMenuPlans extends Migration
$table->string('wednesday', 255);
$table->string('thursday', 255);
$table->timestamps();
//$table->text('description');
//$table->longText('description');
});
}

2
skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
View File

@ -17,8 +17,8 @@ class CreateNewsTable extends Migration
$table->id();
$table->string("name");
$table->string('subname');
$table->longText("content");
$table->date('news_expiration_date')->nullable();
$table->text("content");
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
$table->integer("arrangement_id")->nullable(); //Gets ID from given event, menu, guide or news
$table->foreignid("type_id")->nullable()->constrained("news_types", "id");

16
skolehjem/database/seeds/ContactSeeder.php
View File

@ -16,7 +16,7 @@ class ContactSeeder extends Seeder
'contactname' => "Claus Trasbo",
'email' => "ctr@sde.dk",
'title' => "Forstander for Erhvervskollegiet",
'phone' => "40886515",
'phone' => "",
'phonetimes' => "",
],
[
@ -33,20 +33,6 @@ class ContactSeeder extends Seeder
'phone' => null,
'phonetimes' => "",
],
[
'contactname' => "Anja Holm Brix",
'email' => "ahb@sde.dk",
'title' => "Kollegieassistent",
'phone' => null,
'phonetimes' => "",
],
[
'contactname' => "Britta Overgaard Brink Olsen",
'email' => "brio@sde.dk",
'title' => "Kollegieassistent",
'phone' => null,
'phonetimes' => "",
],
[
'contactname' => "Jesper Sandberg",
'email' => "jesa@sde.dk",

5
skolehjem/public/css/admin.css vendored
View File

@ -6878,3 +6878,8 @@ div.dataTables_wrapper div.dataTables_paginate ul.pagination {
outline: unset !important;
}
/* QL-Editor */
.ql-tooltip {
z-index: 3 !important;
}

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

@ -9,6 +9,7 @@ return[
"vagttelefon" => "Vagttelefon",
"vejledning" => "Vejledninger",
"konto" => "Konto",
"nyheder" => "Nyheder",
"logud" => "Log ud",
"allekategorier" => "Alle kategorier",
"kategorier" => "Kategorier",

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

@ -57,6 +57,7 @@ return[
"nytpassword" => "New password",
"confirmpassword" => "Confirm password",
"ingennyheder" => "No news were found",
"nyheder" => "News",
"mørk" => "Dark",
"lys" => "Light",
"indstillinger" => "Settings",

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

@ -32,6 +32,7 @@
<label for="accountable">Aktivitet Ansvarlig:</label>
<input type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet dato:</label>
@ -59,7 +60,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

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

@ -33,6 +33,7 @@
<label for="accountable">Aktivitet Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
<label for="description">Aktivitet Beskrivelse:</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $event->description !!}</div>
<textarea name="description" class="d-none" id="hiddenArea"></textarea>
<label for="date">Aktivitet Dato:</label>
@ -58,7 +59,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

68
skolehjem/resources/views/admin/events/signups.blade.php
View File

@ -10,47 +10,41 @@
@endsection
@section("content")
<table class="tbl mt-1">
<tr>
<table class="tbl mt-1" id="table_id">
<thead>
<th>Tilmeldtes Fornavn</th>
<th>Tilmeldtes Efternavn</th>
<th>Tilmeldtes Tlf Nr</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@foreach($events as $event)
@if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null)
<tr>
<td>{{ $event->name_first }}</td>
<td>{{ $event->name_last }}</td>
<td>{{ $event->phone }}</td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event->event_id ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
</thead>
<tbody>
@foreach($events as $event)
@if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->event_id != null && $event->user_id != null)
<tr>
<td>{{ $event->name_first }}</td>
<td>{{ $event->name_last }}</td>
<td>{{ $event->phone }}</td>
<td><form method="post" action="{{ route("events.destroy", [ "event" => $event->event_id ]) }}" class="w-100 nostyle">
@csrf
@method("delete")
<button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
@endif
@endforeach
<button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
@endif
@endforeach
</tbody>
</table>
<script>
$('#search').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('events.search')}}',
data: {'search':$value},
success:function (data) {
$('tbody').html(data);
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection
@section('scripts')
<script>
$(document).ready( function () {
$('#table_id').DataTable({
columnDefs: [
{ orderable: false, targets: [-1] }
]
});
});
</script>
@endsection

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

@ -38,6 +38,8 @@
</select> <label>Vælg en kategori</label>
<a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
</div>
<label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor"></div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label class="toggle">
@ -67,7 +69,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link', 'video' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

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

@ -44,6 +44,7 @@
<a class="btn btn-inline btn-sde-blue mb-0 ml-1" href="{{ route('guides-category.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret kategori</a>
</div>
<label for="editor">Vejledning</label>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<div id="editor">{!! $guide->guide_articles !!}</div>
<textarea name="guide_articles" class="d-none" id="hiddenArea"></textarea>
<label class="toggle">
@ -67,7 +68,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link', 'video' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

7
skolehjem/resources/views/admin/guides/index.blade.php
View File

@ -6,7 +6,7 @@
@endsection
@section("path")
<a href="{{ route('guides.index') }}" class="text-white">Opret Vejledning</a> /
<a href="{{ route('guides.index') }}" class="text-white">Vis Vejledning</a> /
@endsection
@section("content")
@ -47,6 +47,11 @@
@endif
</tr>
@endforeach
@if(count($guides) == 0)
<tr>
<td colspan="4">Ingen vejledninger</td>
</tr>
@endif
</table>
</div>

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

@ -2,7 +2,11 @@
@extends("admin.layout.header")
@section("title")
Home - Admin Panel
Dashboard - Admin Panel
@endsection
@section("path")
<a href="{{ route('root.index') }}" class="text-white">Dashboard</a> /
@endsection
@section("content")

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

@ -105,7 +105,7 @@
align-items: center;
margin-bottom: auto;
position: absolute;
z-index: 1;
z-index: 3;
top: 0px;
left: 100%;
font-size: 25px;

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

@ -22,6 +22,7 @@
<label for="title">Titel på nyheden:</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input type="text" name="subname" id="title" placeholder="OBS: Menuplanen er ændret" required>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<label for="date">Dato til når nyheden skal slettes (valgfri)</label>
<input type="datetime-local" name="news_expiration_date" id="date">
<div id="editor"></div>
@ -41,7 +42,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

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

@ -23,6 +23,7 @@
<label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input value="{{$news->subname}}" type="text" name="subname" id="title" required>
<small class="form-text text-muted">For at kunne indsætte et link, skal du markere den text du vil lave som et link først.</small>
<label for="date">Rediger datoen til når nyheden skal slettes (Hvis nyheden ikke skal slettes efter en bestemt dato, slet ALT i dato felete, så det er tomt!)</label>
<input type="datetime-local" value="{{$news->news_expiration_date}}" name="news_expiration_date" id="date">
<div id="editor">{!! $news->content !!}</div>
@ -42,7 +43,7 @@
[{ 'header': '1' }, { 'header': '2' }, 'blockquote' ],
[{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }],
[ {'direction': 'rtl'}, { 'align': [] }],
[ 'link' ],
[ 'link', 'image', 'video' ],
[ 'clean' ]
],
},

2
skolehjem/resources/views/admin/news/index.blade.php
View File

@ -6,7 +6,7 @@
@endsection
@section("path")
<a href="{{ route('news.index') }}" class="text-white">Opret Nyheder</a> /
<a href="{{ route('news.index') }}" class="text-white">Vis Nyheder</a> /
@endsection
@section("content")

2
skolehjem/resources/views/app/contacts/index.blade.php
View File

@ -23,7 +23,5 @@
@else
<p class="text-center">{{__('msg.dereringenkontakter')}}!</p>
@endif
<span class="text-center sde-black-20 mt-1">{{__('msg.sendfeedback')}}</span>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route('feedbacks.create') }}">{{__('msg.givfeedback')}}</a>
</main>
@endsection

8
skolehjem/resources/views/app/events/show.blade.php
View File

@ -23,13 +23,5 @@
{!!$event->description!!}
</div>
<button style="margin-top: auto" onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
</main>
@endsection

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

@ -30,8 +30,8 @@
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="{{ route("root.index") }}">
<img src="{{URL::asset('/images/icons/Home.svg')}}" alt="Home">
Home
<img src="{{URL::asset('/images/icons/Home.svg')}}" alt="Nyheder">
{{ __('msg.nyheder') }}
</a>
@if(auth()->user()->can('menuplan.show'))
<a href="{{ route("menu-plans.index") }}">
@ -67,6 +67,12 @@
{{ __('msg.vejledning') }}
</a>
@endif
@if(auth()->user()->can('feedback.create'))
<a href="{{ route('feedbacks.create') }}">
<img src="{{URL::asset('/images/icons/feedback.svg')}}" alt="Feedback">
{{__('msg.givfeedback')}}
</a>
@endif
<a href="{{ route("users.account") }}">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
{{ __('msg.konto') }}