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/app/Http/Controllers/EventController.php
This commit is contained in:
Neerholt 2020-08-10 10:17:41 +02:00
parent b27d05e55c fead36dd52
commit 3263663f3d
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,7 @@ class EventController extends Controller
$news = new News(); $news = new News();
$news->name = "Ny aktivitet"; $news->name = "Ny aktivitet";
$news->subname = $event->name;
$news->content = "<p>" . substr($event->description, 0, 300) . "</p>" . $news->content = "<p>" . substr($event->description, 0, 300) . "</p>" .
'<div class="row align-items-center">'. '<div class="row align-items-center">'.
'<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
@ -177,6 +178,7 @@ class EventController extends Controller
$news = new News(); $news = new News();
$news->name = "Aktivitet opdateret"; $news->name = "Aktivitet opdateret";
$news->subname = $event->name;
$news->content = "<p>" . substr($event->description, 0, 300). "</p>" . $news->content = "<p>" . substr($event->description, 0, 300). "</p>" .
'<div class="row align-items-center">'. '<div class="row align-items-center">'.
'<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.

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

@ -74,6 +74,7 @@ class GuideController extends Controller
$news = new News(); $news = new News();
$news->name = "Ny Vejledning"; $news->name = "Ny Vejledning";
$news->subname = $guide->name;
$news->content = substr($guide->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>'; $news->content = substr($guide->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>';
@ -134,6 +135,7 @@ class GuideController extends Controller
$news = new News(); $news = new News();
$news->name = "Vejledning opdateret"; $news->name = "Vejledning opdateret";
$news->subname = $guidee->name;
$news->content = substr($guidee->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>'; $news->content = substr($guidee->guide_articles, 0, 300). '<br><br><a href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læse mere...</a>';
$news->save(); $news->save();

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

@ -75,7 +75,8 @@ class MenuPlanController extends Controller
if($request->newsoption == true){ if($request->newsoption == true){
$news = new News(); $news = new News();
$news->name = "Ny menuplan Uge " . $menuPlan->week; $news->name = "Ny menuplan";
$news->subname = "Uge " . $menuPlan->week;
$news->content = $menuPlan->menu; $news->content = $menuPlan->menu;
$news->save(); $news->save();
@ -135,7 +136,8 @@ class MenuPlanController extends Controller
if($request->newsoption == true){ if($request->newsoption == true){
$news = new News(); $news = new News();
$news->name = "Opdateret menuplan Uge " . $menuplan->week; $news->name = "Opdateret menuplan";
$news->subname = "Uge " . $menuplan->week;
$news->content = $menuplan->menu; $news->content = $menuplan->menu;
$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', 'content' 'name', 'subname', 'content'
]; ];
} }

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

@ -16,6 +16,7 @@ class CreateNewsTable extends Migration
Schema::create('news', function (Blueprint $table) { Schema::create('news', function (Blueprint $table) {
$table->id(); $table->id();
$table->string("name"); $table->string("name");
$table->string('subname');
$table->text("content"); $table->text("content");
$table->timestamps(); $table->timestamps();
}); });

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

@ -69,7 +69,7 @@
} }
div.header { div.header {
background-color: #4CAF50; background-color: #00788a;
color: white; color: white;
padding: 1px; padding: 1px;
font-size: 10px; font-size: 10px;
@ -88,7 +88,7 @@
<div class="card"> <div class="card">
<div class="header"> <div class="header">
<p><b>{{ $new->name }}</b></p> <p><b>{{ $new->name }}</b></p>
<h1>Æggeløb</h1> <h1>{{ $new->subname }}</h1>
</div> </div>
<div class="container"> <div class="container">