v0.8.3 - Added uploade images function
This commit is contained in:
parent
9c26526740
commit
e080b69d98
|
@ -20,6 +20,6 @@ class Event extends Model
|
|||
*/
|
||||
//protected variable which contains name of database field(s) to be filled.
|
||||
protected $fillable = [
|
||||
"name", "accountable", "description", "date"
|
||||
"name", "accountable", "description", "date", "resource_id"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -74,6 +74,10 @@ class EventController extends Controller
|
|||
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>');
|
||||
} else {
|
||||
if($request->file("resource")) {
|
||||
$event->resource_id = ResourceController::store($request)->id;
|
||||
}
|
||||
|
||||
$event->save();
|
||||
$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: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
|
||||
'</div>';
|
||||
$news->resource_id = $event->resource_id;
|
||||
$news->save();
|
||||
}
|
||||
|
||||
|
|
|
@ -79,6 +79,10 @@ class MenuPlanController extends Controller
|
|||
$news->subname = "Uge " . $menuPlan->week;
|
||||
$news->content = $menuPlan->menu;
|
||||
|
||||
if($request->file("resource")) {
|
||||
$news->resource_id = ResourceController::store($request)->id;
|
||||
}
|
||||
|
||||
$news->save();
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
|
|||
class News extends Model
|
||||
{
|
||||
protected $fillable = [
|
||||
'name', 'subname', 'content'
|
||||
'name', 'subname', 'content', 'resource_id'
|
||||
];
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ class CreateEvents extends Migration
|
|||
$table->string("accountable");
|
||||
$table->longText("description");
|
||||
$table->dateTime("date");
|
||||
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
|
|
@ -18,6 +18,7 @@ class CreateNewsTable extends Migration
|
|||
$table->string("name");
|
||||
$table->string('subname');
|
||||
$table->text("content");
|
||||
$table->foreignId('resource_id')->nullable()->constrained('resources', 'id');
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
|
|
@ -6602,6 +6602,14 @@ main {
|
|||
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) {
|
||||
main {
|
||||
max-width: 460px;
|
||||
|
|
|
@ -6602,6 +6602,14 @@ main {
|
|||
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) {
|
||||
main {
|
||||
max-width: 460px;
|
||||
|
@ -7104,3 +7112,7 @@ input::placeholder {
|
|||
color: white;
|
||||
}
|
||||
|
||||
.ql-align-center > strong {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,14 @@ main {
|
|||
padding: 0 1.25rem 0 1.25rem;
|
||||
}
|
||||
|
||||
.ql-align-center > strong {
|
||||
color: rgb(0, 120, 138);
|
||||
}
|
||||
|
||||
.ql-align-center {
|
||||
margin: 0.25rem 0rem;
|
||||
}
|
||||
|
||||
// Mobile
|
||||
@media only screen
|
||||
and (max-width : 900px)
|
||||
|
|
|
@ -26,3 +26,7 @@ input::placeholder {
|
|||
background-color: #666666;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.ql-align-center > strong {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<h1>Opret Aktivitet:</h1>
|
||||
<form method="post" action="{{ route("events.store") }}">
|
||||
<form method="post" action="{{ route("events.store") }}" enctype="multipart/form-data">
|
||||
@csrf
|
||||
<label for="name">Event Navn:</label>
|
||||
<input type="text" name="name" id="name" max="60" required>
|
||||
|
@ -41,6 +41,9 @@
|
|||
<span class="toggle__text">Opret som nyhed</span>
|
||||
</span>
|
||||
</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">
|
||||
</form>
|
||||
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
|
||||
|
|
|
@ -24,21 +24,21 @@
|
|||
</style>
|
||||
<link href="https://cdn.quilljs.com/1.3.6/quill.snow.css" rel="stylesheet">
|
||||
<h1>Opret Menuplan:</h1>
|
||||
<form action="{{ action('MenuPlanController@store') }}" method="post">
|
||||
<form action="{{ action('MenuPlanController@store') }}" method="post" enctype="multipart/form-data">
|
||||
@csrf
|
||||
<label for="week">Uge nr.</label>
|
||||
<input type="number" name="week" id="week" min="1" max="53" placeholder="1" required>
|
||||
<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"><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"><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"><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>
|
||||
</div>
|
||||
<textarea name="menu" class="d-none" id="hiddenArea"></textarea>
|
||||
|
@ -49,7 +49,8 @@
|
|||
</span>
|
||||
</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">
|
||||
|
@ -97,12 +98,13 @@
|
|||
function change() {
|
||||
if ($('#isNews').is(":checked"))
|
||||
{
|
||||
$('#fileuploade').show(500);
|
||||
$('#fileuploade').show(400);
|
||||
$('#fileuploadee').show(200);
|
||||
}else {
|
||||
$('#fileuploade').hide();
|
||||
$('#fileuploadee').hide();
|
||||
}
|
||||
}
|
||||
|
||||
change();
|
||||
|
||||
</script>
|
||||
|
|
|
@ -38,11 +38,19 @@
|
|||
@foreach($events as $event)
|
||||
<form method="get" action="{{ route("userevents.create") }}" id="form{{$event->id}}">
|
||||
<div class="card">
|
||||
@if($event->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}');">
|
||||
<h3 style="text-shadow: 2px 2px 2px #00078A;">{{ $event->name }}</h3>
|
||||
<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>
|
||||
@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">
|
||||
{!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!}
|
||||
<input type="hidden" name="event_id" value="{{ $event->id }}">
|
||||
|
|
|
@ -30,11 +30,17 @@
|
|||
<main style="justify-content: unset;">
|
||||
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
|
||||
<div class="card">
|
||||
@if($new->resource_id !== null)
|
||||
<div class="header" style="background-size: cover; background-image: url('{{ asset(\App\Resource::query()->where("id", "=", $new->resource_id)->first()->filename) }}');">
|
||||
<p style="text-shadow: 2px 2px 2px #00078A;"><b>{{ $new->name }}</b></p>
|
||||
<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">
|
||||
{!! $new->content !!}
|
||||
</div>
|
||||
|
@ -43,7 +49,7 @@
|
|||
@if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
|
||||
<p class="text-center">{{__('msg.ingennyheder')}}</p>
|
||||
@endif
|
||||
<div id="snackbar">Some text some message..</div>
|
||||
<div id="snackbar"></div>
|
||||
</main>
|
||||
@endsection
|
||||
@section("scripts")
|
||||
|
|
Loading…
Reference in New Issue