einundzwanzig/einundzwanzig-portal
1
0
Fork 0
mirror of https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git synced 2025-12-11 06:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

lecturer cource events

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2023-03-28 13:13:39 +02:00
parent b80d9b9d00
commit 4534a57c02
6 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Livewire/Tables/LecturerTable.php
View File

@@ -85,6 +85,7 @@ class LecturerTable extends DataTableComponent
return Lecturer::query() return Lecturer::query()
->withCount([ ->withCount([
'courses', 'courses',
'coursesEvents',
'libraryItems' => fn($query) => $query->where('news', false) 'libraryItems' => fn($query) => $query->where('news', false)
]); ]);
} }

2
app/Http/Middleware/Authenticate.php
View File

@@ -12,6 +12,6 @@ class Authenticate extends Middleware
*/ */
protected function redirectTo(Request $request): ?string protected function redirectTo(Request $request): ?string
{ {
return $request->expectsJson() ? null : route('login'); return $request->expectsJson() ? null : route('auth.ln');
} }
} }

3
composer.json
View File

@@ -121,7 +121,8 @@
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true, "sort-packages": true,
"allow-plugins": { "allow-plugins": {
"pestphp/pest-plugin": true "pestphp/pest-plugin": true,
"php-http/discovery": true
} }
}, },
"minimum-stability": "dev", "minimum-stability": "dev",

88
composer.lock generated
View File

@@ -6287,38 +6287,44 @@
}, },
{ {
"name": "php-http/discovery", "name": "php-http/discovery",
"version": "1.14.3", "version": "1.15.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-http/discovery.git", "url": "https://github.com/php-http/discovery.git",
"reference": "31d8ee46d0215108df16a8527c7438e96a4d7735" "reference": "5cc428320191ac1d0b6520034c2dc0698628ced5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-http/discovery/zipball/31d8ee46d0215108df16a8527c7438e96a4d7735", "url": "https://api.github.com/repos/php-http/discovery/zipball/5cc428320191ac1d0b6520034c2dc0698628ced5",
"reference": "31d8ee46d0215108df16a8527c7438e96a4d7735", "reference": "5cc428320191ac1d0b6520034c2dc0698628ced5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer-plugin-api": "^1.0|^2.0",
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"conflict": { "conflict": {
"nyholm/psr7": "<1.0" "nyholm/psr7": "<1.0"
}, },
"provide": {
"php-http/async-client-implementation": "*",
"php-http/client-implementation": "*",
"psr/http-client-implementation": "*",
"psr/http-factory-implementation": "*",
"psr/http-message-implementation": "*"
},
"require-dev": { "require-dev": {
"composer/composer": "^1.0.2|^2.0",
"graham-campbell/phpspec-skip-example-extension": "^5.0", "graham-campbell/phpspec-skip-example-extension": "^5.0",
"php-http/httplug": "^1.0 || ^2.0", "php-http/httplug": "^1.0 || ^2.0",
"php-http/message-factory": "^1.0", "php-http/message-factory": "^1.0",
"phpspec/phpspec": "^5.1 || ^6.1" "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3",
"symfony/phpunit-bridge": "^6.2"
}, },
"suggest": { "type": "composer-plugin",
"php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories"
},
"type": "library",
"extra": { "extra": {
"branch-alias": { "class": "Http\\Discovery\\Composer\\Plugin",
"dev-master": "1.9-dev" "plugin-optional": true
}
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@@ -6335,7 +6341,7 @@
"email": "mark.sagikazar@gmail.com" "email": "mark.sagikazar@gmail.com"
} }
], ],
"description": "Finds installed HTTPlug implementations and PSR-7 message factories", "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations",
"homepage": "http://php-http.org", "homepage": "http://php-http.org",
"keywords": [ "keywords": [
"adapter", "adapter",
@@ -6344,13 +6350,14 @@
"factory", "factory",
"http", "http",
"message", "message",
"psr17",
"psr7" "psr7"
], ],
"support": { "support": {
"issues": "https://github.com/php-http/discovery/issues", "issues": "https://github.com/php-http/discovery/issues",
"source": "https://github.com/php-http/discovery/tree/1.14.3" "source": "https://github.com/php-http/discovery/tree/1.15.2"
}, },
"time": "2022-07-11T14:04:40+00:00" "time": "2023-02-11T08:28:41+00:00"
}, },
{ {
"name": "php-http/httplug", "name": "php-http/httplug",
@@ -7330,16 +7337,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.11.13", "version": "v0.11.14",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "722317c9f5627e588788e340f29b923e58f92f54" "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17",
"reference": "722317c9f5627e588788e340f29b923e58f92f54", "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -7400,9 +7407,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/bobthecow/psysh/issues", "issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.13" "source": "https://github.com/bobthecow/psysh/tree/v0.11.14"
}, },
"time": "2023-03-21T14:22:44+00:00" "time": "2023-03-28T03:41:01+00:00"
}, },
{ {
"name": "pusher/pusher-php-server", "name": "pusher/pusher-php-server",
@@ -7902,12 +7909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ramsey/uuid.git", "url": "https://github.com/ramsey/uuid.git",
"reference": "bf2bee216a4379eaf62162307d62bb7850405fec" "reference": "8e955307d32dc9b6992440ff81321d3cb09db75a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/bf2bee216a4379eaf62162307d62bb7850405fec", "url": "https://api.github.com/repos/ramsey/uuid/zipball/8e955307d32dc9b6992440ff81321d3cb09db75a",
"reference": "bf2bee216a4379eaf62162307d62bb7850405fec", "reference": "8e955307d32dc9b6992440ff81321d3cb09db75a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -7987,7 +7994,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-02-07T16:14:23+00:00" "time": "2023-03-27T22:05:11+00:00"
}, },
{ {
"name": "rap2hpoutre/fast-excel", "name": "rap2hpoutre/fast-excel",
@@ -8189,32 +8196,31 @@
}, },
{ {
"name": "sentry/sentry", "name": "sentry/sentry",
"version": "3.16.0", "version": "3.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/getsentry/sentry-php.git", "url": "https://github.com/getsentry/sentry-php.git",
"reference": "5326a8786b8c7c3a51ea0c6d06e6cb6a9dfa6779" "reference": "95d2e932383cf684f77acff0d2a5aef5ad2f1933"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/5326a8786b8c7c3a51ea0c6d06e6cb6a9dfa6779", "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/95d2e932383cf684f77acff0d2a5aef5ad2f1933",
"reference": "5326a8786b8c7c3a51ea0c6d06e6cb6a9dfa6779", "reference": "95d2e932383cf684f77acff0d2a5aef5ad2f1933",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"guzzlehttp/promises": "^1.4", "guzzlehttp/promises": "^1.4",
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
"jean85/pretty-package-versions": "^1.5|^2.0.4", "jean85/pretty-package-versions": "^1.5|^2.0.4",
"php": "^7.2|^8.0", "php": "^7.2|^8.0",
"php-http/async-client-implementation": "^1.0", "php-http/async-client-implementation": "^1.0",
"php-http/client-common": "^1.5|^2.0", "php-http/client-common": "^1.5|^2.0",
"php-http/discovery": "^1.11, <1.15", "php-http/discovery": "^1.15",
"php-http/httplug": "^1.1|^2.0", "php-http/httplug": "^1.1|^2.0",
"php-http/message": "^1.5", "php-http/message": "^1.5",
"psr/http-factory": "^1.0", "psr/http-factory": "^1.0",
"psr/http-message-implementation": "^1.0", "psr/http-factory-implementation": "^1.0",
"psr/log": "^1.0|^2.0|^3.0", "psr/log": "^1.0|^2.0|^3.0",
"symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0", "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0",
"symfony/polyfill-php80": "^1.17" "symfony/polyfill-php80": "^1.17"
@@ -8225,6 +8231,7 @@
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^2.19|3.4.*", "friendsofphp/php-cs-fixer": "^2.19|3.4.*",
"guzzlehttp/psr7": "^1.8.4|^2.1.1",
"http-interop/http-factory-guzzle": "^1.0", "http-interop/http-factory-guzzle": "^1.0",
"monolog/monolog": "^1.6|^2.0|^3.0", "monolog/monolog": "^1.6|^2.0|^3.0",
"nikic/php-parser": "^4.10.3", "nikic/php-parser": "^4.10.3",
@@ -8277,7 +8284,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/getsentry/sentry-php/issues", "issues": "https://github.com/getsentry/sentry-php/issues",
"source": "https://github.com/getsentry/sentry-php/tree/3.16.0" "source": "https://github.com/getsentry/sentry-php/tree/3.17.0"
}, },
"funding": [ "funding": [
{ {
@@ -8289,7 +8296,7 @@
"type": "custom" "type": "custom"
} }
], ],
"time": "2023-03-16T10:37:16+00:00" "time": "2023-03-26T21:54:06+00:00"
}, },
{ {
"name": "sentry/sentry-laravel", "name": "sentry/sentry-laravel",
@@ -16159,16 +16166,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.6.5", "version": "9.6.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5" "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86e761949019ae83f49240b2f2123fb5ab3b2fc5", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"reference": "86e761949019ae83f49240b2f2123fb5ab3b2fc5", "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -16241,7 +16248,8 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.5" "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6"
}, },
"funding": [ "funding": [
{ {
@@ -16257,7 +16265,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-03-09T06:34:10+00:00" "time": "2023-03-27T11:43:46+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

4
resources/views/columns/lectures/action.blade.php
View File

@@ -4,7 +4,7 @@
<x-button <x-button
xs amber wire:click="lecturerSearch({{ $row->id }})"> xs amber wire:click="lecturerSearch({{ $row->id }})">
<i class="fa fa-thin fa-calendar mr-2"></i> <i class="fa fa-thin fa-calendar mr-2"></i>
{{ __('Show dates') }} ({{ $row->courses_count }}) {{ __('Show dates') }} ({{ $row->courses_events_count }})
</x-button> </x-button>
@endif @endif
</div> </div>
@@ -13,7 +13,7 @@
<x-button <x-button
xs outlined wire:click="lecturerSearch({{ $row->id }})"> xs outlined wire:click="lecturerSearch({{ $row->id }})">
<i class="fa fa-thin fa-calendar mr-2"></i> <i class="fa fa-thin fa-calendar mr-2"></i>
{{ __('Show dates') }} ({{ $row->courses_count }}) {{ __('Show dates') }} ({{ $row->courses_events_count }})
</x-button> </x-button>
@endif @endif
</div> </div>

2
resources/views/livewire/frontend/welcome.blade.php
View File

@@ -71,7 +71,7 @@
<div <div
class="row-span-2 col-span-full sm:col-span-1 md:col-start-1 xl:col-start-2 sm:row-start-4 md:row-start-5 xl:row-start-2"> class="row-span-2 col-span-full sm:col-span-1 md:col-start-1 xl:col-start-2 sm:row-start-4 md:row-start-5 xl:row-start-2">
<a href="{{ route('school.table.city', ['country' => $c]) }}" <a href="{{ route('school.table.course', ['country' => $c]) }}"
class="relative flex flex-col items-start justify-end w-full h-full overflow-hidden bg-black shadow-lg rounded-xl group" class="relative flex flex-col items-start justify-end w-full h-full overflow-hidden bg-black shadow-lg rounded-xl group"
style="aspect-ratio: 1/1;"> style="aspect-ratio: 1/1;">
<div class="absolute inset-0 w-full h-full"> <div class="absolute inset-0 w-full h-full">