Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Silly bug fix #803

Merged
merged 2 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/Roadmap/FeatureController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Http\Controllers\Roadmap;

use App\Enums\FeatureStatus;
use App\Http\Controllers\Controller;
use App\Http\Requests\StoreFeature;
use App\Models\Feature;
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/Roadmap/RoadmapController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
namespace App\Http\Controllers\Roadmap;

use App\Http\Controllers\Controller;
use App\Models\Feature;
use App\Models\FeatureCategory;

class RoadmapController extends Controller
{
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Requests/StoreFeature.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function authorize(): bool
public function rules(): array
{
return [
//

];
}
}
1 change: 0 additions & 1 deletion app/Livewire/Roadmap/Ideas.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Models\Feature;
use Livewire\Component;
use Livewire\Attributes\Url;
use Livewire\Attributes\On;
use Livewire\WithPagination;

class Ideas extends Component
Expand Down
4 changes: 2 additions & 2 deletions app/Models/FeatureCategory.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public function progress(): HasMany
{
return $this->features()
->whereIn('features.status_id', [
\App\Enums\FeatureStatus::Later, \App\Enums\FeatureStatus::Next, \App\Enums\FeatureStatus::Now
]);
\App\Enums\FeatureStatus::Later, \App\Enums\FeatureStatus::Next, \App\Enums\FeatureStatus::Now
]);
}

public function now(): HasMany
Expand Down
16 changes: 8 additions & 8 deletions app/Models/Relations/UserRelations.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function campaignRoles()
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function campaignRoleUser()
{
Expand All @@ -97,31 +97,31 @@ public function campaignRoleUser()

/**
* List of boosts the user is giving
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function boosts()
{
return $this->hasMany('App\Models\CampaignBoost', 'user_id', 'id');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function logs()
{
return $this->hasMany('App\Models\UserLog', 'user_id', 'id');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function apps()
{
return $this->hasMany(UserApp::class, 'user_id', 'id');
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function permissions()
{
Expand All @@ -137,7 +137,7 @@ public function referrer()
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function submissions()
{
Expand All @@ -153,7 +153,7 @@ public function entities()
}

/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function plugins()
{
Expand All @@ -175,7 +175,7 @@ public function bragiLogs()

/**
* List of subscription cancellations for the user
* @return \Illuminate\Database\Eloquent\Relations\HasMany
* @return HasMany
*/
public function cancellations()
{
Expand Down
2 changes: 1 addition & 1 deletion app/Policies/FeaturePolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class FeaturePolicy
*/
public function __construct()
{
//

}

public function create(User $user): bool
Expand Down
4 changes: 2 additions & 2 deletions app/Services/Families/FamilyTreeService.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ protected function formatEntity(Entity $entity): array
'url' => $entity->url(),
'thumb' => Avatar::entity($entity)->size(40)->fallback()->thumbnail(),
'is_dead' => (bool)$entity->character->is_dead,
'death' => $birth,
'birth' => $death,
'death' => $death,
'birth' => $birth,
'tags' => $tags,
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
return new class () extends Migration {
/**
* Run the migrations.
*/
Expand Down
7 changes: 3 additions & 4 deletions database/migrations/2024_01_11_150113_update_attributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
return new class () extends Migration {
/**
* Run the migrations.
*/
Expand All @@ -16,7 +15,7 @@ public function up(): void
//$table->tinyInteger('is_hidden')->default(0)->change();
});

\Illuminate\Support\Facades\DB::statement('ALTER TABLE `attributes` MODIFY `is_hidden` tinyint(1) DEFAULT 0 NOT NULL;');
Illuminate\Support\Facades\DB::statement('ALTER TABLE `attributes` MODIFY `is_hidden` tinyint(1) DEFAULT 0 NOT NULL;');
}

/**
Expand All @@ -25,7 +24,7 @@ public function up(): void
public function down(): void
{
Schema::table('attributes', function (Blueprint $table) {
//

});
}
};
5 changes: 2 additions & 3 deletions database/migrations/2024_01_19_024046_cleanup_reminders.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
return new class () extends Migration {
/**
* Run the migrations.
*/
Expand All @@ -25,7 +24,7 @@ public function up(): void
public function down(): void
{
Schema::table('entity_events', function (Blueprint $table) {
//

});
}
};
1 change: 0 additions & 1 deletion database/seeders/FeatureStatusSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Database\Seeders;

use App\Models\FeatureCategory;
use App\Models\FeatureStatus;
use Illuminate\Database\Seeder;

Expand Down
1 change: 0 additions & 1 deletion routes/campaigns/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,3 @@

//Game System Search
Route::get('/w/{campaign}/search/systems', [App\Http\Controllers\Search\GameSystemSearchController::class, 'index'])->name('search.systems');

10 changes: 5 additions & 5 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
Route::get('/_setup', [App\Http\Controllers\SetupController::class, 'index']);


Route::model('feature', \App\Models\Feature::class);
Route::get('roadmap', [\App\Http\Controllers\Roadmap\RoadmapController::class, 'index'])->name('roadmap');
Route::get('roadmap/{feature}', [\App\Http\Controllers\Roadmap\FeatureController::class, 'show'])->name('roadmap.feature.show');
Route::post('roadmap/{feature}/upvote', [\App\Http\Controllers\Roadmap\FeatureController::class, 'upvote'])->name('roadmap.upvote');
Route::post('roadmap/submit', [\App\Http\Controllers\Roadmap\FeatureController::class, 'store'])->name('roadmap.store');
Route::model('feature', App\Models\Feature::class);
Route::get('roadmap', [App\Http\Controllers\Roadmap\RoadmapController::class, 'index'])->name('roadmap');
Route::get('roadmap/{feature}', [App\Http\Controllers\Roadmap\FeatureController::class, 'show'])->name('roadmap.feature.show');
Route::post('roadmap/{feature}/upvote', [App\Http\Controllers\Roadmap\FeatureController::class, 'upvote'])->name('roadmap.upvote');
Route::post('roadmap/submit', [App\Http\Controllers\Roadmap\FeatureController::class, 'store'])->name('roadmap.store');