mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-22 13:07:59 +01:00
#20: Added the genre creation tool.
This commit is contained in:
parent
1136bdc4e9
commit
bf831d839a
11 changed files with 227 additions and 34 deletions
75
app/Commands/CreateGenreCommand.php
Normal file
75
app/Commands/CreateGenreCommand.php
Normal file
|
@ -0,0 +1,75 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pony.fm - A community for pony fan music.
|
||||||
|
* Copyright (C) 2016 Peter Deltchev
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Poniverse\Ponyfm\Commands;
|
||||||
|
|
||||||
|
use Gate;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Poniverse\Ponyfm\Models\Genre;
|
||||||
|
use Validator;
|
||||||
|
|
||||||
|
class CreateGenreCommand extends CommandBase
|
||||||
|
{
|
||||||
|
/** @var Genre */
|
||||||
|
private $_genreName;
|
||||||
|
|
||||||
|
public function __construct($genreName)
|
||||||
|
{
|
||||||
|
$this->_genreName = $genreName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function authorize()
|
||||||
|
{
|
||||||
|
return Gate::allows('create-genre');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws \Exception
|
||||||
|
* @return CommandResponse
|
||||||
|
*/
|
||||||
|
public function execute()
|
||||||
|
{
|
||||||
|
$slug = Str::slug($this->_genreName);
|
||||||
|
|
||||||
|
$rules = [
|
||||||
|
'name' => 'required|unique:genres,name,NULL,id,deleted_at,NULL|max:50',
|
||||||
|
'slug' => 'required|unique:genres,slug,NULL,id,deleted_at,NULL'
|
||||||
|
];
|
||||||
|
|
||||||
|
$validator = Validator::make([
|
||||||
|
'name' => $this->_genreName,
|
||||||
|
'slug' => $slug
|
||||||
|
], $rules);
|
||||||
|
|
||||||
|
if ($validator->fails()) {
|
||||||
|
return CommandResponse::fail($validator);
|
||||||
|
}
|
||||||
|
|
||||||
|
Genre::create([
|
||||||
|
'name' => $this->_genreName,
|
||||||
|
'slug' => $slug
|
||||||
|
]);
|
||||||
|
|
||||||
|
return CommandResponse::succeed(['message' => 'Genre created!']);
|
||||||
|
}
|
||||||
|
}
|
|
@ -21,6 +21,7 @@
|
||||||
namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
|
namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
|
||||||
|
|
||||||
use Input;
|
use Input;
|
||||||
|
use Poniverse\Ponyfm\Commands\CreateGenreCommand;
|
||||||
use Poniverse\Ponyfm\Commands\DeleteGenreCommand;
|
use Poniverse\Ponyfm\Commands\DeleteGenreCommand;
|
||||||
use Poniverse\Ponyfm\Commands\RenameGenreCommand;
|
use Poniverse\Ponyfm\Commands\RenameGenreCommand;
|
||||||
use Poniverse\Ponyfm\Models\Genre;
|
use Poniverse\Ponyfm\Models\Genre;
|
||||||
|
@ -45,6 +46,11 @@ class GenresController extends ApiControllerBase
|
||||||
], 200);
|
], 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function postCreate()
|
||||||
|
{
|
||||||
|
$command = new CreateGenreCommand(Input::get('name'));
|
||||||
|
return $this->execute($command);
|
||||||
|
}
|
||||||
|
|
||||||
public function putRename($genreId)
|
public function putRename($genreId)
|
||||||
{
|
{
|
||||||
|
|
|
@ -153,6 +153,7 @@ Route::group(['prefix' => 'api/web'], function() {
|
||||||
|
|
||||||
Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'can:access-admin-area']], function() {
|
Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'can:access-admin-area']], function() {
|
||||||
Route::get('/genres', 'Api\Web\GenresController@getIndex');
|
Route::get('/genres', 'Api\Web\GenresController@getIndex');
|
||||||
|
Route::post('/genres', 'Api\Web\GenresController@postCreate');
|
||||||
Route::put('/genres/{id}', 'Api\Web\GenresController@putRename')->where('id', '\d+');
|
Route::put('/genres/{id}', 'Api\Web\GenresController@putRename')->where('id', '\d+');
|
||||||
Route::delete('/genres/{id}', 'Api\Web\GenresController@deleteGenre')->where('id', '\d+');
|
Route::delete('/genres/{id}', 'Api\Web\GenresController@deleteGenre')->where('id', '\d+');
|
||||||
});
|
});
|
||||||
|
|
|
@ -49,8 +49,6 @@ class Genre extends Model
|
||||||
protected $appends = ['track_count', 'url'];
|
protected $appends = ['track_count', 'url'];
|
||||||
protected $hidden = ['trackCountRelation'];
|
protected $hidden = ['trackCountRelation'];
|
||||||
|
|
||||||
public $timestamps = false;
|
|
||||||
|
|
||||||
use SlugTrait, SoftDeletes, RevisionableTrait;
|
use SlugTrait, SoftDeletes, RevisionableTrait;
|
||||||
|
|
||||||
public function tracks(){
|
public function tracks(){
|
||||||
|
|
|
@ -52,6 +52,10 @@ class AuthServiceProvider extends ServiceProvider
|
||||||
return $user->hasRole('admin');
|
return $user->hasRole('admin');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$gate->define('create-genre', function(User $user) {
|
||||||
|
return $user->hasRole('admin');
|
||||||
|
});
|
||||||
|
|
||||||
$this->registerPolicies($gate);
|
$this->registerPolicies($gate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pony.fm - A community for pony fan music.
|
||||||
|
* Copyright (C) 2016 Peter Deltchev
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class AddGenreTimestamps extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('genres', function(Blueprint $table) {
|
||||||
|
$table->nullableTimestamps();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('genres', function(Blueprint $table) {
|
||||||
|
$table->dropTimestamps();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,6 +1,27 @@
|
||||||
<h1>Genre Editor</h1>
|
<h1>Genre Editor</h1>
|
||||||
|
|
||||||
<section class="genre-list stretch-to-bottom">
|
<div class="stretch-to-bottom">
|
||||||
|
|
||||||
|
<section class="genre-creator">
|
||||||
|
<h2>Add genre</h2>
|
||||||
|
|
||||||
|
<p>Enter a genre name and press enter to create it!</p>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="x-large"
|
||||||
|
ng-class="{'x-saving': isCreating, 'x-error': hasCreationError}"
|
||||||
|
ng-model="genreToCreate"
|
||||||
|
pfm-on-enter="createGenre(genreToCreate)"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div class="alert alert-error" ng-show="hasCreationError">
|
||||||
|
{{ createGenreError }}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="genre-list">
|
||||||
|
<h2>Rename & delete genres</h2>
|
||||||
|
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<th>Genre</th>
|
<th>Genre</th>
|
||||||
|
@ -31,3 +52,4 @@
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</section>
|
</section>
|
||||||
|
</div>
|
||||||
|
|
|
@ -20,6 +20,11 @@ angular.module('ponyfm').controller 'admin-genres', [
|
||||||
|
|
||||||
$scope.genres = []
|
$scope.genres = []
|
||||||
|
|
||||||
|
$scope.isCreating = false
|
||||||
|
$scope.genreToCreate = ''
|
||||||
|
$scope.hasCreationError = false
|
||||||
|
$scope.createGenreError = ''
|
||||||
|
|
||||||
# Used for merging/deleting genres
|
# Used for merging/deleting genres
|
||||||
$scope.mergeInProgress = false
|
$scope.mergeInProgress = false
|
||||||
$scope.genreToDelete = null
|
$scope.genreToDelete = null
|
||||||
|
@ -37,6 +42,21 @@ angular.module('ponyfm').controller 'admin-genres', [
|
||||||
loadGenres()
|
loadGenres()
|
||||||
|
|
||||||
|
|
||||||
|
$scope.createGenre = (genreName) ->
|
||||||
|
$scope.isCreating = true
|
||||||
|
genres.create(genreName)
|
||||||
|
.done (response) ->
|
||||||
|
$scope.hasCreationError = false
|
||||||
|
$scope.genreToCreate = ''
|
||||||
|
loadGenres()
|
||||||
|
.fail (response) ->
|
||||||
|
$scope.hasCreationError = true
|
||||||
|
$scope.createGenreError = response
|
||||||
|
console.log(response)
|
||||||
|
.always (response) ->
|
||||||
|
$scope.isCreating = false
|
||||||
|
|
||||||
|
|
||||||
# Renames the given genre
|
# Renames the given genre
|
||||||
$scope.renameGenre = (genre) ->
|
$scope.renameGenre = (genre) ->
|
||||||
genre.isSaving = true
|
genre.isSaving = true
|
||||||
|
|
|
@ -28,6 +28,17 @@ angular.module('ponyfm').factory('admin-genres', [
|
||||||
def.resolve(genres['genres'])
|
def.resolve(genres['genres'])
|
||||||
def.promise()
|
def.promise()
|
||||||
|
|
||||||
|
create: (name) ->
|
||||||
|
url = '/api/web/admin/genres'
|
||||||
|
def = new $.Deferred()
|
||||||
|
$http.post(url, {name: name})
|
||||||
|
.success (response) ->
|
||||||
|
def.resolve(response)
|
||||||
|
.error (response) ->
|
||||||
|
def.reject(response)
|
||||||
|
|
||||||
|
def.promise()
|
||||||
|
|
||||||
rename: (genre_id, new_name) ->
|
rename: (genre_id, new_name) ->
|
||||||
url = "/api/web/admin/genres/#{genre_id}"
|
url = "/api/web/admin/genres/#{genre_id}"
|
||||||
def = new $.Deferred()
|
def = new $.Deferred()
|
||||||
|
|
3
resources/assets/styles/admin.less
vendored
3
resources/assets/styles/admin.less
vendored
|
@ -19,6 +19,9 @@
|
||||||
@import 'base/bootstrap/bootstrap';
|
@import 'base/bootstrap/bootstrap';
|
||||||
@import 'mixins';
|
@import 'mixins';
|
||||||
|
|
||||||
|
.genre-creator {
|
||||||
|
max-width: 400px;
|
||||||
|
}
|
||||||
|
|
||||||
.genre-list {
|
.genre-list {
|
||||||
.-status {
|
.-status {
|
||||||
|
|
6
resources/assets/styles/body.less
vendored
6
resources/assets/styles/body.less
vendored
|
@ -31,7 +31,7 @@ a {
|
||||||
.box-sizing(border-box);
|
.box-sizing(border-box);
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
|
|
||||||
h1 {
|
h1, h2 {
|
||||||
margin: 1px 1px 5px;
|
margin: 1px 1px 5px;
|
||||||
font-size: 15pt;
|
font-size: 15pt;
|
||||||
color: #C2889C;
|
color: #C2889C;
|
||||||
|
@ -39,6 +39,10 @@ a {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
font-size: 14pt;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.static-page {
|
.static-page {
|
||||||
|
|
Loading…
Reference in a new issue