proximitySearch added

This commit is contained in:
Benjamin Takats
2022-12-01 22:29:53 +01:00
parent 99791c37ba
commit 7c3675f01c
15 changed files with 262 additions and 79 deletions

View File

@@ -1,11 +1,11 @@
models:
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 }
Course: { lecturer_id: biginteger, name: string }
Event: { course_id: biginteger, venue_id: biginteger, '"from"': datetime, '"to"': datetime }
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' }
Participant: { first_name: string, last_name: string }
Registration: { event_id: biginteger, participant_id: biginteger, active: 'boolean default:1' }

View File

@@ -6,16 +6,20 @@ use App\Models\City;
use Illuminate\Database\Eloquent\Builder;
use Rappasoft\LaravelLivewireTables\DataTableComponent;
use Rappasoft\LaravelLivewireTables\Views\Column;
use WireUi\Traits\Actions;
class CityTable extends DataTableComponent
{
use Actions;
public string $country;
protected $model = City::class;
public function configure(): void
{
$this->setPrimaryKey('id');
$this->setPrimaryKey('id')
->setAdditionalSelects(['id']);
}
public function columns(): array
@@ -44,4 +48,15 @@ class CityTable extends DataTableComponent
return City::query()
->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(', '));
}
}

View File

@@ -38,12 +38,12 @@ class EventTable extends DataTableComponent
->sortable(),
Column::make("Zuletzt geändert", "updated_at")
->sortable(),
Column::make("Teilnehmer")
/*Column::make("Teilnehmer")
->label(
fn($row, Column $column) => '<strong>'.$row->registrations->count().'</strong>'
)
->html()
->sortable(),
->sortable(),*/
Column::make('')
->label(
fn($row, Column $column) => view('columns.events.action')->withRow($row)

View File

@@ -2,6 +2,7 @@
namespace App\Models;
use Akuechler\Geoly;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Spatie\Sluggable\HasSlug;
@@ -11,6 +12,7 @@ class City extends Model
{
use HasFactory;
use HasSlug;
use Geoly;
/**
* The attributes that aren't mass assignable.

View File

@@ -2,30 +2,28 @@
namespace App\Nova;
use Laravel\Nova\Fields\ID;
use Illuminate\Http\Request;
use Laravel\Nova\Fields\Text;
use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\ID;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Text;
class City extends Resource
{
/**
* The model the resource corresponds to.
*
* @var string
*/
public static $model = \App\Models\City::class;
/**
* The single value that should be used to represent the resource when being displayed.
*
* @var string
*/
public static $title = 'name';
/**
* The columns that should be searched.
*
* @var array
*/
public static $search = [
@@ -37,12 +35,14 @@ class City extends Resource
* 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')
->rules('required', 'string'),
@@ -50,6 +50,12 @@ class City extends Resource
Text::make('Slug')
->exceptOnForms(),
Number::make('Latitude')
->rules('required', 'numeric')->step(0.00001),
Number::make('Longitude')
->rules('required', 'numeric')->step(0.00001),
BelongsTo::make('Country'),
];
@@ -59,6 +65,7 @@ class City extends Resource
* Get the cards available for the request.
*
* @param \Illuminate\Http\Request $request
*
* @return array
*/
public function cards(Request $request)
@@ -70,6 +77,7 @@ class City extends Resource
* Get the filters available for the resource.
*
* @param \Illuminate\Http\Request $request
*
* @return array
*/
public function filters(Request $request)
@@ -81,6 +89,7 @@ class City extends Resource
* Get the lenses available for the resource.
*
* @param \Illuminate\Http\Request $request
*
* @return array
*/
public function lenses(Request $request)
@@ -92,6 +101,7 @@ class City extends Resource
* Get the actions available for the resource.
*
* @param \Illuminate\Http\Request $request
*
* @return array
*/
public function actions(Request $request)

View File

@@ -53,7 +53,7 @@ class CityPolicy
*/
public function update(User $user, City $city)
{
//
return $user->is_lecturer;
}
/**

View File

@@ -9,6 +9,7 @@
"license": "MIT",
"require": {
"php": "^8.1",
"akuechler/laravel-geoly": "^1.0",
"ezadr/lnurl-php": "^1.0",
"guzzlehttp/guzzle": "^7.2",
"itsmejoshua/novaspatiepermissions": "^1.0",

60
composer.lock generated
View File

@@ -4,8 +4,66 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "d1978838425670301ad666b43b7517ec",
"content-hash": "b619fdadb0135e8be1b5114237433108",
"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",
"version": "2.0.7",

View File

@@ -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) {
//
});
}
};

View File

@@ -61,14 +61,20 @@ class DatabaseSeeder extends Seeder
City::create([
'country_id' => 1,
'name' => 'Füssen',
'latitude' => 47.57143,
'longitude' => 10.70171,
]);
City::create([
'country_id' => 2,
'name' => 'Wien',
'latitude' => 48.20835,
'longitude' => 16.37250,
]);
City::create([
'country_id' => 3,
'name' => 'Zürich',
'latitude' => 47.41330,
'longitude' => 8.65639,
]);
Venue::create([
'city_id' => 1,

View File

@@ -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>

View File

@@ -7,8 +7,43 @@
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-xl sm:rounded-lg">
HIER KOMMEN QUICK LINKS FÜR DOZENTEN TEAMS REIN
<div class="bg-21gray overflow-hidden shadow-xl sm:rounded-lg">
<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>

View File

@@ -1,41 +1,44 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Fonts -->
@googlefonts
<!-- Scripts -->
<wireui:scripts />
@vite(['resources/css/app.css', 'resources/js/app.js'])
<!-- Styles -->
@livewireStyles
<style>
[x-cloak] { display: none !important; }
</style>
</head>
<body class="font-sans antialiased bg-21gray dark">
<x-jet-banner />
<div class="min-h-screen">
@auth
@livewire('navigation-menu')
@endauth
<!-- Page Heading -->
@if (isset($header))
<header class="bg-white shadow">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
{{ $header }}
</div>
</header>
@endif
<!-- Page Content -->
<main>
{{ $slot }}
</main>
</div>
@stack('modals')
@livewireScripts
</body>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Fonts -->
@googlefonts
<!-- Scripts -->
<wireui:scripts/>
@vite(['resources/css/app.css', 'resources/js/app.js'])
<!-- Styles -->
@livewireStyles
<style>
[x-cloak] {
display: none !important;
}
</style>
</head>
<body class="font-sans antialiased bg-21gray dark">
<x-notifications z-index="z-50"/>
<x-jet-banner/>
<div class="min-h-screen">
@auth
@livewire('navigation-menu')
@endauth
<!-- Page Heading -->
@if (isset($header))
<header class="bg-white shadow">
<div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
{{ $header }}
</div>
</header>
@endif
<!-- Page Content -->
<main>
{{ $slot }}
</main>
</div>
@stack('modals')
@livewireScripts
</body>
</html>

View File

@@ -8,15 +8,18 @@
<!-- Fonts -->
@googlefonts
<!-- Scripts -->
<wireui:scripts />
<wireui:scripts/>
@vite(['resources/css/app.css', 'resources/js/app.js'])
<!-- Styles -->
@livewireStyles
<style>
[x-cloak] { display: none !important; }
[x-cloak] {
display: none !important;
}
</style>
</head>
<body class="font-sans antialiased bg-21gray dark">
<x-notifications z-index="z-50"/>
{{ $slot }}
@stack('modals')
@livewireScripts

View File

@@ -1,6 +1,6 @@
<nav x-data="{ open: false }" class="border-b border-gray-100 bg-white">
<!-- 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">
<!-- Logo -->
@@ -18,7 +18,7 @@
<x-jet-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')">
{{ __('Mein Profil') }}
</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') }}
</x-jet-nav-link>
</div>
@@ -31,11 +31,15 @@
<x-jet-dropdown align="right" width="60">
<x-slot name="trigger">
<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 }}
<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">
<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 class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
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>
</button>
</span>
@@ -49,7 +53,8 @@
</div>
<!-- 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') }}
</x-jet-dropdown-link>
@@ -67,7 +72,7 @@
</div>
@foreach (Auth::user()->allTeams() as $team)
<x-jet-switchable-team :team="$team" />
<x-jet-switchable-team :team="$team"/>
@endforeach
</div>
</x-slot>
@@ -80,16 +85,22 @@
<x-jet-dropdown align="right" width="48">
<x-slot name="trigger">
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
<button 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
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>
@else
<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 }}
<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">
<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 class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
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>
</button>
</span>
@@ -119,7 +130,7 @@
@csrf
<x-jet-dropdown-link href="{{ route('logout') }}"
@click.prevent="$root.submit();">
@click.prevent="$root.submit();">
{{ __('Log Out') }}
</x-jet-dropdown-link>
</form>
@@ -130,10 +141,14 @@
<!-- Hamburger -->
<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">
<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="hidden" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
<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="hidden" stroke-linecap="round"
stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
</svg>
</button>
</div>
@@ -153,7 +168,8 @@
<div class="flex items-center px-4">
@if (Laravel\Jetstream\Jetstream::managesProfilePhotos())
<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>
@endif
@@ -165,12 +181,14 @@
<div class="mt-3 space-y-1">
<!-- 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') }}
</x-jet-responsive-nav-link>
@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') }}
</x-jet-responsive-nav-link>
@endif
@@ -180,7 +198,7 @@
@csrf
<x-jet-responsive-nav-link href="{{ route('logout') }}"
@click.prevent="$root.submit();">
@click.prevent="$root.submit();">
{{ __('Log Out') }}
</x-jet-responsive-nav-link>
</form>
@@ -194,12 +212,14 @@
</div>
<!-- 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') }}
</x-jet-responsive-nav-link>
@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') }}
</x-jet-responsive-nav-link>
@endcan
@@ -212,7 +232,7 @@
</div>
@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
@endif
</div>