mirror of
https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git
synced 2025-12-11 06:46:47 +00:00
proximitySearch added
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
models:
|
models:
|
||||||
Category: { name: string, slug: string }
|
Category: { name: string, slug: string }
|
||||||
City: { country_id: biginteger, name: string, slug: string }
|
City: { country_id: biginteger, name: string, slug: string, longitude: 'float:10', latitude: 'float:10' }
|
||||||
Country: { name: string, code: string }
|
Country: { name: string, code: string }
|
||||||
Course: { lecturer_id: biginteger, name: string }
|
Course: { lecturer_id: biginteger, name: string }
|
||||||
Event: { course_id: biginteger, venue_id: biginteger, '"from"': datetime, '"to"': datetime }
|
Event: { course_id: biginteger, venue_id: biginteger, '"from"': datetime, '"to"': datetime }
|
||||||
Lecturer: { team_id: biginteger, name: string, slug: string, active: 'boolean default:1' }
|
Lecturer: { team_id: biginteger, name: string, slug: string, active: 'boolean default:1' }
|
||||||
LoginKey: { }
|
LoginKey: { k1: string, user_id: biginteger }
|
||||||
Membership: { team_id: biginteger, user_id: biginteger, role: 'string nullable' }
|
Membership: { team_id: biginteger, user_id: biginteger, role: 'string nullable' }
|
||||||
Participant: { first_name: string, last_name: string }
|
Participant: { first_name: string, last_name: string }
|
||||||
Registration: { event_id: biginteger, participant_id: biginteger, active: 'boolean default:1' }
|
Registration: { event_id: biginteger, participant_id: biginteger, active: 'boolean default:1' }
|
||||||
|
|||||||
@@ -6,16 +6,20 @@ use App\Models\City;
|
|||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Rappasoft\LaravelLivewireTables\DataTableComponent;
|
use Rappasoft\LaravelLivewireTables\DataTableComponent;
|
||||||
use Rappasoft\LaravelLivewireTables\Views\Column;
|
use Rappasoft\LaravelLivewireTables\Views\Column;
|
||||||
|
use WireUi\Traits\Actions;
|
||||||
|
|
||||||
class CityTable extends DataTableComponent
|
class CityTable extends DataTableComponent
|
||||||
{
|
{
|
||||||
|
use Actions;
|
||||||
|
|
||||||
public string $country;
|
public string $country;
|
||||||
|
|
||||||
protected $model = City::class;
|
protected $model = City::class;
|
||||||
|
|
||||||
public function configure(): void
|
public function configure(): void
|
||||||
{
|
{
|
||||||
$this->setPrimaryKey('id');
|
$this->setPrimaryKey('id')
|
||||||
|
->setAdditionalSelects(['id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function columns(): array
|
public function columns(): array
|
||||||
@@ -44,4 +48,15 @@ class CityTable extends DataTableComponent
|
|||||||
return City::query()
|
return City::query()
|
||||||
->whereHas('country', fn($query) => $query->where('code', $this->country));
|
->whereHas('country', fn($query) => $query->where('code', $this->country));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function proximitySearch($id)
|
||||||
|
{
|
||||||
|
$city = City::query()
|
||||||
|
->find($id);
|
||||||
|
$query = City::radius($city->latitude, $city->longitude, 100)
|
||||||
|
->where('id', '!=', $id);
|
||||||
|
$this->notification()
|
||||||
|
->success('Proximity Search', 'Found '.$query->count().' cities. '.$query->pluck('name')
|
||||||
|
->implode(', '));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,12 +38,12 @@ class EventTable extends DataTableComponent
|
|||||||
->sortable(),
|
->sortable(),
|
||||||
Column::make("Zuletzt geändert", "updated_at")
|
Column::make("Zuletzt geändert", "updated_at")
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Column::make("Teilnehmer")
|
/*Column::make("Teilnehmer")
|
||||||
->label(
|
->label(
|
||||||
fn($row, Column $column) => '<strong>'.$row->registrations->count().'</strong>'
|
fn($row, Column $column) => '<strong>'.$row->registrations->count().'</strong>'
|
||||||
)
|
)
|
||||||
->html()
|
->html()
|
||||||
->sortable(),
|
->sortable(),*/
|
||||||
Column::make('')
|
Column::make('')
|
||||||
->label(
|
->label(
|
||||||
fn($row, Column $column) => view('columns.events.action')->withRow($row)
|
fn($row, Column $column) => view('columns.events.action')->withRow($row)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
|
use Akuechler\Geoly;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Spatie\Sluggable\HasSlug;
|
use Spatie\Sluggable\HasSlug;
|
||||||
@@ -11,6 +12,7 @@ class City extends Model
|
|||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
use HasSlug;
|
use HasSlug;
|
||||||
|
use Geoly;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes that aren't mass assignable.
|
* The attributes that aren't mass assignable.
|
||||||
|
|||||||
@@ -2,30 +2,28 @@
|
|||||||
|
|
||||||
namespace App\Nova;
|
namespace App\Nova;
|
||||||
|
|
||||||
use Laravel\Nova\Fields\ID;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Laravel\Nova\Fields\Text;
|
|
||||||
use Laravel\Nova\Fields\BelongsTo;
|
use Laravel\Nova\Fields\BelongsTo;
|
||||||
|
use Laravel\Nova\Fields\ID;
|
||||||
|
use Laravel\Nova\Fields\Number;
|
||||||
|
use Laravel\Nova\Fields\Text;
|
||||||
|
|
||||||
class City extends Resource
|
class City extends Resource
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* The model the resource corresponds to.
|
* The model the resource corresponds to.
|
||||||
*
|
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public static $model = \App\Models\City::class;
|
public static $model = \App\Models\City::class;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The single value that should be used to represent the resource when being displayed.
|
* The single value that should be used to represent the resource when being displayed.
|
||||||
*
|
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
public static $title = 'name';
|
public static $title = 'name';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The columns that should be searched.
|
* The columns that should be searched.
|
||||||
*
|
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
public static $search = [
|
public static $search = [
|
||||||
@@ -37,12 +35,14 @@ class City extends Resource
|
|||||||
* Get the fields displayed by the resource.
|
* Get the fields displayed by the resource.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function fields(Request $request)
|
public function fields(Request $request)
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
ID::make()->sortable(),
|
ID::make()
|
||||||
|
->sortable(),
|
||||||
|
|
||||||
Text::make('Name')
|
Text::make('Name')
|
||||||
->rules('required', 'string'),
|
->rules('required', 'string'),
|
||||||
@@ -50,6 +50,12 @@ class City extends Resource
|
|||||||
Text::make('Slug')
|
Text::make('Slug')
|
||||||
->exceptOnForms(),
|
->exceptOnForms(),
|
||||||
|
|
||||||
|
Number::make('Latitude')
|
||||||
|
->rules('required', 'numeric')->step(0.00001),
|
||||||
|
|
||||||
|
Number::make('Longitude')
|
||||||
|
->rules('required', 'numeric')->step(0.00001),
|
||||||
|
|
||||||
BelongsTo::make('Country'),
|
BelongsTo::make('Country'),
|
||||||
|
|
||||||
];
|
];
|
||||||
@@ -59,6 +65,7 @@ class City extends Resource
|
|||||||
* Get the cards available for the request.
|
* Get the cards available for the request.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function cards(Request $request)
|
public function cards(Request $request)
|
||||||
@@ -70,6 +77,7 @@ class City extends Resource
|
|||||||
* Get the filters available for the resource.
|
* Get the filters available for the resource.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function filters(Request $request)
|
public function filters(Request $request)
|
||||||
@@ -81,6 +89,7 @@ class City extends Resource
|
|||||||
* Get the lenses available for the resource.
|
* Get the lenses available for the resource.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function lenses(Request $request)
|
public function lenses(Request $request)
|
||||||
@@ -92,6 +101,7 @@ class City extends Resource
|
|||||||
* Get the actions available for the resource.
|
* Get the actions available for the resource.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function actions(Request $request)
|
public function actions(Request $request)
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ class CityPolicy
|
|||||||
*/
|
*/
|
||||||
public function update(User $user, City $city)
|
public function update(User $user, City $city)
|
||||||
{
|
{
|
||||||
//
|
return $user->is_lecturer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.1",
|
"php": "^8.1",
|
||||||
|
"akuechler/laravel-geoly": "^1.0",
|
||||||
"ezadr/lnurl-php": "^1.0",
|
"ezadr/lnurl-php": "^1.0",
|
||||||
"guzzlehttp/guzzle": "^7.2",
|
"guzzlehttp/guzzle": "^7.2",
|
||||||
"itsmejoshua/novaspatiepermissions": "^1.0",
|
"itsmejoshua/novaspatiepermissions": "^1.0",
|
||||||
|
|||||||
60
composer.lock
generated
60
composer.lock
generated
@@ -4,8 +4,66 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "d1978838425670301ad666b43b7517ec",
|
"content-hash": "b619fdadb0135e8be1b5114237433108",
|
||||||
"packages": [
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "akuechler/laravel-geoly",
|
||||||
|
"version": "v1.0.6",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/akuechler/laravel-geoly.git",
|
||||||
|
"reference": "07b76c573abe1049d9a3f65ee870649443903dbf"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/akuechler/laravel-geoly/zipball/07b76c573abe1049d9a3f65ee870649443903dbf",
|
||||||
|
"reference": "07b76c573abe1049d9a3f65ee870649443903dbf",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.1"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"orchestra/testbench": "^6.0@dev",
|
||||||
|
"phpunit/phpunit": "^9.2@dev"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Akuechler\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Alexsander Küchler",
|
||||||
|
"email": "composer@alexsander-kuechler.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Perform fast and efficient radius searches on your Laravel Eloquent models.",
|
||||||
|
"keywords": [
|
||||||
|
"distance",
|
||||||
|
"framework",
|
||||||
|
"geo",
|
||||||
|
"laravel",
|
||||||
|
"lat",
|
||||||
|
"latitude",
|
||||||
|
"lng",
|
||||||
|
"lon",
|
||||||
|
"longitude",
|
||||||
|
"models",
|
||||||
|
"radius",
|
||||||
|
"search"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/akuechler/laravel-geoly/issues",
|
||||||
|
"source": "https://github.com/akuechler/laravel-geoly/tree/v1.0.6"
|
||||||
|
},
|
||||||
|
"time": "2021-04-20T07:17:32+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "bacon/bacon-qr-code",
|
"name": "bacon/bacon-qr-code",
|
||||||
"version": "2.0.7",
|
"version": "2.0.7",
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration {
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('cities', function (Blueprint $table) {
|
||||||
|
$table->double('longitude');
|
||||||
|
$table->double('latitude');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('cities', function (Blueprint $table) {
|
||||||
|
//
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -61,14 +61,20 @@ class DatabaseSeeder extends Seeder
|
|||||||
City::create([
|
City::create([
|
||||||
'country_id' => 1,
|
'country_id' => 1,
|
||||||
'name' => 'Füssen',
|
'name' => 'Füssen',
|
||||||
|
'latitude' => 47.57143,
|
||||||
|
'longitude' => 10.70171,
|
||||||
]);
|
]);
|
||||||
City::create([
|
City::create([
|
||||||
'country_id' => 2,
|
'country_id' => 2,
|
||||||
'name' => 'Wien',
|
'name' => 'Wien',
|
||||||
|
'latitude' => 48.20835,
|
||||||
|
'longitude' => 16.37250,
|
||||||
]);
|
]);
|
||||||
City::create([
|
City::create([
|
||||||
'country_id' => 3,
|
'country_id' => 3,
|
||||||
'name' => 'Zürich',
|
'name' => 'Zürich',
|
||||||
|
'latitude' => 47.41330,
|
||||||
|
'longitude' => 8.65639,
|
||||||
]);
|
]);
|
||||||
Venue::create([
|
Venue::create([
|
||||||
'city_id' => 1,
|
'city_id' => 1,
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
<x-button amber>Umkreis-Suche Füssen</x-button>
|
<x-button amber wire:click="proximitySearch({{ $row->id }})">Umkreis-Suche {{ $row->name }} (100km)</x-button>
|
||||||
|
|||||||
@@ -7,8 +7,43 @@
|
|||||||
|
|
||||||
<div class="py-12">
|
<div class="py-12">
|
||||||
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
|
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
|
||||||
<div class="bg-white overflow-hidden shadow-xl sm:rounded-lg">
|
<div class="bg-21gray overflow-hidden shadow-xl sm:rounded-lg">
|
||||||
HIER KOMMEN QUICK LINKS FÜR DOZENTEN TEAMS REIN
|
<div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
|
||||||
|
|
||||||
|
@if(auth()->user()->is_lecturer)
|
||||||
|
<div
|
||||||
|
class="relative flex items-center space-x-3 rounded-lg border border-amber-300 bg-21gray px-6 py-5 shadow-sm focus-within:ring-2 focus-within:ring-amber-500 focus-within:ring-offset-2 hover:border-amber-400">
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<a href="/nova" target="_blank" class="focus:outline-none">
|
||||||
|
<span class="absolute inset-0" aria-hidden="true"></span>
|
||||||
|
<p class="text-sm font-medium text-gray-200">Kurs anlegen</p>
|
||||||
|
<p class="truncate text-sm text-gray-300">Zugriff auf das Daten-Backend</p>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
<div
|
||||||
|
class="relative flex items-center space-x-3 rounded-lg border border-amber-300 bg-21gray px-6 py-5 shadow-sm focus-within:ring-2 focus-within:ring-amber-500 focus-within:ring-offset-2 hover:border-amber-400">
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<a href="{{ route('profile.show') }}" class="focus:outline-none">
|
||||||
|
<span class="absolute inset-0" aria-hidden="true"></span>
|
||||||
|
<p class="text-sm font-medium text-gray-200">Profil</p>
|
||||||
|
<p class="truncate text-sm text-gray-300">Vervollständige dein Profil</p>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="relative flex items-center space-x-3 rounded-lg border border-amber-300 bg-21gray px-6 py-5 shadow-sm focus-within:ring-2 focus-within:ring-amber-500 focus-within:ring-offset-2 hover:border-amber-400">
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<a href="{{ route('search.course', ['country' => 'de']) }}" class="focus:outline-none">
|
||||||
|
<span class="absolute inset-0" aria-hidden="true"></span>
|
||||||
|
<p class="text-sm font-medium text-gray-200">Übersicht der Kurse</p>
|
||||||
|
<p class="truncate text-sm text-gray-300">Zeige das Benutzer Frontend</p>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,41 +1,44 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
<title>{{ config('app.name', 'Laravel') }}</title>
|
<title>{{ config('app.name', 'Laravel') }}</title>
|
||||||
<!-- Fonts -->
|
<!-- Fonts -->
|
||||||
@googlefonts
|
@googlefonts
|
||||||
<!-- Scripts -->
|
<!-- Scripts -->
|
||||||
<wireui:scripts />
|
<wireui:scripts/>
|
||||||
@vite(['resources/css/app.css', 'resources/js/app.js'])
|
@vite(['resources/css/app.css', 'resources/js/app.js'])
|
||||||
<!-- Styles -->
|
<!-- Styles -->
|
||||||
@livewireStyles
|
@livewireStyles
|
||||||
<style>
|
<style>
|
||||||
[x-cloak] { display: none !important; }
|
[x-cloak] {
|
||||||
</style>
|
display: none !important;
|
||||||
</head>
|
}
|
||||||
<body class="font-sans antialiased bg-21gray dark">
|
</style>
|
||||||
<x-jet-banner />
|
</head>
|
||||||
<div class="min-h-screen">
|
<body class="font-sans antialiased bg-21gray dark">
|
||||||
@auth
|
<x-notifications z-index="z-50"/>
|
||||||
@livewire('navigation-menu')
|
<x-jet-banner/>
|
||||||
@endauth
|
<div class="min-h-screen">
|
||||||
<!-- Page Heading -->
|
@auth
|
||||||
@if (isset($header))
|
@livewire('navigation-menu')
|
||||||
<header class="bg-white shadow">
|
@endauth
|
||||||
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
|
<!-- Page Heading -->
|
||||||
{{ $header }}
|
@if (isset($header))
|
||||||
</div>
|
<header class="bg-white shadow">
|
||||||
</header>
|
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
|
||||||
@endif
|
{{ $header }}
|
||||||
<!-- Page Content -->
|
</div>
|
||||||
<main>
|
</header>
|
||||||
{{ $slot }}
|
@endif
|
||||||
</main>
|
<!-- Page Content -->
|
||||||
</div>
|
<main>
|
||||||
@stack('modals')
|
{{ $slot }}
|
||||||
@livewireScripts
|
</main>
|
||||||
</body>
|
</div>
|
||||||
|
@stack('modals')
|
||||||
|
@livewireScripts
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -8,15 +8,18 @@
|
|||||||
<!-- Fonts -->
|
<!-- Fonts -->
|
||||||
@googlefonts
|
@googlefonts
|
||||||
<!-- Scripts -->
|
<!-- Scripts -->
|
||||||
<wireui:scripts />
|
<wireui:scripts/>
|
||||||
@vite(['resources/css/app.css', 'resources/js/app.js'])
|
@vite(['resources/css/app.css', 'resources/js/app.js'])
|
||||||
<!-- Styles -->
|
<!-- Styles -->
|
||||||
@livewireStyles
|
@livewireStyles
|
||||||
<style>
|
<style>
|
||||||
[x-cloak] { display: none !important; }
|
[x-cloak] {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body class="font-sans antialiased bg-21gray dark">
|
<body class="font-sans antialiased bg-21gray dark">
|
||||||
|
<x-notifications z-index="z-50"/>
|
||||||
{{ $slot }}
|
{{ $slot }}
|
||||||
@stack('modals')
|
@stack('modals')
|
||||||
@livewireScripts
|
@livewireScripts
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<nav x-data="{ open: false }" class="border-b border-gray-100 bg-white">
|
<nav x-data="{ open: false }" class="border-b border-gray-100 bg-white">
|
||||||
<!-- Primary Navigation Menu -->
|
<!-- Primary Navigation Menu -->
|
||||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
<div class="max-w-screen-2xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||||
<div class="flex justify-between h-16">
|
<div class="flex justify-between h-16">
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
<!-- Logo -->
|
<!-- Logo -->
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
<x-jet-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')">
|
<x-jet-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')">
|
||||||
{{ __('Mein Profil') }}
|
{{ __('Mein Profil') }}
|
||||||
</x-jet-nav-link>
|
</x-jet-nav-link>
|
||||||
<x-jet-nav-link href="{{ route('welcome') }}" :active="request()->routeIs('welcome')">
|
<x-jet-nav-link href="/nova/resources/events" target="_blank">
|
||||||
{{ __('Meine Termine') }}
|
{{ __('Meine Termine') }}
|
||||||
</x-jet-nav-link>
|
</x-jet-nav-link>
|
||||||
</div>
|
</div>
|
||||||
@@ -31,11 +31,15 @@
|
|||||||
<x-jet-dropdown align="right" width="60">
|
<x-jet-dropdown align="right" width="60">
|
||||||
<x-slot name="trigger">
|
<x-slot name="trigger">
|
||||||
<span class="inline-flex rounded-md">
|
<span class="inline-flex rounded-md">
|
||||||
<button type="button" class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:bg-gray-50 hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition">
|
<button type="button"
|
||||||
|
class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:bg-gray-50 hover:text-gray-700 focus:outline-none focus:bg-gray-50 active:bg-gray-50 transition">
|
||||||
{{ Auth::user()->currentTeam->name }}
|
{{ Auth::user()->currentTeam->name }}
|
||||||
|
|
||||||
<svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
|
<svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
|
||||||
<path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
|
viewBox="0 0 20 20" fill="currentColor">
|
||||||
|
<path fill-rule="evenodd"
|
||||||
|
d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z"
|
||||||
|
clip-rule="evenodd"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
@@ -49,7 +53,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Team Settings -->
|
<!-- Team Settings -->
|
||||||
<x-jet-dropdown-link href="{{ route('teams.show', Auth::user()->currentTeam->id) }}">
|
<x-jet-dropdown-link
|
||||||
|
href="{{ route('teams.show', Auth::user()->currentTeam->id) }}">
|
||||||
{{ __('Team Settings') }}
|
{{ __('Team Settings') }}
|
||||||
</x-jet-dropdown-link>
|
</x-jet-dropdown-link>
|
||||||
|
|
||||||
@@ -67,7 +72,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@foreach (Auth::user()->allTeams() as $team)
|
@foreach (Auth::user()->allTeams() as $team)
|
||||||
<x-jet-switchable-team :team="$team" />
|
<x-jet-switchable-team :team="$team"/>
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
</x-slot>
|
</x-slot>
|
||||||
@@ -80,16 +85,22 @@
|
|||||||
<x-jet-dropdown align="right" width="48">
|
<x-jet-dropdown align="right" width="48">
|
||||||
<x-slot name="trigger">
|
<x-slot name="trigger">
|
||||||
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
|
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
|
||||||
<button class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
|
<button
|
||||||
<img class="h-8 w-8 rounded-full object-cover" src="{{ Auth::user()->profile_photo_url }}" alt="{{ Auth::user()->name }}" />
|
class="flex text-sm border-2 border-transparent rounded-full focus:outline-none focus:border-gray-300 transition">
|
||||||
|
<img class="h-8 w-8 rounded-full object-cover"
|
||||||
|
src="{{ Auth::user()->profile_photo_url }}" alt="{{ Auth::user()->name }}"/>
|
||||||
</button>
|
</button>
|
||||||
@else
|
@else
|
||||||
<span class="inline-flex rounded-md">
|
<span class="inline-flex rounded-md">
|
||||||
<button type="button" class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition">
|
<button type="button"
|
||||||
|
class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition">
|
||||||
{{ Auth::user()->name }}
|
{{ Auth::user()->name }}
|
||||||
|
|
||||||
<svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
|
<svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
|
||||||
<path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
|
viewBox="0 0 20 20" fill="currentColor">
|
||||||
|
<path fill-rule="evenodd"
|
||||||
|
d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
|
||||||
|
clip-rule="evenodd"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
@@ -119,7 +130,7 @@
|
|||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
<x-jet-dropdown-link href="{{ route('logout') }}"
|
<x-jet-dropdown-link href="{{ route('logout') }}"
|
||||||
@click.prevent="$root.submit();">
|
@click.prevent="$root.submit();">
|
||||||
{{ __('Log Out') }}
|
{{ __('Log Out') }}
|
||||||
</x-jet-dropdown-link>
|
</x-jet-dropdown-link>
|
||||||
</form>
|
</form>
|
||||||
@@ -130,10 +141,14 @@
|
|||||||
|
|
||||||
<!-- Hamburger -->
|
<!-- Hamburger -->
|
||||||
<div class="-mr-2 flex items-center sm:hidden">
|
<div class="-mr-2 flex items-center sm:hidden">
|
||||||
<button @click="open = ! open" class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition">
|
<button @click="open = ! open"
|
||||||
|
class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition">
|
||||||
<svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24">
|
<svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24">
|
||||||
<path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
|
<path :class="{'hidden': open, 'inline-flex': ! open }" class="inline-flex"
|
||||||
<path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
|
stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||||
|
d="M4 6h16M4 12h16M4 18h16"/>
|
||||||
|
<path :class="{'hidden': ! open, 'inline-flex': open }" class="hidden" stroke-linecap="round"
|
||||||
|
stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -153,7 +168,8 @@
|
|||||||
<div class="flex items-center px-4">
|
<div class="flex items-center px-4">
|
||||||
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
|
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
|
||||||
<div class="shrink-0 mr-3">
|
<div class="shrink-0 mr-3">
|
||||||
<img class="h-10 w-10 rounded-full object-cover" src="{{ Auth::user()->profile_photo_url }}" alt="{{ Auth::user()->name }}" />
|
<img class="h-10 w-10 rounded-full object-cover" src="{{ Auth::user()->profile_photo_url }}"
|
||||||
|
alt="{{ Auth::user()->name }}"/>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@@ -165,12 +181,14 @@
|
|||||||
|
|
||||||
<div class="mt-3 space-y-1">
|
<div class="mt-3 space-y-1">
|
||||||
<!-- Account Management -->
|
<!-- Account Management -->
|
||||||
<x-jet-responsive-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')">
|
<x-jet-responsive-nav-link href="{{ route('profile.show') }}"
|
||||||
|
:active="request()->routeIs('profile.show')">
|
||||||
{{ __('Profile') }}
|
{{ __('Profile') }}
|
||||||
</x-jet-responsive-nav-link>
|
</x-jet-responsive-nav-link>
|
||||||
|
|
||||||
@if (Laravel\Jetstream\Jetstream::hasApiFeatures())
|
@if (Laravel\Jetstream\Jetstream::hasApiFeatures())
|
||||||
<x-jet-responsive-nav-link href="{{ route('api-tokens.index') }}" :active="request()->routeIs('api-tokens.index')">
|
<x-jet-responsive-nav-link href="{{ route('api-tokens.index') }}"
|
||||||
|
:active="request()->routeIs('api-tokens.index')">
|
||||||
{{ __('API Tokens') }}
|
{{ __('API Tokens') }}
|
||||||
</x-jet-responsive-nav-link>
|
</x-jet-responsive-nav-link>
|
||||||
@endif
|
@endif
|
||||||
@@ -180,7 +198,7 @@
|
|||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
<x-jet-responsive-nav-link href="{{ route('logout') }}"
|
<x-jet-responsive-nav-link href="{{ route('logout') }}"
|
||||||
@click.prevent="$root.submit();">
|
@click.prevent="$root.submit();">
|
||||||
{{ __('Log Out') }}
|
{{ __('Log Out') }}
|
||||||
</x-jet-responsive-nav-link>
|
</x-jet-responsive-nav-link>
|
||||||
</form>
|
</form>
|
||||||
@@ -194,12 +212,14 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Team Settings -->
|
<!-- Team Settings -->
|
||||||
<x-jet-responsive-nav-link href="{{ route('teams.show', Auth::user()->currentTeam->id) }}" :active="request()->routeIs('teams.show')">
|
<x-jet-responsive-nav-link href="{{ route('teams.show', Auth::user()->currentTeam->id) }}"
|
||||||
|
:active="request()->routeIs('teams.show')">
|
||||||
{{ __('Team Settings') }}
|
{{ __('Team Settings') }}
|
||||||
</x-jet-responsive-nav-link>
|
</x-jet-responsive-nav-link>
|
||||||
|
|
||||||
@can('create', Laravel\Jetstream\Jetstream::newTeamModel())
|
@can('create', Laravel\Jetstream\Jetstream::newTeamModel())
|
||||||
<x-jet-responsive-nav-link href="{{ route('teams.create') }}" :active="request()->routeIs('teams.create')">
|
<x-jet-responsive-nav-link href="{{ route('teams.create') }}"
|
||||||
|
:active="request()->routeIs('teams.create')">
|
||||||
{{ __('Create New Team') }}
|
{{ __('Create New Team') }}
|
||||||
</x-jet-responsive-nav-link>
|
</x-jet-responsive-nav-link>
|
||||||
@endcan
|
@endcan
|
||||||
@@ -212,7 +232,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@foreach (Auth::user()->allTeams() as $team)
|
@foreach (Auth::user()->allTeams() as $team)
|
||||||
<x-jet-switchable-team :team="$team" component="jet-responsive-nav-link" />
|
<x-jet-switchable-team :team="$team" component="jet-responsive-nav-link"/>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user