diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index e7058731..be68c641 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -61,4 +61,19 @@ class Kernel extends HttpKernel 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'cors' => \Barryvdh\Cors\HandleCors::class, ]; + /** + * The priority-sorted list of middleware. + * + * This forces non-global middleware to always be in the given order. + * + * @var array + */ + protected $middlewarePriority = [ + \Illuminate\Session\Middleware\StartSession::class, + \Illuminate\View\Middleware\ShareErrorsFromSession::class, + \App\Http\Middleware\Authenticate::class, + \Illuminate\Session\Middleware\AuthenticateSession::class, + \Illuminate\Routing\Middleware\SubstituteBindings::class, + \Illuminate\Auth\Middleware\Authorize::class, + ]; } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index d89e3f83..9793298f 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -24,6 +24,13 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; class VerifyCsrfToken extends Middleware { + /** + * Indicates whether the XSRF-TOKEN cookie should be set on the response. + * + * @var bool + */ + protected $addHttpCookie = true; + /** * The URIs that should be excluded from CSRF verification. * diff --git a/bootstrap/app.php b/bootstrap/app.php index 27f334fb..848136bc 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -30,7 +30,7 @@ */ $app = new Illuminate\Foundation\Application( - realpath(__DIR__.'/../') + $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) ); /* diff --git a/composer.json b/composer.json index 8829e05e..037c6f3f 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "type": "project", "require": { "php": "^7.1.3", - "laravel/framework": "5.6.*", + "laravel/framework": "5.7.*", "codescale/ffmpeg-php": "2.7.0", "barryvdh/laravel-ide-helper": "v2.8.0", "guzzlehttp/guzzle": "~6.0", @@ -31,10 +31,11 @@ "doctrine/collections": "v1.4.*", "doctrine/annotations": "v1.4.*", "doctrine/cache": "v1.6.*", - "doctrine/instantiator": "1.0.*" + "doctrine/instantiator": "1.0.*", + "fideloper/proxy": "^4.0" }, "require-dev": { - "fzaninotto/faker": "~1.4", + "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", "phpunit/phpunit": "^7.0", "filp/whoops": "^2.0", @@ -42,7 +43,8 @@ "symfony/css-selector": "~3.1", "laravel/browser-kit-testing": "2.*", "nategood/httpful": "^0.2.20", - "nunomaduro/collision": "^2.0" + "nunomaduro/collision": "^2.0", + "beyondcode/laravel-dump-server": "^1.0" }, "autoload": { "classmap": [ @@ -65,14 +67,14 @@ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "@php artisan key:generate" + "@php artisan key:generate --ansi" ], "post-update-cmd": [ "php artisan ide-helper:generate" ], "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover" + "@php artisan package:discover --ansi" ] }, "config": { diff --git a/config/cache.php b/config/cache.php index fa12e5e4..4f0b3c45 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,5 +1,7 @@ [ - // Memcached::OPT_CONNECT_TIMEOUT => 2000, + // Memcached::OPT_CONNECT_TIMEOUT => 2000, ], 'servers' => [ [ @@ -70,7 +72,7 @@ return [ 'redis' => [ 'driver' => 'redis', - 'connection' => 'default', + 'connection' => 'cache', ], ], @@ -86,9 +88,6 @@ return [ | */ - 'prefix' => env( - 'CACHE_PREFIX', - str_slug(env('APP_NAME', 'laravel'), '_').'_cache' - ), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), ]; diff --git a/config/database.php b/config/database.php index 0ef2da76..22347a41 100644 --- a/config/database.php +++ b/config/database.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'pgsql'), + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- @@ -37,12 +37,7 @@ return [ 'driver' => 'sqlite', 'database' => env('DB_DATABASE', database_path('database.sqlite')), 'prefix' => '', - ], - - 'memory' => [ - 'driver' => 'sqlite', - 'database' => ':memory:', - 'prefix' => '', + 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), ], 'mysql' => [ @@ -56,19 +51,21 @@ return [ 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', + 'prefix_indexes' => true, 'strict' => true, 'engine' => null, ], 'pgsql' => [ 'driver' => 'pgsql', - 'host' => env('POSTGRESQL_DB_HOST', '127.0.0.1'), - 'port' => env('POSTGRESQL_DB_PORT', '5432'), - 'database' => env('POSTGRESQL_DB_DATABASE', 'forge'), - 'username' => env('POSTGRESQL_DB_USERNAME', 'forge'), - 'password' => env('POSTGRESQL_DB_PASSWORD', ''), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '5432'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', + 'prefix_indexes' => true, 'schema' => 'public', 'sslmode' => 'prefer', ], @@ -82,6 +79,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', + 'prefix_indexes' => true, ], ], @@ -105,7 +103,7 @@ return [ |-------------------------------------------------------------------------- | | Redis is an open source, fast, and advanced key-value store that also - | provides a richer set of commands than a typical key-value systems + | provides a richer body of commands than a typical key-value system | such as APC or Memcached. Laravel makes it easy to dig right in. | */ @@ -118,7 +116,14 @@ return [ 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'database' => env('REDIS_DB', 0), + ], + + 'cache' => [ + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_CACHE_DB', 1), ], ], diff --git a/config/hashing.php b/config/hashing.php index d3c8e2fb..84257708 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -11,7 +11,7 @@ return [ | passwords for your application. By default, the bcrypt algorithm is | used; however, you remain free to modify this option if you wish. | - | Supported: "bcrypt", "argon" + | Supported: "bcrypt", "argon", "argon2id" | */ diff --git a/config/logging.php b/config/logging.php index 400bc7f4..d09cd7d2 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,6 +1,7 @@ [ 'stack' => [ 'driver' => 'stack', - 'channels' => ['single'], + 'channels' => ['daily'], + 'ignore_exceptions' => false, ], 'single' => [ @@ -48,7 +50,7 @@ return [ 'driver' => 'daily', 'path' => storage_path('logs/laravel.log'), 'level' => 'debug', - 'days' => 7, + 'days' => 14, ], 'slack' => [ @@ -59,9 +61,20 @@ return [ 'level' => 'critical', ], + 'papertrail' => [ + 'driver' => 'monolog', + 'level' => 'debug', + 'handler' => SyslogUdpHandler::class, + 'handler_with' => [ + 'host' => env('PAPERTRAIL_URL'), + 'port' => env('PAPERTRAIL_PORT'), + ], + ], + 'stderr' => [ 'driver' => 'monolog', 'handler' => StreamHandler::class, + 'formatter' => env('LOG_STDERR_FORMATTER'), 'with' => [ 'stream' => 'php://stderr', ], diff --git a/config/mail.php b/config/mail.php index c4a5e44f..f4006459 100644 --- a/config/mail.php +++ b/config/mail.php @@ -56,8 +56,8 @@ return [ */ 'from' => [ - 'address' => env('MAIL_FROM_ADDRESS', 'hello@pony.fm'), - 'name' => env('MAIL_FROM_NAME', 'Pony.fm'), + 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), + 'name' => env('MAIL_FROM_NAME', 'Example'), ], /* @@ -120,4 +120,17 @@ return [ ], ], + /* + |-------------------------------------------------------------------------- + | Log Channel + |-------------------------------------------------------------------------- + | + | If you are using the "log" driver, you may specify the logging channel + | if you prefer to keep mail messages separate from other log entries + | for simpler reading. Otherwise, the default channel will be used. + | + */ + + 'log_channel' => env('MAIL_LOG_CHANNEL'), + ]; diff --git a/config/queue.php b/config/queue.php index 76f21c19..c1430b49 100644 --- a/config/queue.php +++ b/config/queue.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'sync'), /* |-------------------------------------------------------------------------- @@ -60,7 +60,7 @@ return [ 'redis' => [ 'driver' => 'redis', 'connection' => 'default', - 'queue' => 'default', + 'queue' => env('REDIS_QUEUE', 'default'), 'retry_after' => 90, 'block_for' => null, ], @@ -79,7 +79,7 @@ return [ */ 'failed' => [ - 'database' => env('DB_CONNECTION', 'pgsql'), + 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], diff --git a/config/services.php b/config/services.php index b0aeb864..74bde498 100644 --- a/config/services.php +++ b/config/services.php @@ -17,6 +17,7 @@ return [ 'mailgun' => [ 'domain' => env('MAILGUN_DOMAIN'), 'secret' => env('MAILGUN_SECRET'), + 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), ], 'ses' => [ @@ -33,6 +34,10 @@ return [ 'model' => App\Models\User::class, 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), + 'webhook' => [ + 'secret' => env('STRIPE_WEBHOOK_SECRET'), + 'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300), + ], ], ]; diff --git a/config/session.php b/config/session.php index 736fb3c7..fae302ae 100644 --- a/config/session.php +++ b/config/session.php @@ -1,5 +1,7 @@ null, + 'connection' => env('SESSION_CONNECTION', null), /* |-------------------------------------------------------------------------- @@ -96,7 +98,7 @@ return [ | */ - 'store' => null, + 'store' => env('SESSION_STORE', null), /* |-------------------------------------------------------------------------- @@ -124,7 +126,7 @@ return [ 'cookie' => env( 'SESSION_COOKIE', - str_slug(env('APP_NAME', 'laravel'), '_').'_session' + Str::slug(env('APP_NAME', 'laravel'), '_').'_session' ), /* diff --git a/config/view.php b/config/view.php index 2acfd9cc..22b8a18d 100644 --- a/config/view.php +++ b/config/view.php @@ -28,6 +28,9 @@ return [ | */ - 'compiled' => realpath(storage_path('framework/views')), + 'compiled' => env( + 'VIEW_COMPILED_PATH', + realpath(storage_path('framework/views')) + ), ]; diff --git a/phpunit.xml b/phpunit.xml index f43ffd32..50c7df18 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -25,9 +25,10 @@ - + - + + diff --git a/resources/environments/.env.example b/resources/environments/.env.example index d75caf18..71e0b20a 100644 --- a/resources/environments/.env.example +++ b/resources/environments/.env.example @@ -11,7 +11,7 @@ DB_PASSWORD=secret ELASTICSEARCH_HOSTS=localhost SESSION_HTTPS_ONLY=false -QUEUE_DRIVER=beanstalkd +QUEUE_CONNECTION=beanstalkd MAIL_DRIVER=smtp MAIL_HOST=mailtrap.io diff --git a/resources/environments/.env.local b/resources/environments/.env.local index 7de2961c..9056c494 100644 --- a/resources/environments/.env.local +++ b/resources/environments/.env.local @@ -11,7 +11,7 @@ DB_PASSWORD=secret ELASTICSEARCH_HOSTS=localhost SESSION_HTTPS_ONLY=false -QUEUE_DRIVER=beanstalkd +QUEUE_CONNECTION=beanstalkd MAIL_DRIVER=smtp MAIL_HOST=mailtrap.io diff --git a/resources/assets/scripts/app/app.coffee b/resources/scripts/app/app.coffee similarity index 100% rename from resources/assets/scripts/app/app.coffee rename to resources/scripts/app/app.coffee diff --git a/resources/assets/scripts/app/controllers/account-albums-edit.coffee b/resources/scripts/app/controllers/account-albums-edit.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-albums-edit.coffee rename to resources/scripts/app/controllers/account-albums-edit.coffee diff --git a/resources/assets/scripts/app/controllers/account-albums.coffee b/resources/scripts/app/controllers/account-albums.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-albums.coffee rename to resources/scripts/app/controllers/account-albums.coffee diff --git a/resources/assets/scripts/app/controllers/account-playlists.coffee b/resources/scripts/app/controllers/account-playlists.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-playlists.coffee rename to resources/scripts/app/controllers/account-playlists.coffee diff --git a/resources/assets/scripts/app/controllers/account-settings.coffee b/resources/scripts/app/controllers/account-settings.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-settings.coffee rename to resources/scripts/app/controllers/account-settings.coffee diff --git a/resources/assets/scripts/app/controllers/account-track.coffee b/resources/scripts/app/controllers/account-track.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-track.coffee rename to resources/scripts/app/controllers/account-track.coffee diff --git a/resources/assets/scripts/app/controllers/account-tracks.coffee b/resources/scripts/app/controllers/account-tracks.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/account-tracks.coffee rename to resources/scripts/app/controllers/account-tracks.coffee diff --git a/resources/assets/scripts/app/controllers/admin-announcements.coffee b/resources/scripts/app/controllers/admin-announcements.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-announcements.coffee rename to resources/scripts/app/controllers/admin-announcements.coffee diff --git a/resources/assets/scripts/app/controllers/admin-classifier.coffee b/resources/scripts/app/controllers/admin-classifier.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-classifier.coffee rename to resources/scripts/app/controllers/admin-classifier.coffee diff --git a/resources/assets/scripts/app/controllers/admin-genres.coffee b/resources/scripts/app/controllers/admin-genres.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-genres.coffee rename to resources/scripts/app/controllers/admin-genres.coffee diff --git a/resources/assets/scripts/app/controllers/admin-show-songs.coffee b/resources/scripts/app/controllers/admin-show-songs.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-show-songs.coffee rename to resources/scripts/app/controllers/admin-show-songs.coffee diff --git a/resources/assets/scripts/app/controllers/admin-tracks.coffee b/resources/scripts/app/controllers/admin-tracks.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-tracks.coffee rename to resources/scripts/app/controllers/admin-tracks.coffee diff --git a/resources/assets/scripts/app/controllers/admin-users.coffee b/resources/scripts/app/controllers/admin-users.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/admin-users.coffee rename to resources/scripts/app/controllers/admin-users.coffee diff --git a/resources/assets/scripts/app/controllers/album.coffee b/resources/scripts/app/controllers/album.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/album.coffee rename to resources/scripts/app/controllers/album.coffee diff --git a/resources/assets/scripts/app/controllers/albums-list.coffee b/resources/scripts/app/controllers/albums-list.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/albums-list.coffee rename to resources/scripts/app/controllers/albums-list.coffee diff --git a/resources/assets/scripts/app/controllers/albums.coffee b/resources/scripts/app/controllers/albums.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/albums.coffee rename to resources/scripts/app/controllers/albums.coffee diff --git a/resources/assets/scripts/app/controllers/application.coffee b/resources/scripts/app/controllers/application.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/application.coffee rename to resources/scripts/app/controllers/application.coffee diff --git a/resources/assets/scripts/app/controllers/artist-content.coffee b/resources/scripts/app/controllers/artist-content.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artist-content.coffee rename to resources/scripts/app/controllers/artist-content.coffee diff --git a/resources/assets/scripts/app/controllers/artist-favourites.coffee b/resources/scripts/app/controllers/artist-favourites.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artist-favourites.coffee rename to resources/scripts/app/controllers/artist-favourites.coffee diff --git a/resources/assets/scripts/app/controllers/artist-profile.coffee b/resources/scripts/app/controllers/artist-profile.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artist-profile.coffee rename to resources/scripts/app/controllers/artist-profile.coffee diff --git a/resources/assets/scripts/app/controllers/artist.coffee b/resources/scripts/app/controllers/artist.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artist.coffee rename to resources/scripts/app/controllers/artist.coffee diff --git a/resources/assets/scripts/app/controllers/artists-list.coffee b/resources/scripts/app/controllers/artists-list.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artists-list.coffee rename to resources/scripts/app/controllers/artists-list.coffee diff --git a/resources/assets/scripts/app/controllers/artists.coffee b/resources/scripts/app/controllers/artists.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/artists.coffee rename to resources/scripts/app/controllers/artists.coffee diff --git a/resources/assets/scripts/app/controllers/credits.coffee b/resources/scripts/app/controllers/credits.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/credits.coffee rename to resources/scripts/app/controllers/credits.coffee diff --git a/resources/assets/scripts/app/controllers/dashboard.coffee b/resources/scripts/app/controllers/dashboard.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/dashboard.coffee rename to resources/scripts/app/controllers/dashboard.coffee diff --git a/resources/assets/scripts/app/controllers/home.coffee b/resources/scripts/app/controllers/home.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/home.coffee rename to resources/scripts/app/controllers/home.coffee diff --git a/resources/assets/scripts/app/controllers/login.coffee b/resources/scripts/app/controllers/login.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/login.coffee rename to resources/scripts/app/controllers/login.coffee diff --git a/resources/assets/scripts/app/controllers/notifications-email-unsubscribed.coffee b/resources/scripts/app/controllers/notifications-email-unsubscribed.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/notifications-email-unsubscribed.coffee rename to resources/scripts/app/controllers/notifications-email-unsubscribed.coffee diff --git a/resources/assets/scripts/app/controllers/playlist-form.coffee b/resources/scripts/app/controllers/playlist-form.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/playlist-form.coffee rename to resources/scripts/app/controllers/playlist-form.coffee diff --git a/resources/assets/scripts/app/controllers/playlist.coffee b/resources/scripts/app/controllers/playlist.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/playlist.coffee rename to resources/scripts/app/controllers/playlist.coffee diff --git a/resources/assets/scripts/app/controllers/playlists-list.coffee b/resources/scripts/app/controllers/playlists-list.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/playlists-list.coffee rename to resources/scripts/app/controllers/playlists-list.coffee diff --git a/resources/assets/scripts/app/controllers/playlists.coffee b/resources/scripts/app/controllers/playlists.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/playlists.coffee rename to resources/scripts/app/controllers/playlists.coffee diff --git a/resources/assets/scripts/app/controllers/sidebar.coffee b/resources/scripts/app/controllers/sidebar.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/sidebar.coffee rename to resources/scripts/app/controllers/sidebar.coffee diff --git a/resources/assets/scripts/app/controllers/track-edit.coffee b/resources/scripts/app/controllers/track-edit.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/track-edit.coffee rename to resources/scripts/app/controllers/track-edit.coffee diff --git a/resources/assets/scripts/app/controllers/track-show.coffee b/resources/scripts/app/controllers/track-show.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/track-show.coffee rename to resources/scripts/app/controllers/track-show.coffee diff --git a/resources/assets/scripts/app/controllers/track-stats.coffee b/resources/scripts/app/controllers/track-stats.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/track-stats.coffee rename to resources/scripts/app/controllers/track-stats.coffee diff --git a/resources/assets/scripts/app/controllers/track.coffee b/resources/scripts/app/controllers/track.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/track.coffee rename to resources/scripts/app/controllers/track.coffee diff --git a/resources/assets/scripts/app/controllers/tracks-list.coffee b/resources/scripts/app/controllers/tracks-list.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/tracks-list.coffee rename to resources/scripts/app/controllers/tracks-list.coffee diff --git a/resources/assets/scripts/app/controllers/tracks.coffee b/resources/scripts/app/controllers/tracks.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/tracks.coffee rename to resources/scripts/app/controllers/tracks.coffee diff --git a/resources/assets/scripts/app/controllers/uploader.coffee b/resources/scripts/app/controllers/uploader.coffee similarity index 100% rename from resources/assets/scripts/app/controllers/uploader.coffee rename to resources/scripts/app/controllers/uploader.coffee diff --git a/resources/assets/scripts/app/directives/albums-list.coffee b/resources/scripts/app/directives/albums-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/albums-list.coffee rename to resources/scripts/app/directives/albums-list.coffee diff --git a/resources/assets/scripts/app/directives/colorbox.coffee b/resources/scripts/app/directives/colorbox.coffee similarity index 100% rename from resources/assets/scripts/app/directives/colorbox.coffee rename to resources/scripts/app/directives/colorbox.coffee diff --git a/resources/assets/scripts/app/directives/comments.coffee b/resources/scripts/app/directives/comments.coffee similarity index 100% rename from resources/assets/scripts/app/directives/comments.coffee rename to resources/scripts/app/directives/comments.coffee diff --git a/resources/assets/scripts/app/directives/eat-click.coffee b/resources/scripts/app/directives/eat-click.coffee similarity index 100% rename from resources/assets/scripts/app/directives/eat-click.coffee rename to resources/scripts/app/directives/eat-click.coffee diff --git a/resources/assets/scripts/app/directives/favouriteButton.coffee b/resources/scripts/app/directives/favouriteButton.coffee similarity index 100% rename from resources/assets/scripts/app/directives/favouriteButton.coffee rename to resources/scripts/app/directives/favouriteButton.coffee diff --git a/resources/assets/scripts/app/directives/image-upload.coffee b/resources/scripts/app/directives/image-upload.coffee similarity index 100% rename from resources/assets/scripts/app/directives/image-upload.coffee rename to resources/scripts/app/directives/image-upload.coffee diff --git a/resources/assets/scripts/app/directives/notification-list.coffee b/resources/scripts/app/directives/notification-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/notification-list.coffee rename to resources/scripts/app/directives/notification-list.coffee diff --git a/resources/assets/scripts/app/directives/on-enter.coffee b/resources/scripts/app/directives/on-enter.coffee similarity index 100% rename from resources/assets/scripts/app/directives/on-enter.coffee rename to resources/scripts/app/directives/on-enter.coffee diff --git a/resources/assets/scripts/app/directives/paged-tracks-list.coffee b/resources/scripts/app/directives/paged-tracks-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/paged-tracks-list.coffee rename to resources/scripts/app/directives/paged-tracks-list.coffee diff --git a/resources/assets/scripts/app/directives/player.coffee b/resources/scripts/app/directives/player.coffee similarity index 100% rename from resources/assets/scripts/app/directives/player.coffee rename to resources/scripts/app/directives/player.coffee diff --git a/resources/assets/scripts/app/directives/playlists-list.coffee b/resources/scripts/app/directives/playlists-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/playlists-list.coffee rename to resources/scripts/app/directives/playlists-list.coffee diff --git a/resources/assets/scripts/app/directives/popup.coffee b/resources/scripts/app/directives/popup.coffee similarity index 100% rename from resources/assets/scripts/app/directives/popup.coffee rename to resources/scripts/app/directives/popup.coffee diff --git a/resources/assets/scripts/app/directives/progress-bar.coffee b/resources/scripts/app/directives/progress-bar.coffee similarity index 100% rename from resources/assets/scripts/app/directives/progress-bar.coffee rename to resources/scripts/app/directives/progress-bar.coffee diff --git a/resources/assets/scripts/app/directives/scroll-recorder.coffee b/resources/scripts/app/directives/scroll-recorder.coffee similarity index 100% rename from resources/assets/scripts/app/directives/scroll-recorder.coffee rename to resources/scripts/app/directives/scroll-recorder.coffee diff --git a/resources/assets/scripts/app/directives/search.coffee b/resources/scripts/app/directives/search.coffee similarity index 100% rename from resources/assets/scripts/app/directives/search.coffee rename to resources/scripts/app/directives/search.coffee diff --git a/resources/assets/scripts/app/directives/share-buttons.coffee b/resources/scripts/app/directives/share-buttons.coffee similarity index 100% rename from resources/assets/scripts/app/directives/share-buttons.coffee rename to resources/scripts/app/directives/share-buttons.coffee diff --git a/resources/assets/scripts/app/directives/src-loader.coffee b/resources/scripts/app/directives/src-loader.coffee similarity index 100% rename from resources/assets/scripts/app/directives/src-loader.coffee rename to resources/scripts/app/directives/src-loader.coffee diff --git a/resources/assets/scripts/app/directives/track-editor.coffee b/resources/scripts/app/directives/track-editor.coffee similarity index 100% rename from resources/assets/scripts/app/directives/track-editor.coffee rename to resources/scripts/app/directives/track-editor.coffee diff --git a/resources/assets/scripts/app/directives/track-player.coffee b/resources/scripts/app/directives/track-player.coffee similarity index 100% rename from resources/assets/scripts/app/directives/track-player.coffee rename to resources/scripts/app/directives/track-player.coffee diff --git a/resources/assets/scripts/app/directives/tracks-list.coffee b/resources/scripts/app/directives/tracks-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/tracks-list.coffee rename to resources/scripts/app/directives/tracks-list.coffee diff --git a/resources/assets/scripts/app/directives/uploader.coffee b/resources/scripts/app/directives/uploader.coffee similarity index 100% rename from resources/assets/scripts/app/directives/uploader.coffee rename to resources/scripts/app/directives/uploader.coffee diff --git a/resources/assets/scripts/app/directives/user-creator.coffee b/resources/scripts/app/directives/user-creator.coffee similarity index 100% rename from resources/assets/scripts/app/directives/user-creator.coffee rename to resources/scripts/app/directives/user-creator.coffee diff --git a/resources/assets/scripts/app/directives/users-list.coffee b/resources/scripts/app/directives/users-list.coffee similarity index 100% rename from resources/assets/scripts/app/directives/users-list.coffee rename to resources/scripts/app/directives/users-list.coffee diff --git a/resources/assets/scripts/app/filters/length.coffee b/resources/scripts/app/filters/length.coffee similarity index 100% rename from resources/assets/scripts/app/filters/length.coffee rename to resources/scripts/app/filters/length.coffee diff --git a/resources/assets/scripts/app/filters/moment-from-now.coffee b/resources/scripts/app/filters/moment-from-now.coffee similarity index 100% rename from resources/assets/scripts/app/filters/moment-from-now.coffee rename to resources/scripts/app/filters/moment-from-now.coffee diff --git a/resources/assets/scripts/app/filters/nl2br.coffee b/resources/scripts/app/filters/nl2br.coffee similarity index 100% rename from resources/assets/scripts/app/filters/nl2br.coffee rename to resources/scripts/app/filters/nl2br.coffee diff --git a/resources/assets/scripts/app/filters/noHTML.coffee b/resources/scripts/app/filters/noHTML.coffee similarity index 100% rename from resources/assets/scripts/app/filters/noHTML.coffee rename to resources/scripts/app/filters/noHTML.coffee diff --git a/resources/assets/scripts/app/filters/seconds-display.coffee b/resources/scripts/app/filters/seconds-display.coffee similarity index 100% rename from resources/assets/scripts/app/filters/seconds-display.coffee rename to resources/scripts/app/filters/seconds-display.coffee diff --git a/resources/assets/scripts/app/filters/trust.coffee b/resources/scripts/app/filters/trust.coffee similarity index 100% rename from resources/assets/scripts/app/filters/trust.coffee rename to resources/scripts/app/filters/trust.coffee diff --git a/resources/assets/scripts/app/services/account-albums.coffee b/resources/scripts/app/services/account-albums.coffee similarity index 100% rename from resources/assets/scripts/app/services/account-albums.coffee rename to resources/scripts/app/services/account-albums.coffee diff --git a/resources/assets/scripts/app/services/account-tracks.coffee b/resources/scripts/app/services/account-tracks.coffee similarity index 100% rename from resources/assets/scripts/app/services/account-tracks.coffee rename to resources/scripts/app/services/account-tracks.coffee diff --git a/resources/assets/scripts/app/services/activity-types.coffee b/resources/scripts/app/services/activity-types.coffee similarity index 100% rename from resources/assets/scripts/app/services/activity-types.coffee rename to resources/scripts/app/services/activity-types.coffee diff --git a/resources/assets/scripts/app/services/admin-genres.coffee b/resources/scripts/app/services/admin-genres.coffee similarity index 100% rename from resources/assets/scripts/app/services/admin-genres.coffee rename to resources/scripts/app/services/admin-genres.coffee diff --git a/resources/assets/scripts/app/services/admin-show-songs.coffee b/resources/scripts/app/services/admin-show-songs.coffee similarity index 100% rename from resources/assets/scripts/app/services/admin-show-songs.coffee rename to resources/scripts/app/services/admin-show-songs.coffee diff --git a/resources/assets/scripts/app/services/albums.coffee b/resources/scripts/app/services/albums.coffee similarity index 100% rename from resources/assets/scripts/app/services/albums.coffee rename to resources/scripts/app/services/albums.coffee diff --git a/resources/assets/scripts/app/services/announcements.coffee b/resources/scripts/app/services/announcements.coffee similarity index 100% rename from resources/assets/scripts/app/services/announcements.coffee rename to resources/scripts/app/services/announcements.coffee diff --git a/resources/assets/scripts/app/services/artists.coffee b/resources/scripts/app/services/artists.coffee similarity index 100% rename from resources/assets/scripts/app/services/artists.coffee rename to resources/scripts/app/services/artists.coffee diff --git a/resources/assets/scripts/app/services/auth.coffee b/resources/scripts/app/services/auth.coffee similarity index 100% rename from resources/assets/scripts/app/services/auth.coffee rename to resources/scripts/app/services/auth.coffee diff --git a/resources/assets/scripts/app/services/comments.coffee b/resources/scripts/app/services/comments.coffee similarity index 100% rename from resources/assets/scripts/app/services/comments.coffee rename to resources/scripts/app/services/comments.coffee diff --git a/resources/assets/scripts/app/services/dashboard.coffee b/resources/scripts/app/services/dashboard.coffee similarity index 100% rename from resources/assets/scripts/app/services/dashboard.coffee rename to resources/scripts/app/services/dashboard.coffee diff --git a/resources/assets/scripts/app/services/download-cached.coffee b/resources/scripts/app/services/download-cached.coffee similarity index 100% rename from resources/assets/scripts/app/services/download-cached.coffee rename to resources/scripts/app/services/download-cached.coffee diff --git a/resources/assets/scripts/app/services/favourites.coffee b/resources/scripts/app/services/favourites.coffee similarity index 100% rename from resources/assets/scripts/app/services/favourites.coffee rename to resources/scripts/app/services/favourites.coffee diff --git a/resources/assets/scripts/app/services/focus.coffee b/resources/scripts/app/services/focus.coffee similarity index 100% rename from resources/assets/scripts/app/services/focus.coffee rename to resources/scripts/app/services/focus.coffee diff --git a/resources/assets/scripts/app/services/follow.coffee b/resources/scripts/app/services/follow.coffee similarity index 100% rename from resources/assets/scripts/app/services/follow.coffee rename to resources/scripts/app/services/follow.coffee diff --git a/resources/assets/scripts/app/services/images.coffee b/resources/scripts/app/services/images.coffee similarity index 100% rename from resources/assets/scripts/app/services/images.coffee rename to resources/scripts/app/services/images.coffee diff --git a/resources/assets/scripts/app/services/lightbox.coffee b/resources/scripts/app/services/lightbox.coffee similarity index 100% rename from resources/assets/scripts/app/services/lightbox.coffee rename to resources/scripts/app/services/lightbox.coffee diff --git a/resources/assets/scripts/app/services/meta.coffee b/resources/scripts/app/services/meta.coffee similarity index 100% rename from resources/assets/scripts/app/services/meta.coffee rename to resources/scripts/app/services/meta.coffee diff --git a/resources/assets/scripts/app/services/notifications.coffee b/resources/scripts/app/services/notifications.coffee similarity index 100% rename from resources/assets/scripts/app/services/notifications.coffee rename to resources/scripts/app/services/notifications.coffee diff --git a/resources/assets/scripts/app/services/player.coffee b/resources/scripts/app/services/player.coffee similarity index 100% rename from resources/assets/scripts/app/services/player.coffee rename to resources/scripts/app/services/player.coffee diff --git a/resources/assets/scripts/app/services/playlists.coffee b/resources/scripts/app/services/playlists.coffee similarity index 100% rename from resources/assets/scripts/app/services/playlists.coffee rename to resources/scripts/app/services/playlists.coffee diff --git a/resources/assets/scripts/app/services/search.coffee b/resources/scripts/app/services/search.coffee similarity index 100% rename from resources/assets/scripts/app/services/search.coffee rename to resources/scripts/app/services/search.coffee diff --git a/resources/assets/scripts/app/services/taxonomies.coffee b/resources/scripts/app/services/taxonomies.coffee similarity index 100% rename from resources/assets/scripts/app/services/taxonomies.coffee rename to resources/scripts/app/services/taxonomies.coffee diff --git a/resources/assets/scripts/app/services/track-stats.coffee b/resources/scripts/app/services/track-stats.coffee similarity index 100% rename from resources/assets/scripts/app/services/track-stats.coffee rename to resources/scripts/app/services/track-stats.coffee diff --git a/resources/assets/scripts/app/services/tracks.coffee b/resources/scripts/app/services/tracks.coffee similarity index 100% rename from resources/assets/scripts/app/services/tracks.coffee rename to resources/scripts/app/services/tracks.coffee diff --git a/resources/assets/scripts/app/services/upload.coffee b/resources/scripts/app/services/upload.coffee similarity index 100% rename from resources/assets/scripts/app/services/upload.coffee rename to resources/scripts/app/services/upload.coffee diff --git a/resources/assets/scripts/base/angular-ui-date.js b/resources/scripts/base/angular-ui-date.js similarity index 100% rename from resources/assets/scripts/base/angular-ui-date.js rename to resources/scripts/base/angular-ui-date.js diff --git a/resources/assets/scripts/base/angular-ui-sortable.js b/resources/scripts/base/angular-ui-sortable.js similarity index 100% rename from resources/assets/scripts/base/angular-ui-sortable.js rename to resources/scripts/base/angular-ui-sortable.js diff --git a/resources/assets/scripts/base/angularytics.js b/resources/scripts/base/angularytics.js similarity index 100% rename from resources/assets/scripts/base/angularytics.js rename to resources/scripts/base/angularytics.js diff --git a/resources/assets/scripts/base/jquery-2.0.2.js b/resources/scripts/base/jquery-2.0.2.js similarity index 100% rename from resources/assets/scripts/base/jquery-2.0.2.js rename to resources/scripts/base/jquery-2.0.2.js diff --git a/resources/assets/scripts/base/jquery-ui.js b/resources/scripts/base/jquery-ui.js similarity index 100% rename from resources/assets/scripts/base/jquery-ui.js rename to resources/scripts/base/jquery-ui.js diff --git a/resources/assets/scripts/base/jquery.colorbox.js b/resources/scripts/base/jquery.colorbox.js similarity index 100% rename from resources/assets/scripts/base/jquery.colorbox.js rename to resources/scripts/base/jquery.colorbox.js diff --git a/resources/assets/scripts/base/jquery.cookie.js b/resources/scripts/base/jquery.cookie.js similarity index 100% rename from resources/assets/scripts/base/jquery.cookie.js rename to resources/scripts/base/jquery.cookie.js diff --git a/resources/assets/scripts/base/jquery.timeago.js b/resources/scripts/base/jquery.timeago.js similarity index 100% rename from resources/assets/scripts/base/jquery.timeago.js rename to resources/scripts/base/jquery.timeago.js diff --git a/resources/assets/scripts/base/jquery.viewport.js b/resources/scripts/base/jquery.viewport.js similarity index 100% rename from resources/assets/scripts/base/jquery.viewport.js rename to resources/scripts/base/jquery.viewport.js diff --git a/resources/assets/scripts/base/marked.js b/resources/scripts/base/marked.js similarity index 100% rename from resources/assets/scripts/base/marked.js rename to resources/scripts/base/marked.js diff --git a/resources/assets/scripts/base/moment.js b/resources/scripts/base/moment.js similarity index 100% rename from resources/assets/scripts/base/moment.js rename to resources/scripts/base/moment.js diff --git a/resources/assets/scripts/base/soundmanager2-nodebug.js b/resources/scripts/base/soundmanager2-nodebug.js similarity index 100% rename from resources/assets/scripts/base/soundmanager2-nodebug.js rename to resources/scripts/base/soundmanager2-nodebug.js diff --git a/resources/assets/scripts/base/tumblr.js b/resources/scripts/base/tumblr.js similarity index 100% rename from resources/assets/scripts/base/tumblr.js rename to resources/scripts/base/tumblr.js diff --git a/resources/assets/scripts/base/underscore.js b/resources/scripts/base/underscore.js similarity index 100% rename from resources/assets/scripts/base/underscore.js rename to resources/scripts/base/underscore.js diff --git a/resources/assets/scripts/embed/embed.coffee b/resources/scripts/embed/embed.coffee similarity index 100% rename from resources/assets/scripts/embed/embed.coffee rename to resources/scripts/embed/embed.coffee diff --git a/resources/assets/scripts/embed/favourite.coffee b/resources/scripts/embed/favourite.coffee similarity index 100% rename from resources/assets/scripts/embed/favourite.coffee rename to resources/scripts/embed/favourite.coffee diff --git a/resources/assets/scripts/shared/init.coffee b/resources/scripts/shared/init.coffee similarity index 100% rename from resources/assets/scripts/shared/init.coffee rename to resources/scripts/shared/init.coffee diff --git a/resources/assets/scripts/shared/jquery-extensions.js b/resources/scripts/shared/jquery-extensions.js similarity index 100% rename from resources/assets/scripts/shared/jquery-extensions.js rename to resources/scripts/shared/jquery-extensions.js diff --git a/resources/assets/scripts/shared/layout.coffee b/resources/scripts/shared/layout.coffee similarity index 100% rename from resources/assets/scripts/shared/layout.coffee rename to resources/scripts/shared/layout.coffee diff --git a/resources/assets/scripts/shared/pfm-angular-marked.js b/resources/scripts/shared/pfm-angular-marked.js similarity index 100% rename from resources/assets/scripts/shared/pfm-angular-marked.js rename to resources/scripts/shared/pfm-angular-marked.js diff --git a/resources/assets/scripts/shared/pfm-angular-sanitize.js b/resources/scripts/shared/pfm-angular-sanitize.js similarity index 100% rename from resources/assets/scripts/shared/pfm-angular-sanitize.js rename to resources/scripts/shared/pfm-angular-sanitize.js diff --git a/resources/assets/scripts/shared/underscore-extensions.js b/resources/scripts/shared/underscore-extensions.js similarity index 100% rename from resources/assets/scripts/shared/underscore-extensions.js rename to resources/scripts/shared/underscore-extensions.js diff --git a/resources/assets/styles/account-albums.less b/resources/styles/account-albums.less similarity index 100% rename from resources/assets/styles/account-albums.less rename to resources/styles/account-albums.less diff --git a/resources/assets/styles/account-content-selectors.less b/resources/styles/account-content-selectors.less similarity index 100% rename from resources/assets/styles/account-content-selectors.less rename to resources/styles/account-content-selectors.less diff --git a/resources/assets/styles/account-content.less b/resources/styles/account-content.less similarity index 100% rename from resources/assets/styles/account-content.less rename to resources/styles/account-content.less diff --git a/resources/assets/styles/admin.less b/resources/styles/admin.less similarity index 100% rename from resources/assets/styles/admin.less rename to resources/styles/admin.less diff --git a/resources/assets/styles/animations.less b/resources/styles/animations.less similarity index 100% rename from resources/assets/styles/animations.less rename to resources/styles/animations.less diff --git a/resources/assets/styles/app.less b/resources/styles/app.less similarity index 100% rename from resources/assets/styles/app.less rename to resources/styles/app.less diff --git a/resources/assets/styles/base/angular-chart.css b/resources/styles/base/angular-chart.css similarity index 100% rename from resources/assets/styles/base/angular-chart.css rename to resources/styles/base/angular-chart.css diff --git a/resources/assets/styles/base/bootstrap/alerts.less b/resources/styles/base/bootstrap/alerts.less similarity index 100% rename from resources/assets/styles/base/bootstrap/alerts.less rename to resources/styles/base/bootstrap/alerts.less diff --git a/resources/assets/styles/base/bootstrap/badges.less b/resources/styles/base/bootstrap/badges.less similarity index 100% rename from resources/assets/styles/base/bootstrap/badges.less rename to resources/styles/base/bootstrap/badges.less diff --git a/resources/assets/styles/base/bootstrap/bootstrap.less b/resources/styles/base/bootstrap/bootstrap.less similarity index 100% rename from resources/assets/styles/base/bootstrap/bootstrap.less rename to resources/styles/base/bootstrap/bootstrap.less diff --git a/resources/assets/styles/base/bootstrap/breadcrumbs.less b/resources/styles/base/bootstrap/breadcrumbs.less similarity index 100% rename from resources/assets/styles/base/bootstrap/breadcrumbs.less rename to resources/styles/base/bootstrap/breadcrumbs.less diff --git a/resources/assets/styles/base/bootstrap/button-groups.less b/resources/styles/base/bootstrap/button-groups.less similarity index 100% rename from resources/assets/styles/base/bootstrap/button-groups.less rename to resources/styles/base/bootstrap/button-groups.less diff --git a/resources/assets/styles/base/bootstrap/buttons.less b/resources/styles/base/bootstrap/buttons.less similarity index 100% rename from resources/assets/styles/base/bootstrap/buttons.less rename to resources/styles/base/bootstrap/buttons.less diff --git a/resources/assets/styles/base/bootstrap/carousel.less b/resources/styles/base/bootstrap/carousel.less similarity index 100% rename from resources/assets/styles/base/bootstrap/carousel.less rename to resources/styles/base/bootstrap/carousel.less diff --git a/resources/assets/styles/base/bootstrap/close.less b/resources/styles/base/bootstrap/close.less similarity index 100% rename from resources/assets/styles/base/bootstrap/close.less rename to resources/styles/base/bootstrap/close.less diff --git a/resources/assets/styles/base/bootstrap/code.less b/resources/styles/base/bootstrap/code.less similarity index 100% rename from resources/assets/styles/base/bootstrap/code.less rename to resources/styles/base/bootstrap/code.less diff --git a/resources/assets/styles/base/bootstrap/component-animations.less b/resources/styles/base/bootstrap/component-animations.less similarity index 100% rename from resources/assets/styles/base/bootstrap/component-animations.less rename to resources/styles/base/bootstrap/component-animations.less diff --git a/resources/assets/styles/base/bootstrap/dropdowns.less b/resources/styles/base/bootstrap/dropdowns.less similarity index 100% rename from resources/assets/styles/base/bootstrap/dropdowns.less rename to resources/styles/base/bootstrap/dropdowns.less diff --git a/resources/assets/styles/base/bootstrap/forms.less b/resources/styles/base/bootstrap/forms.less similarity index 100% rename from resources/assets/styles/base/bootstrap/forms.less rename to resources/styles/base/bootstrap/forms.less diff --git a/resources/assets/styles/base/bootstrap/glyphicons.less b/resources/styles/base/bootstrap/glyphicons.less similarity index 100% rename from resources/assets/styles/base/bootstrap/glyphicons.less rename to resources/styles/base/bootstrap/glyphicons.less diff --git a/resources/assets/styles/base/bootstrap/grid.less b/resources/styles/base/bootstrap/grid.less similarity index 100% rename from resources/assets/styles/base/bootstrap/grid.less rename to resources/styles/base/bootstrap/grid.less diff --git a/resources/assets/styles/base/bootstrap/input-groups.less b/resources/styles/base/bootstrap/input-groups.less similarity index 100% rename from resources/assets/styles/base/bootstrap/input-groups.less rename to resources/styles/base/bootstrap/input-groups.less diff --git a/resources/assets/styles/base/bootstrap/jumbotron.less b/resources/styles/base/bootstrap/jumbotron.less similarity index 100% rename from resources/assets/styles/base/bootstrap/jumbotron.less rename to resources/styles/base/bootstrap/jumbotron.less diff --git a/resources/assets/styles/base/bootstrap/labels.less b/resources/styles/base/bootstrap/labels.less similarity index 100% rename from resources/assets/styles/base/bootstrap/labels.less rename to resources/styles/base/bootstrap/labels.less diff --git a/resources/assets/styles/base/bootstrap/list-group.less b/resources/styles/base/bootstrap/list-group.less similarity index 100% rename from resources/assets/styles/base/bootstrap/list-group.less rename to resources/styles/base/bootstrap/list-group.less diff --git a/resources/assets/styles/base/bootstrap/media.less b/resources/styles/base/bootstrap/media.less similarity index 100% rename from resources/assets/styles/base/bootstrap/media.less rename to resources/styles/base/bootstrap/media.less diff --git a/resources/assets/styles/base/bootstrap/mixins.less b/resources/styles/base/bootstrap/mixins.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins.less rename to resources/styles/base/bootstrap/mixins.less diff --git a/resources/assets/styles/base/bootstrap/mixins/alerts.less b/resources/styles/base/bootstrap/mixins/alerts.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/alerts.less rename to resources/styles/base/bootstrap/mixins/alerts.less diff --git a/resources/assets/styles/base/bootstrap/mixins/background-variant.less b/resources/styles/base/bootstrap/mixins/background-variant.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/background-variant.less rename to resources/styles/base/bootstrap/mixins/background-variant.less diff --git a/resources/assets/styles/base/bootstrap/mixins/border-radius.less b/resources/styles/base/bootstrap/mixins/border-radius.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/border-radius.less rename to resources/styles/base/bootstrap/mixins/border-radius.less diff --git a/resources/assets/styles/base/bootstrap/mixins/buttons.less b/resources/styles/base/bootstrap/mixins/buttons.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/buttons.less rename to resources/styles/base/bootstrap/mixins/buttons.less diff --git a/resources/assets/styles/base/bootstrap/mixins/center-block.less b/resources/styles/base/bootstrap/mixins/center-block.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/center-block.less rename to resources/styles/base/bootstrap/mixins/center-block.less diff --git a/resources/assets/styles/base/bootstrap/mixins/clearfix.less b/resources/styles/base/bootstrap/mixins/clearfix.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/clearfix.less rename to resources/styles/base/bootstrap/mixins/clearfix.less diff --git a/resources/assets/styles/base/bootstrap/mixins/forms.less b/resources/styles/base/bootstrap/mixins/forms.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/forms.less rename to resources/styles/base/bootstrap/mixins/forms.less diff --git a/resources/assets/styles/base/bootstrap/mixins/gradients.less b/resources/styles/base/bootstrap/mixins/gradients.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/gradients.less rename to resources/styles/base/bootstrap/mixins/gradients.less diff --git a/resources/assets/styles/base/bootstrap/mixins/grid-framework.less b/resources/styles/base/bootstrap/mixins/grid-framework.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/grid-framework.less rename to resources/styles/base/bootstrap/mixins/grid-framework.less diff --git a/resources/assets/styles/base/bootstrap/mixins/grid.less b/resources/styles/base/bootstrap/mixins/grid.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/grid.less rename to resources/styles/base/bootstrap/mixins/grid.less diff --git a/resources/assets/styles/base/bootstrap/mixins/hide-text.less b/resources/styles/base/bootstrap/mixins/hide-text.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/hide-text.less rename to resources/styles/base/bootstrap/mixins/hide-text.less diff --git a/resources/assets/styles/base/bootstrap/mixins/image.less b/resources/styles/base/bootstrap/mixins/image.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/image.less rename to resources/styles/base/bootstrap/mixins/image.less diff --git a/resources/assets/styles/base/bootstrap/mixins/labels.less b/resources/styles/base/bootstrap/mixins/labels.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/labels.less rename to resources/styles/base/bootstrap/mixins/labels.less diff --git a/resources/assets/styles/base/bootstrap/mixins/list-group.less b/resources/styles/base/bootstrap/mixins/list-group.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/list-group.less rename to resources/styles/base/bootstrap/mixins/list-group.less diff --git a/resources/assets/styles/base/bootstrap/mixins/nav-divider.less b/resources/styles/base/bootstrap/mixins/nav-divider.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/nav-divider.less rename to resources/styles/base/bootstrap/mixins/nav-divider.less diff --git a/resources/assets/styles/base/bootstrap/mixins/nav-vertical-align.less b/resources/styles/base/bootstrap/mixins/nav-vertical-align.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/nav-vertical-align.less rename to resources/styles/base/bootstrap/mixins/nav-vertical-align.less diff --git a/resources/assets/styles/base/bootstrap/mixins/opacity.less b/resources/styles/base/bootstrap/mixins/opacity.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/opacity.less rename to resources/styles/base/bootstrap/mixins/opacity.less diff --git a/resources/assets/styles/base/bootstrap/mixins/pagination.less b/resources/styles/base/bootstrap/mixins/pagination.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/pagination.less rename to resources/styles/base/bootstrap/mixins/pagination.less diff --git a/resources/assets/styles/base/bootstrap/mixins/panels.less b/resources/styles/base/bootstrap/mixins/panels.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/panels.less rename to resources/styles/base/bootstrap/mixins/panels.less diff --git a/resources/assets/styles/base/bootstrap/mixins/progress-bar.less b/resources/styles/base/bootstrap/mixins/progress-bar.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/progress-bar.less rename to resources/styles/base/bootstrap/mixins/progress-bar.less diff --git a/resources/assets/styles/base/bootstrap/mixins/reset-filter.less b/resources/styles/base/bootstrap/mixins/reset-filter.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/reset-filter.less rename to resources/styles/base/bootstrap/mixins/reset-filter.less diff --git a/resources/assets/styles/base/bootstrap/mixins/reset-text.less b/resources/styles/base/bootstrap/mixins/reset-text.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/reset-text.less rename to resources/styles/base/bootstrap/mixins/reset-text.less diff --git a/resources/assets/styles/base/bootstrap/mixins/resize.less b/resources/styles/base/bootstrap/mixins/resize.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/resize.less rename to resources/styles/base/bootstrap/mixins/resize.less diff --git a/resources/assets/styles/base/bootstrap/mixins/responsive-visibility.less b/resources/styles/base/bootstrap/mixins/responsive-visibility.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/responsive-visibility.less rename to resources/styles/base/bootstrap/mixins/responsive-visibility.less diff --git a/resources/assets/styles/base/bootstrap/mixins/size.less b/resources/styles/base/bootstrap/mixins/size.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/size.less rename to resources/styles/base/bootstrap/mixins/size.less diff --git a/resources/assets/styles/base/bootstrap/mixins/tab-focus.less b/resources/styles/base/bootstrap/mixins/tab-focus.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/tab-focus.less rename to resources/styles/base/bootstrap/mixins/tab-focus.less diff --git a/resources/assets/styles/base/bootstrap/mixins/table-row.less b/resources/styles/base/bootstrap/mixins/table-row.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/table-row.less rename to resources/styles/base/bootstrap/mixins/table-row.less diff --git a/resources/assets/styles/base/bootstrap/mixins/text-emphasis.less b/resources/styles/base/bootstrap/mixins/text-emphasis.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/text-emphasis.less rename to resources/styles/base/bootstrap/mixins/text-emphasis.less diff --git a/resources/assets/styles/base/bootstrap/mixins/text-overflow.less b/resources/styles/base/bootstrap/mixins/text-overflow.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/text-overflow.less rename to resources/styles/base/bootstrap/mixins/text-overflow.less diff --git a/resources/assets/styles/base/bootstrap/mixins/vendor-prefixes.less b/resources/styles/base/bootstrap/mixins/vendor-prefixes.less similarity index 100% rename from resources/assets/styles/base/bootstrap/mixins/vendor-prefixes.less rename to resources/styles/base/bootstrap/mixins/vendor-prefixes.less diff --git a/resources/assets/styles/base/bootstrap/modals.less b/resources/styles/base/bootstrap/modals.less similarity index 100% rename from resources/assets/styles/base/bootstrap/modals.less rename to resources/styles/base/bootstrap/modals.less diff --git a/resources/assets/styles/base/bootstrap/navbar.less b/resources/styles/base/bootstrap/navbar.less similarity index 100% rename from resources/assets/styles/base/bootstrap/navbar.less rename to resources/styles/base/bootstrap/navbar.less diff --git a/resources/assets/styles/base/bootstrap/navs.less b/resources/styles/base/bootstrap/navs.less similarity index 100% rename from resources/assets/styles/base/bootstrap/navs.less rename to resources/styles/base/bootstrap/navs.less diff --git a/resources/assets/styles/base/bootstrap/normalize.less b/resources/styles/base/bootstrap/normalize.less similarity index 100% rename from resources/assets/styles/base/bootstrap/normalize.less rename to resources/styles/base/bootstrap/normalize.less diff --git a/resources/assets/styles/base/bootstrap/pager.less b/resources/styles/base/bootstrap/pager.less similarity index 100% rename from resources/assets/styles/base/bootstrap/pager.less rename to resources/styles/base/bootstrap/pager.less diff --git a/resources/assets/styles/base/bootstrap/pagination.less b/resources/styles/base/bootstrap/pagination.less similarity index 100% rename from resources/assets/styles/base/bootstrap/pagination.less rename to resources/styles/base/bootstrap/pagination.less diff --git a/resources/assets/styles/base/bootstrap/panels.less b/resources/styles/base/bootstrap/panels.less similarity index 100% rename from resources/assets/styles/base/bootstrap/panels.less rename to resources/styles/base/bootstrap/panels.less diff --git a/resources/assets/styles/base/bootstrap/popovers.less b/resources/styles/base/bootstrap/popovers.less similarity index 100% rename from resources/assets/styles/base/bootstrap/popovers.less rename to resources/styles/base/bootstrap/popovers.less diff --git a/resources/assets/styles/base/bootstrap/print.less b/resources/styles/base/bootstrap/print.less similarity index 100% rename from resources/assets/styles/base/bootstrap/print.less rename to resources/styles/base/bootstrap/print.less diff --git a/resources/assets/styles/base/bootstrap/progress-bars.less b/resources/styles/base/bootstrap/progress-bars.less similarity index 100% rename from resources/assets/styles/base/bootstrap/progress-bars.less rename to resources/styles/base/bootstrap/progress-bars.less diff --git a/resources/assets/styles/base/bootstrap/responsive-embed.less b/resources/styles/base/bootstrap/responsive-embed.less similarity index 100% rename from resources/assets/styles/base/bootstrap/responsive-embed.less rename to resources/styles/base/bootstrap/responsive-embed.less diff --git a/resources/assets/styles/base/bootstrap/responsive-utilities.less b/resources/styles/base/bootstrap/responsive-utilities.less similarity index 100% rename from resources/assets/styles/base/bootstrap/responsive-utilities.less rename to resources/styles/base/bootstrap/responsive-utilities.less diff --git a/resources/assets/styles/base/bootstrap/scaffolding.less b/resources/styles/base/bootstrap/scaffolding.less similarity index 100% rename from resources/assets/styles/base/bootstrap/scaffolding.less rename to resources/styles/base/bootstrap/scaffolding.less diff --git a/resources/assets/styles/base/bootstrap/tables.less b/resources/styles/base/bootstrap/tables.less similarity index 100% rename from resources/assets/styles/base/bootstrap/tables.less rename to resources/styles/base/bootstrap/tables.less diff --git a/resources/assets/styles/base/bootstrap/theme.less b/resources/styles/base/bootstrap/theme.less similarity index 100% rename from resources/assets/styles/base/bootstrap/theme.less rename to resources/styles/base/bootstrap/theme.less diff --git a/resources/assets/styles/base/bootstrap/thumbnails.less b/resources/styles/base/bootstrap/thumbnails.less similarity index 100% rename from resources/assets/styles/base/bootstrap/thumbnails.less rename to resources/styles/base/bootstrap/thumbnails.less diff --git a/resources/assets/styles/base/bootstrap/tooltip.less b/resources/styles/base/bootstrap/tooltip.less similarity index 100% rename from resources/assets/styles/base/bootstrap/tooltip.less rename to resources/styles/base/bootstrap/tooltip.less diff --git a/resources/assets/styles/base/bootstrap/type.less b/resources/styles/base/bootstrap/type.less similarity index 100% rename from resources/assets/styles/base/bootstrap/type.less rename to resources/styles/base/bootstrap/type.less diff --git a/resources/assets/styles/base/bootstrap/utilities.less b/resources/styles/base/bootstrap/utilities.less similarity index 100% rename from resources/assets/styles/base/bootstrap/utilities.less rename to resources/styles/base/bootstrap/utilities.less diff --git a/resources/assets/styles/base/bootstrap/variables.less b/resources/styles/base/bootstrap/variables.less similarity index 100% rename from resources/assets/styles/base/bootstrap/variables.less rename to resources/styles/base/bootstrap/variables.less diff --git a/resources/assets/styles/base/bootstrap/wells.less b/resources/styles/base/bootstrap/wells.less similarity index 100% rename from resources/assets/styles/base/bootstrap/wells.less rename to resources/styles/base/bootstrap/wells.less diff --git a/resources/assets/styles/base/colorbox.css b/resources/styles/base/colorbox.css similarity index 100% rename from resources/assets/styles/base/colorbox.css rename to resources/styles/base/colorbox.css diff --git a/resources/assets/styles/base/font-awesome/animated.less b/resources/styles/base/font-awesome/animated.less similarity index 100% rename from resources/assets/styles/base/font-awesome/animated.less rename to resources/styles/base/font-awesome/animated.less diff --git a/resources/assets/styles/base/font-awesome/bordered-pulled.less b/resources/styles/base/font-awesome/bordered-pulled.less similarity index 100% rename from resources/assets/styles/base/font-awesome/bordered-pulled.less rename to resources/styles/base/font-awesome/bordered-pulled.less diff --git a/resources/assets/styles/base/font-awesome/core.less b/resources/styles/base/font-awesome/core.less similarity index 100% rename from resources/assets/styles/base/font-awesome/core.less rename to resources/styles/base/font-awesome/core.less diff --git a/resources/assets/styles/base/font-awesome/fixed-width.less b/resources/styles/base/font-awesome/fixed-width.less similarity index 100% rename from resources/assets/styles/base/font-awesome/fixed-width.less rename to resources/styles/base/font-awesome/fixed-width.less diff --git a/resources/assets/styles/base/font-awesome/font-awesome.less b/resources/styles/base/font-awesome/font-awesome.less similarity index 100% rename from resources/assets/styles/base/font-awesome/font-awesome.less rename to resources/styles/base/font-awesome/font-awesome.less diff --git a/resources/assets/styles/base/font-awesome/icons.less b/resources/styles/base/font-awesome/icons.less similarity index 100% rename from resources/assets/styles/base/font-awesome/icons.less rename to resources/styles/base/font-awesome/icons.less diff --git a/resources/assets/styles/base/font-awesome/larger.less b/resources/styles/base/font-awesome/larger.less similarity index 100% rename from resources/assets/styles/base/font-awesome/larger.less rename to resources/styles/base/font-awesome/larger.less diff --git a/resources/assets/styles/base/font-awesome/list.less b/resources/styles/base/font-awesome/list.less similarity index 100% rename from resources/assets/styles/base/font-awesome/list.less rename to resources/styles/base/font-awesome/list.less diff --git a/resources/assets/styles/base/font-awesome/mixins.less b/resources/styles/base/font-awesome/mixins.less similarity index 100% rename from resources/assets/styles/base/font-awesome/mixins.less rename to resources/styles/base/font-awesome/mixins.less diff --git a/resources/assets/styles/base/font-awesome/path.less b/resources/styles/base/font-awesome/path.less similarity index 100% rename from resources/assets/styles/base/font-awesome/path.less rename to resources/styles/base/font-awesome/path.less diff --git a/resources/assets/styles/base/font-awesome/rotated-flipped.less b/resources/styles/base/font-awesome/rotated-flipped.less similarity index 100% rename from resources/assets/styles/base/font-awesome/rotated-flipped.less rename to resources/styles/base/font-awesome/rotated-flipped.less diff --git a/resources/assets/styles/base/font-awesome/screen-reader.less b/resources/styles/base/font-awesome/screen-reader.less similarity index 100% rename from resources/assets/styles/base/font-awesome/screen-reader.less rename to resources/styles/base/font-awesome/screen-reader.less diff --git a/resources/assets/styles/base/font-awesome/stacked.less b/resources/styles/base/font-awesome/stacked.less similarity index 100% rename from resources/assets/styles/base/font-awesome/stacked.less rename to resources/styles/base/font-awesome/stacked.less diff --git a/resources/assets/styles/base/font-awesome/variables.less b/resources/styles/base/font-awesome/variables.less similarity index 100% rename from resources/assets/styles/base/font-awesome/variables.less rename to resources/styles/base/font-awesome/variables.less diff --git a/resources/assets/styles/base/jquery-ui.css b/resources/styles/base/jquery-ui.css similarity index 100% rename from resources/assets/styles/base/jquery-ui.css rename to resources/styles/base/jquery-ui.css diff --git a/resources/assets/styles/body.less b/resources/styles/body.less similarity index 100% rename from resources/assets/styles/body.less rename to resources/styles/body.less diff --git a/resources/assets/styles/components/components.less b/resources/styles/components/components.less similarity index 100% rename from resources/assets/styles/components/components.less rename to resources/styles/components/components.less diff --git a/resources/assets/styles/components/player.less b/resources/styles/components/player.less similarity index 100% rename from resources/assets/styles/components/player.less rename to resources/styles/components/player.less diff --git a/resources/assets/styles/components/search.less b/resources/styles/components/search.less similarity index 100% rename from resources/assets/styles/components/search.less rename to resources/styles/components/search.less diff --git a/resources/assets/styles/components/track-editor.less b/resources/styles/components/track-editor.less similarity index 100% rename from resources/assets/styles/components/track-editor.less rename to resources/styles/components/track-editor.less diff --git a/resources/assets/styles/components/uploader.less b/resources/styles/components/uploader.less similarity index 100% rename from resources/assets/styles/components/uploader.less rename to resources/styles/components/uploader.less diff --git a/resources/assets/styles/components/user-creator.less b/resources/styles/components/user-creator.less similarity index 100% rename from resources/assets/styles/components/user-creator.less rename to resources/styles/components/user-creator.less diff --git a/resources/assets/styles/content.less b/resources/styles/content.less similarity index 100% rename from resources/assets/styles/content.less rename to resources/styles/content.less diff --git a/resources/assets/styles/dashboard.less b/resources/styles/dashboard.less similarity index 100% rename from resources/assets/styles/dashboard.less rename to resources/styles/dashboard.less diff --git a/resources/assets/styles/embed.less b/resources/styles/embed.less similarity index 100% rename from resources/assets/styles/embed.less rename to resources/styles/embed.less diff --git a/resources/assets/styles/forms.less b/resources/styles/forms.less similarity index 100% rename from resources/assets/styles/forms.less rename to resources/styles/forms.less diff --git a/resources/assets/styles/layout.less b/resources/styles/layout.less similarity index 100% rename from resources/assets/styles/layout.less rename to resources/styles/layout.less diff --git a/resources/assets/styles/mixins.less b/resources/styles/mixins.less similarity index 100% rename from resources/assets/styles/mixins.less rename to resources/styles/mixins.less diff --git a/resources/assets/styles/mobile.less b/resources/styles/mobile.less similarity index 100% rename from resources/assets/styles/mobile.less rename to resources/styles/mobile.less diff --git a/resources/assets/styles/variables.less b/resources/styles/variables.less similarity index 100% rename from resources/assets/styles/variables.less rename to resources/styles/variables.less