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

huge Laravel 10 upgrade

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2023-02-19 20:13:20 +01:00
parent 5c74f77beb
commit 12847f95f6
440 changed files with 46336 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
routes/api.php
View File

@@ -29,6 +29,7 @@ Route::middleware([])
Route::resource('countries', \App\Http\Controllers\Api\CountryController::class);
Route::resource('meetup', \App\Http\Controllers\Api\MeetupController::class);
Route::resource('lecturers', \App\Http\Controllers\Api\LecturerController::class);
Route::resource('cities', \App\Http\Controllers\Api\CityController::class);
Route::resource('languages', \App\Http\Controllers\Api\LanguageController::class);
Route::get('meetups', function () {
return \App\Models\Meetup::query()
@@ -36,18 +37,18 @@ Route::middleware([])
'city',
])
->get()
->map(fn ($meetup) => [
'name' => $meetup->name,
'url' => $meetup->telegram_link ?? $meetup->webpage,
'top' => $meetup->github_data['top'] ?? null,
'left' => $meetup->github_data['left'] ?? null,
'country' => str($meetup->city->country->code)->upper(),
'state' => $meetup->github_data['state'] ?? null,
'city' => $meetup->city->name,
'longitude' => (float) $meetup->city->longitude,
'latitude' => (float) $meetup->city->latitude,
->map(fn($meetup) => [
'name' => $meetup->name,
'url' => $meetup->telegram_link ?? $meetup->webpage,
'top' => $meetup->github_data['top'] ?? null,
'left' => $meetup->github_data['left'] ?? null,
'country' => str($meetup->city->country->code)->upper(),
'state' => $meetup->github_data['state'] ?? null,
'city' => $meetup->city->name,
'longitude' => (float) $meetup->city->longitude,
'latitude' => (float) $meetup->city->latitude,
'twitter_username' => $meetup->twitter_username,
'website' => $meetup->webpage,
'website' => $meetup->webpage,
]);
});
Route::get('btc-map-communities', function () {
@@ -58,29 +59,29 @@ Route::middleware([])
])
->where('community', '=', 'einundzwanzig')
->when(app()->environment('production'),
fn ($query) => $query->whereHas('city',
fn ($query) => $query
fn($query) => $query->whereHas('city',
fn($query) => $query
->whereNotNull('cities.simplified_geojson')
->whereNotNull('cities.population')
->whereNotNull('cities.population_date')
))
->get()
->map(fn ($meetup) => [
'id' => $meetup->slug,
->map(fn($meetup) => [
'id' => $meetup->slug,
'tags' => [
'type' => 'community',
'name' => $meetup->name,
'continent' => 'europe',
'icon:square' => $meetup->logoSquare,
'type' => 'community',
'name' => $meetup->name,
'continent' => 'europe',
'icon:square' => $meetup->logoSquare,
//'contact:email' => null,
'contact:twitter' => 'https://twitter.com/'.$meetup->twitter_username,
'contact:website' => $meetup->webpage,
'contact:nostr' => $meetup->nostr,
'contact:website' => $meetup->telegram_link ?? $meetup->webpage ?? $meetup->matrix_group,
'contact:nostr' => $meetup->nostr,
//'tips:lightning_address' => null,
'organization' => 'einundzwanzig',
'language' => $meetup->city->country->language_codes[0] ?? 'de',
'geo_json' => $meetup->city->simplified_geojson,
'population' => $meetup->city->population,
'organization' => 'einundzwanzig',
'language' => $meetup->city->country->language_codes[0] ?? 'de',
'geo_json' => $meetup->city->simplified_geojson,
'population' => $meetup->city->population,
'population:date' => $meetup->city->population_date,
],
])
@@ -95,27 +96,27 @@ Route::get('/lnurl-auth-callback', function (Request $request) {
$user = User::query()
->whereBlind('public_key', 'public_key_index', $request->key)
->first();
if (! $user) {
if (!$user) {
// create User
$user = User::create([
'public_key' => $request->key,
'public_key' => $request->key,
'is_lecturer' => true,
'name' => $request->key,
'email' => str($request->key)->substr(-12).'@portal.einundzwanzig.space',
'name' => $request->key,
'email' => str($request->key)->substr(-12).'@portal.einundzwanzig.space',
]);
$user->ownedTeams()
->save(Team::forceCreate([
'user_id' => $user->id,
'name' => $request->key."'s Team",
'user_id' => $user->id,
'name' => $request->key."'s Team",
'personal_team' => true,
]));
}
// check if $k1 is in the database, if not, add it
$loginKey = LoginKey::where('k1', $request->k1)
->first();
if (! $loginKey) {
if (!$loginKey) {
LoginKey::create([
'k1' => $request->k1,
'k1' => $request->k1,
'user_id' => $user->id,
]);
}

9
routes/web.php
View File

@@ -82,8 +82,7 @@ Route::middleware([])
->name('profile.meetups');
Route::get('/auth/ln', \App\Http\Livewire\Auth\LNUrlAuth::class)
->name('auth.ln')
->middleware('guest');
->name('auth.ln');
Route::get('/auth/twitter', function () {
return Socialite::driver('twitter')
@@ -217,6 +216,12 @@ Route::middleware([])
Route::get('overview', \App\Http\Livewire\Meetup\MeetupTable::class)
->name('table.meetup');
Route::get('/meetup/form/{meetup?}', \App\Http\Livewire\Meetup\Form\MeetupForm::class)
->name('meetup.form')
->middleware([
'auth',
]);
Route::get('/meetup-events/form/{meetupEvent?}', \App\Http\Livewire\Meetup\Form\MeetupEventForm::class)
->name('event.form')
->middleware([