diff --git a/app/Http/Livewire/Frontend/Welcome.php b/app/Http/Livewire/Frontend/Welcome.php new file mode 100644 index 00000000..74285977 --- /dev/null +++ b/app/Http/Livewire/Frontend/Welcome.php @@ -0,0 +1,13 @@ +sortable(), - Text::make('Title') + Text::make(__('Title'), 'title') ->rules('required', 'string'), - Number::make('Latitude') + Number::make(__('Latitude'), 'latitude') ->rules('required', 'numeric') ->step(0.000001) ->hideFromIndex(), - Number::make('Longitude') - ->rules('required', 'numeric') - ->step(0.000001) - ->hideFromIndex(), + Number::make(__('Longitude'), 'longitude') + ->rules('required', 'numeric') + ->step(0.000001) + ->hideFromIndex(), - Text::make('Address') + Text::make(__('Address'), 'address') ->rules('required', 'string'), - Text::make('Type') + Text::make(__('Type'), 'type') ->rules('required', 'string'), - Text::make('Open') + Text::make(__('Open'), 'open') ->rules('required', 'string') ->hideFromIndex(), - Text::make('Comment') + Text::make(__('Comment'), 'comment') ->rules('required', 'string') ->hideFromIndex(), - Text::make('Contact') + Text::make(__('Contact'), 'contact') ->rules('required', 'string') ->hideFromIndex(), - Text::make('Bcz') + Text::make(__('Bcz'), 'bcz') ->rules('required', 'string') ->hideFromIndex(), - Boolean::make('Digital') + Boolean::make(__('Digital'), 'digital') ->rules('required') ->hideFromIndex(), - Text::make('Icontype') + Text::make(__('Icontype'), 'icontype') ->rules('required', 'string') ->hideFromIndex(), - Boolean::make('Deactivated') + Boolean::make(__('Deactivated'), 'deactivated') ->rules('required'), - Text::make('Deactreason') + Text::make(__('Deactreason'), 'deactreason') ->rules('required', 'string') ->hideFromIndex(), - Text::make('Entrytype') + Text::make(__('Entrytype'), 'entrytype') ->rules('required', 'string') ->hideFromIndex(), - Text::make('Homepage') + Text::make(__('Homepage'), 'homepage') ->rules('required', 'string') ->hideFromIndex(), - HasMany::make('OrangePills'), + HasMany::make(__('OrangePills'), 'orangePills', OrangePill::class), - MorphMany::make('Comments'), + MorphMany::make(__('Comments'), 'comments', Comment::class), ]; } diff --git a/app/Nova/Category.php b/app/Nova/Category.php index f72a67c4..492f26a3 100644 --- a/app/Nova/Category.php +++ b/app/Nova/Category.php @@ -2,55 +2,54 @@ namespace App\Nova; -use Laravel\Nova\Fields\ID; use Illuminate\Http\Request; -use Laravel\Nova\Fields\Text; use Laravel\Nova\Fields\BelongsToMany; +use Laravel\Nova\Fields\ID; +use Laravel\Nova\Fields\Text; class Category extends Resource { /** * The model the resource corresponds to. - * * @var string */ public static $model = \App\Models\Category::class; /** * The single value that should be used to represent the resource when being displayed. - * * @var string */ - public static $title = 'id'; + public static $title = 'name'; /** * The columns that should be searched. - * * @var array */ public static $search = [ 'id', + 'name', ]; /** * Get the fields displayed by the resource. * * @param \Illuminate\Http\Request $request + * * @return array */ public function fields(Request $request) { return [ - ID::make()->sortable(), + ID::make() + ->sortable(), - Text::make('Name') + Text::make(__('Name'), 'name') ->rules('required', 'string'), - Text::make('Slug') + Text::make(__('Slug'), 'slug') ->rules('required', 'string', 'unique:categories,slug'), - BelongsToMany::make('Courses'), - + BelongsToMany::make(__('Courses'), 'courses', Course::class), ]; } @@ -59,6 +58,7 @@ class Category extends Resource * Get the cards available for the request. * * @param \Illuminate\Http\Request $request + * * @return array */ public function cards(Request $request) @@ -70,6 +70,7 @@ class Category extends Resource * Get the filters available for the resource. * * @param \Illuminate\Http\Request $request + * * @return array */ public function filters(Request $request) @@ -81,6 +82,7 @@ class Category extends Resource * Get the lenses available for the resource. * * @param \Illuminate\Http\Request $request + * * @return array */ public function lenses(Request $request) @@ -92,6 +94,7 @@ class Category extends Resource * Get the actions available for the resource. * * @param \Illuminate\Http\Request $request + * * @return array */ public function actions(Request $request) diff --git a/app/Nova/City.php b/app/Nova/City.php index 6698eab8..d992550b 100644 --- a/app/Nova/City.php +++ b/app/Nova/City.php @@ -44,23 +44,23 @@ class City extends Resource ID::make() ->sortable(), - Text::make('Name') + Text::make(__('Name'), 'name') ->rules('required', 'string'), - Text::make('Slug') + Text::make(__('Slug'), 'slug') ->exceptOnForms(), - Number::make('Latitude') + Number::make(__('Latitude'), 'latitude') ->rules('required', 'numeric') ->step(0.000001) ->help('https://www.latlong.net/'), - Number::make('Longitude') + Number::make(__('Longitude'), 'longitude') ->rules('required', 'numeric') ->step(0.000001) ->help('https://www.latlong.net/'), - BelongsTo::make('Country'), + BelongsTo::make(__('Country'), 'country', Country::class), ]; } diff --git a/app/Nova/Comment.php b/app/Nova/Comment.php index f27fb5ad..a88e1689 100644 --- a/app/Nova/Comment.php +++ b/app/Nova/Comment.php @@ -20,26 +20,26 @@ class Comment extends Resource public function fields(NovaRequest $request) { return [ - Text::make('title', function (CommentModel $comment) { + Text::make(__('Title'), function (CommentModel $comment) { return $comment->topLevel()->commentable?->commentableName() ?? 'Deleted...'; })->readonly(), - MorphTo::make('Commentator')->types([ + MorphTo::make(__('Commentator'), 'commentator')->types([ User::class, ]), - Markdown::make('Original text'), + Markdown::make(__('Original text'), 'original_text'), Text::make('', function (CommentModel $comment) { if (! $url = $comment?->commentUrl()) { return ''; } - return "Show"; + return "".__('Show').""; })->asHtml(), - Text::make('status', function(CommentModel $comment) { + Text::make(__('Status'), function(CommentModel $comment) { if ($comment->isApproved()) { return "
Approved
"; } @@ -47,7 +47,8 @@ class Comment extends Resource return "
Pending
"; })->asHtml(), - DateTime::make('Created at'), + DateTime::make(__('Created at'), 'created_at'), + ]; } } diff --git a/app/Nova/Country.php b/app/Nova/Country.php index b8823bbc..a4d0b267 100644 --- a/app/Nova/Country.php +++ b/app/Nova/Country.php @@ -44,18 +44,18 @@ class Country extends Resource ID::make() ->sortable(), - Text::make('Name') + Text::make(__('Name'), 'name') ->rules('required', 'string'), - MultiSelect::make('Languages', 'language_codes') + MultiSelect::make(__('Languages'), 'language_codes') ->options( config('languages.languages'), ), - Text::make('Code') + Text::make(__('Code'), 'code') ->rules('required', 'string'), - HasMany::make('Cities'), + HasMany::make(__('Cities'), 'cities', City::class), ]; } diff --git a/app/Nova/Course.php b/app/Nova/Course.php index 49a5807a..19972132 100644 --- a/app/Nova/Course.php +++ b/app/Nova/Course.php @@ -59,28 +59,34 @@ class Course extends Resource ID::make() ->sortable(), - Images::make('Main picture', 'logo') + Images::make(__('Main picture'), 'logo') ->conversionOnIndexView('thumb'), - Images::make('Images', 'images') + // todo: english + Images::make(__('Images'), 'images') ->conversionOnIndexView('thumb') - ->help('Lade hier Bilder hoch, um sie eventuell später in der Markdown Description einzufügen. Du musst vorher aber Speichern.'), + ->help(__('Lade hier Bilder hoch, um sie eventuell später in der Markdown Description einzufügen. Du musst vorher aber Speichern.')), - Tags::make('Tags')->type('course')->withLinkToTagResource(Tag::class), + Tags::make(__('Tags')) + ->type('course') + ->withLinkToTagResource(Tag::class), - Text::make('Name') + Text::make(__('Name'), 'name') ->rules('required', 'string'), - Markdown::make('Description') + Markdown::make(__('Description'), 'description') ->alwaysShow() - ->help('Markdown ist erlaubt. Du kannst Bilder aus dem Feld "Images" hier einfügen. Benutze das Link Symbol der Bilder für die Urls, nach dem du auf "Aktualisieren und Weiterarbeiten" geklickt hast.'), + ->help(__('Markdown ist erlaubt. Du kannst Bilder aus dem Feld "Images" hier einfügen. Benutze das Link Symbol der Bilder für die Urls, nach dem du auf "Aktualisieren und Weiterarbeiten" geklickt hast.')), - BelongsTo::make('Lecturer'), + BelongsTo::make(__('Lecturer'), 'lecturer', Lecturer::class) + ->searchable() + ->help(__('Wähle hier den Dozenten aus, der den Kurs hält. Wenn der Dozent nicht in der Liste ist, dann erstelle ihn zuerst unter "Dozenten".')), - SelectPlus::make('Categories', 'categories', Category::class) + SelectPlus::make(__('Categories'), 'categories', Category::class) ->usingIndexLabel('name'), - BelongsToMany::make('Categories')->onlyOnDetail(), + BelongsToMany::make(__('Categories'), 'categories', Category::class) + ->onlyOnDetail(), ]; } diff --git a/app/Nova/Episode.php b/app/Nova/Episode.php index dada5eb0..38834317 100644 --- a/app/Nova/Episode.php +++ b/app/Nova/Episode.php @@ -80,27 +80,27 @@ class Episode extends Resource ID::make() ->sortable(), - Avatar::make('Image') + Avatar::make(__('Image')) ->squared() ->thumbnail(function () { return $this->data['image']; }) ->exceptOnForms(), - Tags::make('Tags') + Tags::make(__('Tags')) ->type('library_item') ->withLinkToTagResource(Tag::class), - Text::make('Title', 'data->title') + Text::make(__('Title'), 'data->title') ->readonly() ->rules('required', 'string'), - Code::make('Data') + Code::make(__('Data'), 'data') ->readonly() ->rules('required', 'json') ->json(), - BelongsTo::make('Podcast') + BelongsTo::make(__('Podcast'), 'podcast', Podcast::class) ->readonly(), ]; diff --git a/app/Nova/Event.php b/app/Nova/Event.php index 803e601b..1e7a6e6c 100644 --- a/app/Nova/Event.php +++ b/app/Nova/Event.php @@ -70,6 +70,7 @@ class Event extends Resource ->displayUsing(fn($value) => $value->asDateTime()), BelongsTo::make('Course'), + BelongsTo::make('Venue') ->searchable(), diff --git a/composer.lock b/composer.lock index 867a84f3..b09f8055 100644 --- a/composer.lock +++ b/composer.lock @@ -3067,16 +3067,16 @@ }, { "name": "league/commonmark", - "version": "2.3.7", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "a36bd2be4f5387c0f3a8792a0d76b7d68865abbf" + "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/a36bd2be4f5387c0f3a8792a0d76b7d68865abbf", - "reference": "a36bd2be4f5387c0f3a8792a0d76b7d68865abbf", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47", + "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47", "shasum": "" }, "require": { @@ -3104,7 +3104,7 @@ "symfony/finder": "^5.3 | ^6.0", "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", "unleashedtech/php-coding-standard": "^3.1.1", - "vimeo/psalm": "^4.24.0" + "vimeo/psalm": "^4.24.0 || ^5.0.0" }, "suggest": { "symfony/yaml": "v2.3+ required if using the Front Matter extension" @@ -3169,20 +3169,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T17:29:46+00:00" + "time": "2022-12-10T16:02:17+00:00" }, { "name": "league/config", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/thephpleague/config.git", - "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e" + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e", - "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e", + "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", "shasum": "" }, "require": { @@ -3191,7 +3191,7 @@ "php": "^7.4 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.90", + "phpstan/phpstan": "^1.8.2", "phpunit/phpunit": "^9.5.5", "scrutinizer/ocular": "^1.8.1", "unleashedtech/php-coding-standard": "^3.1", @@ -3251,7 +3251,7 @@ "type": "github" } ], - "time": "2021-08-14T12:15:32+00:00" + "time": "2022-12-11T20:36:23+00:00" }, { "name": "league/flysystem", @@ -3711,23 +3711,23 @@ }, { "name": "maennchen/zipstream-php", - "version": "2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98" + "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", - "reference": "8df0a40fff7b5cbf86cf9a6d7d8d15b9bc03bc98", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", + "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3", "shasum": "" }, "require": { + "ext-mbstring": "*", "myclabs/php-enum": "^1.5", "php": "^8.0", - "psr/http-message": "^1.0", - "symfony/polyfill-mbstring": "^1.0" + "psr/http-message": "^1.0" }, "require-dev": { "ext-zip": "*", @@ -3736,7 +3736,7 @@ "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.4", "phpunit/phpunit": "^8.5.8 || ^9.4.2", - "vimeo/psalm": "^4.1" + "vimeo/psalm": "^5.0" }, "type": "library", "autoload": { @@ -3773,7 +3773,7 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.3.0" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0" }, "funding": [ { @@ -3785,7 +3785,7 @@ "type": "open_collective" } ], - "time": "2022-11-28T12:13:34+00:00" + "time": "2022-12-08T12:29:14+00:00" }, { "name": "masterminds/html5", @@ -12944,16 +12944,16 @@ }, { "name": "laravel-lang/lang", - "version": "12.5.8", + "version": "12.6.1", "source": { "type": "git", "url": "https://github.com/Laravel-Lang/lang.git", - "reference": "c11b2cb92a8873b9ea16b25012b5b13dce7a2935" + "reference": "4d099a2b7f5cfcda82cc8dc1c39620eb69d66d1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/c11b2cb92a8873b9ea16b25012b5b13dce7a2935", - "reference": "c11b2cb92a8873b9ea16b25012b5b13dce7a2935", + "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/4d099a2b7f5cfcda82cc8dc1c39620eb69d66d1f", + "reference": "4d099a2b7f5cfcda82cc8dc1c39620eb69d66d1f", "shasum": "" }, "require": { @@ -13015,7 +13015,7 @@ "type": "open_collective" } ], - "time": "2022-12-05T18:46:34+00:00" + "time": "2022-12-11T22:31:57+00:00" }, { "name": "laravel-lang/publisher", @@ -14071,16 +14071,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.26", + "version": "9.5.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38", + "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38", "shasum": "" }, "require": { @@ -14153,7 +14153,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27" }, "funding": [ { @@ -14169,7 +14169,7 @@ "type": "tidelift" } ], - "time": "2022-10-28T06:00:21+00:00" + "time": "2022-12-09T07:31:23+00:00" }, { "name": "sebastian/cli-parser", @@ -15281,16 +15281,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "2b79cf6ed40946b64ac6713d7d2da8a9d87f612b" + "reference": "d6e1e1ad93abe280abf41c33f8ea7647dfc0c233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2b79cf6ed40946b64ac6713d7d2da8a9d87f612b", - "reference": "2b79cf6ed40946b64ac6713d7d2da8a9d87f612b", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/d6e1e1ad93abe280abf41c33f8ea7647dfc0c233", + "reference": "d6e1e1ad93abe280abf41c33f8ea7647dfc0c233", "shasum": "" }, "require": { @@ -15367,7 +15367,7 @@ "type": "github" } ], - "time": "2022-10-26T17:39:54+00:00" + "time": "2022-12-08T15:31:38+00:00" }, { "name": "symfony/yaml", diff --git a/public/img/20220915_007_industryday.webp b/public/img/20220915_007_industryday.webp new file mode 100644 index 00000000..b739645b Binary files /dev/null and b/public/img/20220915_007_industryday.webp differ diff --git a/public/img/Krypto-Fiat-Bros.webp b/public/img/Krypto-Fiat-Bros.webp new file mode 100644 index 00000000..6cc5c520 Binary files /dev/null and b/public/img/Krypto-Fiat-Bros.webp differ diff --git a/public/img/aprycot-media-bitcoin-21-lektionen-01.webp b/public/img/aprycot-media-bitcoin-21-lektionen-01.webp new file mode 100644 index 00000000..e39cf48f Binary files /dev/null and b/public/img/aprycot-media-bitcoin-21-lektionen-01.webp differ diff --git a/public/img/einundzwanzig_podcast_niko_jilch.jpg b/public/img/einundzwanzig_podcast_niko_jilch.jpg new file mode 100644 index 00000000..eaf373b7 Binary files /dev/null and b/public/img/einundzwanzig_podcast_niko_jilch.jpg differ diff --git a/public/img/gradient-blob.svg b/public/img/gradient-blob.svg new file mode 100644 index 00000000..10099e63 --- /dev/null +++ b/public/img/gradient-blob.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/meetup_saarland.jpg b/public/img/meetup_saarland.jpg new file mode 100644 index 00000000..b793ac1f Binary files /dev/null and b/public/img/meetup_saarland.jpg differ diff --git a/public/img/vhs_kurs.jpg b/public/img/vhs_kurs.jpg new file mode 100644 index 00000000..8bd4d874 Binary files /dev/null and b/public/img/vhs_kurs.jpg differ diff --git a/resources/views/columns/cities/action.blade.php b/resources/views/columns/cities/action.blade.php index 4a15945d..80389f5b 100644 --- a/resources/views/columns/cities/action.blade.php +++ b/resources/views/columns/cities/action.blade.php @@ -2,7 +2,7 @@
- Umkreis-Suche Kurs-Termin {{ $row->name }}(100km) + Umkreis-Suche Kurs-Termin {{ $row->name }} (100km)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 4a645df2..6e54ede8 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -5,6 +5,10 @@ {{ config('app.name', 'Laravel') }} + + + + @googlefonts diff --git a/resources/views/livewire/frontend/header.blade.php b/resources/views/livewire/frontend/header.blade.php index 4321e9fd..1c6a0a0b 100644 --- a/resources/views/livewire/frontend/header.blade.php +++ b/resources/views/livewire/frontend/header.blade.php @@ -15,7 +15,7 @@
- diff --git a/resources/views/livewire/frontend/welcome.blade.php b/resources/views/livewire/frontend/welcome.blade.php new file mode 100644 index 00000000..eadf9f96 --- /dev/null +++ b/resources/views/livewire/frontend/welcome.blade.php @@ -0,0 +1,146 @@ + diff --git a/routes/web.php b/routes/web.php index a4bb22c0..8f5dbfcb 100644 --- a/routes/web.php +++ b/routes/web.php @@ -2,9 +2,7 @@ use Illuminate\Support\Facades\Route; -Route::get('/', function () { - return to_route('search.city', ['country' => 'de']); -}) +Route::get('/', \App\Http\Livewire\Frontend\Welcome::class) ->name('welcome'); Route::get('/auth/ln', \App\Http\Livewire\Auth\LNUrlAuth::class)