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

v0.8.3 - Added uploade images function

This commit is contained in:
Neerholt 2020-08-12 12:28:05 +02:00
parent 9c26526740
commit e080b69d98
14 changed files with 83 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/app/Event.php
View File

@ -20,6 +20,6 @@ class Event extends Model
*/ */
//protected variable which contains name of database field(s) to be filled. //protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
"name", "accountable", "description", "date" "name", "accountable", "description", "date", "resource_id"
]; ];
} }

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

@ -74,6 +74,10 @@ class EventController extends Controller
if(count($allEvents) > 0) { if(count($allEvents) > 0) {
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>'); return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
} else { } else {
if($request->file("resource")) {
$event->resource_id = ResourceController::store($request)->id;
}
$event->save(); $event->save();
$events = Event::query()->paginate($request->input("limit", 20)); $events = Event::query()->paginate($request->input("limit", 20));
@ -88,6 +92,7 @@ class EventController extends Controller
'<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
'<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
'</div>'; '</div>';
$news->resource_id = $event->resource_id;
$news->save(); $news->save();
} }

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

@ -79,6 +79,10 @@ class MenuPlanController extends Controller
$news->subname = "Uge " . $menuPlan->week; $news->subname = "Uge " . $menuPlan->week;
$news->content = $menuPlan->menu; $news->content = $menuPlan->menu;
if($request->file("resource")) {
$news->resource_id = ResourceController::store($request)->id;
}
$news->save(); $news->save();
} }

2
skolehjem/app/News.php
View File

@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
class News extends Model class News extends Model
{ {
protected $fillable = [ protected $fillable = [
'name', 'subname', 'content' 'name', 'subname', 'content', 'resource_id'
]; ];
} }

1
skolehjem/database/migrations/2020_06_29_091545_create_events.php
View File

@ -21,6 +21,7 @@ class CreateEvents extends Migration
$table->string("accountable"); $table->string("accountable");
$table->longText("description"); $table->longText("description");
$table->dateTime("date"); $table->dateTime("date");
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
$table->timestamps(); $table->timestamps();
}); });
} }

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

@ -18,6 +18,7 @@ class CreateNewsTable extends Migration
$table->string("name"); $table->string("name");
$table->string('subname'); $table->string('subname');
$table->text("content"); $table->text("content");
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
$table->timestamps(); $table->timestamps();
}); });
} }

8
skolehjem/public/css/webapp.css vendored
View File

@ -6602,6 +6602,14 @@ main {
padding: 0 1.25rem 0 1.25rem; padding: 0 1.25rem 0 1.25rem;
} }
.ql-align-center > strong {
color: #00788a;
}
.ql-align-center {
margin: 0.25rem 0rem;
}
@media only screen and (max-width: 900px) { @media only screen and (max-width: 900px) {
main { main {
max-width: 460px; max-width: 460px;

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

@ -6602,6 +6602,14 @@ main {
padding: 0 1.25rem 0 1.25rem; padding: 0 1.25rem 0 1.25rem;
} }
.ql-align-center > strong {
color: #00788a;
}
.ql-align-center {
margin: 0.25rem 0rem;
}
@media only screen and (max-width: 900px) { @media only screen and (max-width: 900px) {
main { main {
max-width: 460px; max-width: 460px;
@ -7104,3 +7112,7 @@ input::placeholder {
color: white; color: white;
} }
.ql-align-center > strong {
color: #ffffff;
}

8
skolehjem/resources/sass/webapp/_default.scss vendored
View File

@ -7,6 +7,14 @@ main {
padding: 0 1.25rem 0 1.25rem; padding: 0 1.25rem 0 1.25rem;
} }
.ql-align-center > strong {
color: rgb(0, 120, 138);
}
.ql-align-center {
margin: 0.25rem 0rem;
}
// Mobile // Mobile
@media only screen @media only screen
and (max-width : 900px) and (max-width : 900px)

4
skolehjem/resources/sass/webapp/_defaultdark.scss vendored
View File

@ -26,3 +26,7 @@ input::placeholder {
background-color: #666666; background-color: #666666;
color: white; color: white;
} }
.ql-align-center > strong {
color: #ffffff;
}

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

@ -24,7 +24,7 @@
</style> </style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet"> <link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<h1>Opret Aktivitet:</h1> <h1>Opret Aktivitet:</h1>
<form method="post" action="{{ route("events.store") }}"> <form method="post" action="{{ route("events.store") }}" enctype="multipart/form-data">
@csrf @csrf
<label for="name">Event Navn:</label> <label for="name">Event Navn:</label>
<input type="text" name="name" id="name" max="60" required> <input type="text" name="name" id="name" max="60" required>
@ -41,6 +41,9 @@
<span class="toggle__text">Opret som nyhed</span> <span class="toggle__text">Opret som nyhed</span>
</span> </span>
</label> </label>
<label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
<input id="fileuploade" type="file" name="resource">
<input type="submit" class="btn btn-dark text-white" value="Opret"> <input type="submit" class="btn btn-dark text-white" value="Opret">
</form> </form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script> <script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>

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

@ -24,21 +24,21 @@
</style> </style>
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet"> <link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
<h1>Opret Menuplan:</h1> <h1>Opret Menuplan:</h1>
<form action="{{ action('MenuPlanController@store') }}" method="post"> <form action="{{ action('MenuPlanController@store') }}" method="post" enctype="multipart/form-data">
@csrf @csrf
<label for="week">Uge nr.</label> <label for="week">Uge nr.</label>
<input type="number" name="week" id="week" min="1" max="53" placeholder="1" required> <input type="number" name="week" id="week" min="1" max="53" placeholder="1" required>
<div id="editor"> <div id="editor">
<h2 class="ql-align-center"><strong style="color: rgb(0, 120, 138);">Mandag:</strong></h2> <h2 class="ql-align-center"><strong>Mandag:</strong></h2>
<p class="ql-align-center">{Mandag}</p> <p class="ql-align-center">{Mandag}</p>
<p class="ql-align-center"><br></p> <p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong style="color: rgb(0, 120, 138);">Tirsdag:</strong></h2> <h2 class="ql-align-center"><strong>Tirsdag:</strong></h2>
<p class="ql-align-center">{Tirsdag}</p> <p class="ql-align-center">{Tirsdag}</p>
<p class="ql-align-center"><br></p> <p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong style="color: rgb(0, 120, 138);">Onsdag:</strong></h2> <h2 class="ql-align-center"><strong>Onsdag:</strong></h2>
<p class="ql-align-center">{Onsdag}</p> <p class="ql-align-center">{Onsdag}</p>
<p class="ql-align-center"><br></p> <p class="ql-align-center"><br></p>
<h2 class="ql-align-center"><strong style="color: rgb(0, 120, 138);">Torsdag:</strong></h2> <h2 class="ql-align-center"><strong>Torsdag:</strong></h2>
<p class="ql-align-center">{Torsdag}</p> <p class="ql-align-center">{Torsdag}</p>
</div> </div>
<textarea name="menu" class="d-none" id="hiddenArea"></textarea> <textarea name="menu" class="d-none" id="hiddenArea"></textarea>
@ -49,7 +49,8 @@
</span> </span>
</label> </label>
<input id="fileuploade" type="file" id="myFile" name="filename"> <label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri):</label>
<input id="fileuploade" type="file" name="resource">
<input type="submit" class="btn btn-dark text-white" value="Opret Menuplan"> <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
@ -97,12 +98,13 @@
function change() { function change() {
if ($('#isNews').is(":checked")) if ($('#isNews').is(":checked"))
{ {
$('#fileuploade').show(500); $('#fileuploade').show(400);
$('#fileuploadee').show(200);
}else { }else {
$('#fileuploade').hide(); $('#fileuploade').hide();
$('#fileuploadee').hide();
} }
} }
change(); change();
</script> </script>

16
skolehjem/resources/views/app/events/index.blade.php
View File

@ -38,11 +38,19 @@
@foreach($events as $event) @foreach($events as $event)
<form method="get" action="{{ route("userevents.create") }}" id="form{{$event->id}}"> <form method="get" action="{{ route("userevents.create") }}" id="form{{$event->id}}">
<div class="card"> <div class="card">
<div class="header"> @if($event->resource_id !== null)
<h3>{{ $event->name }}</h3> <div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
<p class="text-center mt-0">Af: {{ $event->accountable }}</p> <h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $event->name }}</h3>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p> <p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">Af: {{ $event->accountable }}</p>
<p style="text-shadow: 2px 2px 2px #00078A"; class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div> </div>
@else
<div class="header">
<h3>{{ $event->name }}</h3>
<p class="text-center mt-0">Af: {{ $event->accountable }}</p>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
</div>
@endif
<div class="container"> <div class="container">
{!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!} {!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!}
<input type="hidden" name="event_id" value="{{ $event->id }}"> <input type="hidden" name="event_id" value="{{ $event->id }}">

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

@ -30,11 +30,17 @@
<main style="justify-content: unset;"> <main style="justify-content: unset;">
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new) @foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
<div class="card"> <div class="card">
<div class="header"> @if($new->resource_id !== null)
<p><b>{{ $new->name }}</b></p> <div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');">
<h3>{{ $new->subname }}</h3> <p style="text-shadow: 2px 2px 2px #00078A;"><b>{{ $new->name }}</b></p>
</div> <h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $new->subname }}</h3>
</div>
@else
<div class="header">
<p><b>{{ $new->name }}</b></p>
<h3>{{ $new->subname }}</h3>
</div>
@endif
<div class="container"> <div class="container">
{!! $new->content !!} {!! $new->content !!}
</div> </div>
@ -43,7 +49,7 @@
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0) @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
<p class="text-center">{{__('msg.ingennyheder')}}</p> <p class="text-center">{{__('msg.ingennyheder')}}</p>
@endif @endif
<div id="snackbar">Some text some message..</div> <div id="snackbar"></div>
</main> </main>
@endsection @endsection
@section("scripts") @section("scripts")