diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php index 43f63f29..96e38554 100644 --- a/app/Http/Controllers/Api/Web/ArtistsController.php +++ b/app/Http/Controllers/Api/Web/ArtistsController.php @@ -20,14 +20,13 @@ namespace Poniverse\Ponyfm\Http\Controllers\Api\Web; -use Poniverse\Ponyfm\Album; +use Poniverse\Ponyfm\Models\Album; use Poniverse\Ponyfm\Models\Comment; use Poniverse\Ponyfm\Models\Favourite; use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase; use Poniverse\Ponyfm\Models\Image; use Poniverse\Ponyfm\Models\Track; use Poniverse\Ponyfm\Models\User; -use Cover; use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Response; diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php index 2365c5a2..17a2754e 100644 --- a/app/Http/Controllers/ArtistsController.php +++ b/app/Http/Controllers/ArtistsController.php @@ -32,6 +32,14 @@ class ArtistsController extends Controller return View::make('artists.index'); } + public function getFavourites($slug) { + return $this->getProfile($slug); + } + + public function getContent($slug) { + return $this->getProfile($slug); + } + public function getProfile($slug) { $user = User::whereSlug($slug)->whereNull('disabled_at')->first(); diff --git a/app/Http/routes.php b/app/Http/routes.php index c33f64ca..64842676 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -185,8 +185,8 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'can:access-admin-ar Route::get('u{id}', 'ArtistsController@getShortlink')->where('id', '\d+'); Route::get('users/{id}-{slug}', 'ArtistsController@getShortlink')->where('id', '\d+'); Route::get('{slug}', 'ArtistsController@getProfile'); -Route::get('{slug}/content', 'ArtistsController@getProfile'); -Route::get('{slug}/favourites', 'ArtistsController@getProfile'); +Route::get('{slug}/content', 'ArtistsController@getContent'); +Route::get('{slug}/favourites', 'ArtistsController@getFavourites'); Route::get('/', 'HomeController@getIndex');