From e080b69d98204fe2d88ae096837f00e0e95d0d42 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 12 Aug 2020 12:28:05 +0200 Subject: [PATCH] v0.8.3 - Added uploade images function --- skolehjem/app/Event.php | 2 +- .../app/Http/Controllers/EventController.php | 5 +++++ .../Http/Controllers/MenuPlanController.php | 4 ++++ skolehjem/app/News.php | 2 +- .../2020_06_29_091545_create_events.php | 1 + .../2020_08_06_092000_create_news_table.php | 1 + skolehjem/public/css/webapp.css | 8 ++++++++ skolehjem/public/css/webappdark.css | 12 ++++++++++++ skolehjem/resources/sass/webapp/_default.scss | 8 ++++++++ .../resources/sass/webapp/_defaultdark.scss | 4 ++++ .../views/admin/events/create.blade.php | 5 ++++- .../views/admin/menuplans/create.blade.php | 18 ++++++++++-------- .../resources/views/app/events/index.blade.php | 16 ++++++++++++---- .../resources/views/app/news/index.blade.php | 18 ++++++++++++------ 14 files changed, 83 insertions(+), 21 deletions(-) diff --git a/skolehjem/app/Event.php b/skolehjem/app/Event.php index b26291c..7e18628 100644 --- a/skolehjem/app/Event.php +++ b/skolehjem/app/Event.php @@ -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" ]; } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index fa772f2..423a5df 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -74,6 +74,10 @@ class EventController extends Controller if(count($allEvents) > 0) { return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '

Der findes allerede et event med det navn!

'); } 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 ' $event->id ]) .'">Læs mere'. ' $event->id ]) .'">Se deltagere'. ''; + $news->resource_id = $event->resource_id; $news->save(); } diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 27d7da5..db6bbac 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -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(); } diff --git a/skolehjem/app/News.php b/skolehjem/app/News.php index 78392ef..fead782 100644 --- a/skolehjem/app/News.php +++ b/skolehjem/app/News.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class News extends Model { protected $fillable = [ - 'name', 'subname', 'content' + 'name', 'subname', 'content', 'resource_id' ]; } diff --git a/skolehjem/database/migrations/2020_06_29_091545_create_events.php b/skolehjem/database/migrations/2020_06_29_091545_create_events.php index 9edc5b1..91f7abc 100644 --- a/skolehjem/database/migrations/2020_06_29_091545_create_events.php +++ b/skolehjem/database/migrations/2020_06_29_091545_create_events.php @@ -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(); }); } diff --git a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php index 16fa7ef..7d9cdeb 100644 --- a/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php +++ b/skolehjem/database/migrations/2020_08_06_092000_create_news_table.php @@ -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(); }); } diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index d25f721..d3a586b 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -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; diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index fc174cc..207b79d 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -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; +} + diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index 81e5aa8..4a33da4 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -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) diff --git a/skolehjem/resources/sass/webapp/_defaultdark.scss b/skolehjem/resources/sass/webapp/_defaultdark.scss index 7dc49a5..84266e6 100644 --- a/skolehjem/resources/sass/webapp/_defaultdark.scss +++ b/skolehjem/resources/sass/webapp/_defaultdark.scss @@ -26,3 +26,7 @@ input::placeholder { background-color: #666666; color: white; } + +.ql-align-center > strong { + color: #ffffff; +} diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index 8b87871..f4bf348 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -24,7 +24,7 @@

Opret Aktivitet:

-
+ @csrf @@ -41,6 +41,9 @@ Opret som nyhed + + +
diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index 1f1e8f4..2493a78 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -24,21 +24,21 @@

Opret Menuplan:

-
+ @csrf
-

Mandag:

+

Mandag:

{Mandag}


-

Tirsdag:

+

Tirsdag:

{Tirsdag}


-

Onsdag:

+

Onsdag:

{Onsdag}


-

Torsdag:

+

Torsdag:

{Torsdag}

@@ -49,7 +49,8 @@ - + + @@ -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(); diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 8147294..29c10b8 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -38,11 +38,19 @@ @foreach($events as $event)
-
-

{{ $event->name }}

-

Af: {{ $event->accountable }}

-

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

+ @if($event->resource_id !== null) +
+

{{ $event->name }}

+

Af: {{ $event->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

+ @else +
+

{{ $event->name }}

+

Af: {{ $event->accountable }}

+

{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}

+
+ @endif
{!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!} diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 1561135..c534185 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -30,11 +30,17 @@
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new)
-
-

{{ $new->name }}

-

{{ $new->subname }}

-
- + @if($new->resource_id !== null) +
+

{{ $new->name }}

+

{{ $new->subname }}

+
+ @else +
+

{{ $new->name }}

+

{{ $new->subname }}

+
+ @endif
{!! $new->content !!}
@@ -43,7 +49,7 @@ @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)

{{__('msg.ingennyheder')}}

@endif -
Some text some message..
+
@endsection @section("scripts")