diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 423a5df..ad1cdba 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -86,12 +86,9 @@ class EventController extends Controller $news->name = "Ny aktivitet"; $news->subname = $event->name; - $news->content = "

" . $this->closetags(substr($event->description, 0, 300)). "

" . - '
'. //route("userevents.createajax", ["event_id" => $event->id ]) - 'Tilmeld'. - ' $event->id ]) .'">Læs mere'. - ' $event->id ]) .'">Se deltagere'. - '
'; + $news->arrangement_id = $event->id; + $news->type_id = '3'; + $news->content = $event->description; $news->resource_id = $event->resource_id; $news->save(); } @@ -184,11 +181,13 @@ class EventController extends Controller $news->name = "Aktivitet opdateret"; $news->subname = $event->name; + $news->arrangement_id = $event->id; + $news->type_id = '3'; $news->content = "

" . $this->closetags(substr($event->description, 0, 300)). "

" . - '
'. //route("userevents.createajax", ["event_id" => $event->id ]) - 'Tilmeld'. - ' $event->id ]) .'">Læs mere'. - ' $event->id ]) .'">Se deltagere'. + '
'. //route("userevents.createajax", ["event_id" => $event->id ]) + 'Tilmeld'. + ' $event->id ]) .'">Læs mere'. + ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); } diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index d1f9887..49692a0 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -80,8 +80,10 @@ class GuideController extends Controller $news->name = "Ny Vejledning"; $news->subname = $guide->name; + $news->arrangement_id = $guide->id; + $news->type_id = '4'; - $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læs mere'; + $news->content = $guide->guide_articles; $news->resource_id = $guide->resource_id; $news->save(); @@ -142,6 +144,8 @@ class GuideController extends Controller $news->name = "Vejledning opdateret"; $news->subname = $guidee->name; + $news->arrangement_id = $guide->id; + $news->type_id = '4'; $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læs mere'; diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index db6bbac..7e9f6f5 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -77,6 +77,8 @@ class MenuPlanController extends Controller $news->name = "Ny menuplan"; $news->subname = "Uge " . $menuPlan->week; + $news->arrangement_id = $menuPlan->id; + $news->type_id = '2'; $news->content = $menuPlan->menu; if($request->file("resource")) { @@ -142,6 +144,8 @@ class MenuPlanController extends Controller $news->name = "Opdateret menuplan"; $news->subname = "Uge " . $menuplan->week; + $news->arrangement_id = $menuplan->id; + $news->type_id = '2'; $news->content = $menuplan->menu; $news->save(); diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index 8e802d5..f6f1144 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -56,6 +56,7 @@ class NewsController extends Controller $news = new News($data); $news->name = ""; + $news->type_id = '1'; $news->save(); return redirect()->route("news.index"); @@ -93,7 +94,7 @@ class NewsController extends Controller public function update(Request $request, News $news) { $data = $request->validate([ - "name" => "required", + "subname" => "required", "content" => "required" ]); diff --git a/skolehjem/app/Http/Controllers/NewsTypeController.php b/skolehjem/app/Http/Controllers/NewsTypeController.php new file mode 100644 index 0000000..7f59b32 --- /dev/null +++ b/skolehjem/app/Http/Controllers/NewsTypeController.php @@ -0,0 +1,24 @@ +Du er hermed tilmeldt denne aktivitet!

'; } + + public function createajaxcancel(Request $request) + { + // Check the UserEvent table if there is a row that has the user_id AND the event_id + $UserEvent = UserEvent::where('user_id', auth()->user()->id) + ->where('event_id', $request->event_id); + + + // If you are in the Event, then remove yourself. + if (count($UserEvent->get()) > 0) { + // If not, then it keeps going and saves and shows a success message + $UserEvent->delete(); + + if (request()->cookie('languagesSetting') == "dk") + return '

Du er hermed afmeldt aktiviteten!

'; + if (request()->cookie('languagesSetting') == "en") + return '

You are no longer participating in this event!

'; + + return '

Du er hermed afmeldt aktiviteten!

'; + } + } } diff --git a/skolehjem/app/News.php b/skolehjem/app/News.php index fead782..8f6f0c4 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', 'resource_id' + 'name', 'subname', 'content', 'resource_id', 'arrangement_id', 'type' ]; } diff --git a/skolehjem/app/NewsType.php b/skolehjem/app/NewsType.php new file mode 100644 index 0000000..f07508f --- /dev/null +++ b/skolehjem/app/NewsType.php @@ -0,0 +1,12 @@ +string('subname'); $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"); $table->timestamps(); }); } diff --git a/skolehjem/database/migrations/2020_08_11_092000_create_news_type.php b/skolehjem/database/migrations/2020_08_11_092000_create_news_type.php new file mode 100644 index 0000000..eca5083 --- /dev/null +++ b/skolehjem/database/migrations/2020_08_11_092000_create_news_type.php @@ -0,0 +1,32 @@ +id(); + $table->string("type"); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('news_types'); + } +} diff --git a/skolehjem/database/seeds/DatabaseSeeder.php b/skolehjem/database/seeds/DatabaseSeeder.php index dfd923b..2ab2566 100644 --- a/skolehjem/database/seeds/DatabaseSeeder.php +++ b/skolehjem/database/seeds/DatabaseSeeder.php @@ -16,5 +16,6 @@ class DatabaseSeeder extends Seeder $this->call(UserSeeder::class); $this->call(ContactSeeder::class); $this->call(LocationSeeder::class); + $this->call(NewsTypeSeeder::class); } } diff --git a/skolehjem/database/seeds/NewsTypeSeeder.php b/skolehjem/database/seeds/NewsTypeSeeder.php new file mode 100644 index 0000000..f31b6da --- /dev/null +++ b/skolehjem/database/seeds/NewsTypeSeeder.php @@ -0,0 +1,37 @@ + "News", + ], + [ + 'type' => "Menu", + ], + [ + 'type' => "Activity", + ], + [ + 'type' => "Guide", + ], + ]; + + foreach ($newstypedata as $data) { + $newsType = new \App\NewsType(); + + $newsType->type = $data["type"]; + + $newsType->save(); + } + } +} diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index d31a0be..48bd4a0 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -7019,6 +7019,10 @@ main { bottom: 30px; } +.container > * { + word-break: break-word; +} + #snackbar.show { visibility: visible; -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s; diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index a3fa2c4..238bd99 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -7019,6 +7019,10 @@ main { bottom: 30px; } +.container > * { + word-break: break-word; +} + #snackbar.show { visibility: visible; -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s; diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index 32f5729..fb059ae 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -53,6 +53,9 @@ return[ "ændrer" => "Skift", "profilbillede" => "Upload profil billede", "omkring" => "Omkring", + "læsmere" => "Læs mere", + "sedeltagere" => "Se deltagere", + "af" => "Af" diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 6efd68b..a8b7008 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -17,7 +17,7 @@ return[ "dereringenmenuplanerdenneuge" => "There is no menu for this week", "uge" => "week", "ugestor" => "Week", - "dereringenaktiviteter" => "There is no activity this week", + "dereringenaktiviteter" => "There are no activities", "setilmeldteaktiviteter" => "See registered Activities", "tilmeldteaktiviteter" => "Your registered Activities", "tilmeldtesnavn" => "Participants", @@ -61,5 +61,8 @@ return[ "ændrebillede" => "Change picture", "ændrer" => "Change", "profilbillede" => "Upload profile picture", - "Omkring" => "About", + "omkring" => "About", + "læsmere" => "Read more", + "sedeltagere" => "See participants", + "af" => "By" ]; diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index 4a33da4..3b6f714 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -524,6 +524,10 @@ $primary-color: $blue; bottom: 30px; } +.container > * { + word-break: break-word; +} + #snackbar.show { visibility: visible; -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s; diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index f4bf348..779f707 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -53,9 +53,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 5dd32de..5e0e371 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -52,9 +52,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index 00d663d..b702be3 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -48,9 +48,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index 0597a2a..de2d78e 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -48,9 +48,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index 2493a78..432e0ec 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -63,9 +63,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': ['#ffffff-#000000'] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 7c91c33..eae43e5 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -47,9 +47,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/news/create.blade.php b/skolehjem/resources/views/admin/news/create.blade.php index e8ea921..7c80196 100644 --- a/skolehjem/resources/views/admin/news/create.blade.php +++ b/skolehjem/resources/views/admin/news/create.blade.php @@ -33,9 +33,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/admin/news/edit.blade.php b/skolehjem/resources/views/admin/news/edit.blade.php index 41ba581..6472ee3 100644 --- a/skolehjem/resources/views/admin/news/edit.blade.php +++ b/skolehjem/resources/views/admin/news/edit.blade.php @@ -34,9 +34,9 @@ modules: { 'toolbar': [ [ 'bold', 'italic', 'underline', 'strike' ], - [{ 'color': [] }, { 'background': [] }], + [{ 'color': [] }], [{ 'script': 'super' }, { 'script': 'sub' }], - [{ 'header': '1' }, { 'header': '2' }, 'blockquote', 'code-block' ], + [{ 'header': '1' }, { 'header': '2' }, 'blockquote' ], [{ 'list': 'ordered' }, { 'list': 'bullet'}, { 'indent': '-1' }, { 'indent': '+1' }], [ {'direction': 'rtl'}, { 'align': [] }], [ 'link' ], diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 29c10b8..944c148 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -41,7 +41,7 @@ @if($event->resource_id !== null)

{{ $event->name }}

-

Af: {{ $event->accountable }}

+

{{__('msg.af')}}: {{ $event->accountable }}

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

@else @@ -51,14 +51,15 @@

{{ \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) )!!} {!! session()->get('error#' . $event->id) !!} {!! session()->get('signup#' . $event->id) !!} -
diff --git a/skolehjem/resources/views/app/events/show.blade.php b/skolehjem/resources/views/app/events/show.blade.php index a07bf84..b23f0b4 100644 --- a/skolehjem/resources/views/app/events/show.blade.php +++ b/skolehjem/resources/views/app/events/show.blade.php @@ -13,7 +13,9 @@

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

-

{{ $event->name }}

+

{{ $event->name }}

+

{{__('msg.af')}}: {{ $event->accountable }}

+

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

{!!$event->description!!}
diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index 4da8260..f4296b6 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -4,6 +4,34 @@ @endsection @section("content") + +

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

{!! session()->get('eventunsubscribed') !!} @@ -12,10 +40,29 @@
@csrf @method("delete") -

{{$userevent->name}}

-

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

-

{!! $userevent->description !!}

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

{{ $userevent->name }}

+

{{__('msg.af')}}: {{ $userevent->accountable }}

+

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

+
+ @else +
+

{{ $userevent->name }}

+

{{__('msg.af')}}: {{ $userevent->accountable }}

+

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

+
+ @endif +
+ {!! \App\Helpers::closetags(substr($userevent->description, 0, 300) )!!} + +
+
@endforeach @else diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index 31a4630..1bd1187 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -48,7 +48,9 @@ @endif
{!! \App\Helpers::closetags(substr($guide->guide_articles, 0, 300)) !!} - $guide->id ])}}">Læs mere +
@endforeach diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index c534185..5c32db3 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -29,22 +29,43 @@
@foreach(\App\News::query()->orderBy("created_at", "desc")->get() as $new) -
- @if($new->resource_id !== null) -
-

{{ $new->name }}

-

{{ $new->subname }}

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

{{ $new->name }}

+

{{ $new->subname }}

+
+ @else +
+

{{ $new->name }}

+

{{ $new->subname }}

+
+ @endif + +
+ @if ($new->type_id == 1 || $new->type_id == 2) {{-- If it's a news or menu then display the whole message --}} + {!! $new->content !!} + @else {{-- If it's a menu, guide or event. Then display up to 300 characters of text --}} + {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} + @endif + + @if ($new->type_id == 3) {{-- If it's displaying an event, then show `Tilmeld`, `Læs mere` & `Se deltagere` --}} +
+ @if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0) + {{__('msg.afmeld')}} + @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} + {{__('msg.tilmeld')}} + @endif + $new->arrangement_id ])}}">{{__('msg.læsmere')}} + $new->arrangement_id ])}}">{{__('msg.sedeltagere')}} +
+ @elseif ($new->type_id == 4) {{-- Else if's displaying guides, then show `Læs mere` --}} + + @endif {{-- Else if it's a menu or news, then don't show a button at bottom --}}
- @else -
-

{{ $new->name }}

-

{{ $new->subname }}

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

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

@@ -58,10 +79,12 @@ var x = document.getElementById("snackbar"); x.innerHTML = data; x.className = "show"; + setTimeout(function(){ x.className = x.className.replace("show", ""); }, 3000); } function ajaxCall(event_id) { + axios.post("{{ route("userevents.createajax") }}", { event_id: event_id @@ -70,10 +93,26 @@ var data = response.data; snackbar(data); + setTimeout(function(){document.location.reload(false)}, 2000); }).catch(function (error) { console.log(error); }); } + function ajaxCallCancel(event_id) { + + axios.post("{{ route("userevents.createajaxcancel") }}", + { + event_id: event_id + } + ).then(function (response) { + var data = response.data; + + snackbar(data); + setTimeout(function(){document.location.reload(false)}, 2000); + }).catch(function (error) { + console.log(error); + }); + } @endsection diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 9fcb986..488a577 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -34,6 +34,7 @@ Route::get("/app/washing-reservations", "WashingReservationController@appindex") Route::get("/settings", "SettingsController@index")->name("settings.index"); Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax"); Route::get("/about", "AboutController@index")->name("about.index"); +Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->name("userevents.createajaxcancel"); //Search/Filter @@ -65,3 +66,4 @@ Route::resource("roles", "RolesController"); Route::resource("guides", "GuideController"); Route::resource("locations", "LocationController"); Route::resource("news", "NewsController"); +Route::resource("newstype", "NewsTypeController");