Merge pull request #17 from lbausch/development

lbausch · web-flow · commit 2f456d326bb8 · 2017-07-04T12:42:02.000+02:00
Version 3.0.2
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,3 @@ npm-debug.log
 ## Development
 _ide_helper.php
 _ide_helper_models.php
-
-## Assets
-/public/assets
diff --git a/.travis.yml b/.travis.yml
@@ -32,8 +32,7 @@ install:
   - php artisan key:generate
   - php artisan migrate --force
   - php artisan passport:install
-  - yarn install --force
-  - yarn run prod
+  - yarn install --check-files
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/app/Api/v1/Controllers/AuthController.php b/app/Api/v1/Controllers/AuthController.php
@@ -2,9 +2,9 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
+use GuzzleHttp\Client;
 use Illuminate\Auth\AuthManager;
 use Illuminate\Http\Request;
-use GuzzleHttp\Client;
 use League\OAuth2\Server\AuthorizationServer;
 
 class AuthController extends Controller
diff --git a/app/Api/v1/Controllers/Controller.php b/app/Api/v1/Controllers/Controller.php
@@ -2,15 +2,15 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
+use Bausch\LaravelCornerstone\Http\Controllers\CornerstoneController;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Routing\ResponseFactory;
-use Illuminate\Http\Request;
-use Bausch\LaravelCornerstone\Http\Controllers\CornerstoneController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use League\Fractal\Resource\Item;
+use Illuminate\Http\Request;
 use League\Fractal\Manager;
-use League\Fractal\Serializer\DataArraySerializer;
 use League\Fractal\Resource\Collection;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\DataArraySerializer;
 use League\Fractal\TransformerAbstract;
 
 abstract class Controller extends CornerstoneController
diff --git a/app/Api/v1/Controllers/GreylistController.php b/app/Api/v1/Controllers/GreylistController.php
@@ -2,12 +2,12 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
-use Illuminate\Database\Connection as Database;
 use Carbon\Carbon;
+use Illuminate\Database\Connection as Database;
 use Illuminate\Http\Request;
-use SQLgreyGUI\Repositories\GreylistRepositoryInterface as Greylisted;
-use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as WhitelistedEmails;
 use SQLgreyGUI\Api\v1\Transformers\GreylistTransformer;
+use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as WhitelistedEmails;
+use SQLgreyGUI\Repositories\GreylistRepositoryInterface as Greylisted;
 
 class GreylistController extends Controller
 {
diff --git a/app/Api/v1/Controllers/OptInController.php b/app/Api/v1/Controllers/OptInController.php
@@ -2,10 +2,10 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
-use SQLgreyGUI\Repositories\OptInEmailRepositoryInterface as Emails;
-use SQLgreyGUI\Repositories\OptInDomainRepositoryInterface as Domains;
-use SQLgreyGUI\Api\v1\Transformers\OptInEmailTransformer as EmailTransformer;
 use SQLgreyGUI\Api\v1\Transformers\OptInDomainTransformer as DomainTransformer;
+use SQLgreyGUI\Api\v1\Transformers\OptInEmailTransformer as EmailTransformer;
+use SQLgreyGUI\Repositories\OptInDomainRepositoryInterface as Domains;
+use SQLgreyGUI\Repositories\OptInEmailRepositoryInterface as Emails;
 
 class OptInController extends OptController
 {
diff --git a/app/Api/v1/Controllers/OptOutController.php b/app/Api/v1/Controllers/OptOutController.php
@@ -2,10 +2,10 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
-use SQLgreyGUI\Repositories\OptOutEmailRepositoryInterface as Emails;
-use SQLgreyGUI\Repositories\OptOutDomainRepositoryInterface as Domains;
-use SQLgreyGUI\Api\v1\Transformers\OptOutEmailTransformer as EmailTransformer;
 use SQLgreyGUI\Api\v1\Transformers\OptOutDomainTransformer as DomainTransformer;
+use SQLgreyGUI\Api\v1\Transformers\OptOutEmailTransformer as EmailTransformer;
+use SQLgreyGUI\Repositories\OptOutDomainRepositoryInterface as Domains;
+use SQLgreyGUI\Repositories\OptOutEmailRepositoryInterface as Emails;
 
 class OptOutController extends OptController
 {
diff --git a/app/Api/v1/Controllers/StatsController.php b/app/Api/v1/Controllers/StatsController.php
@@ -2,13 +2,13 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
-use SQLgreyGUI\Repositories\GreylistRepositoryInterface as Greylist;
-use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as AwlEmail;
 use SQLgreyGUI\Repositories\AwlDomainRepositoryInterface as AwlDomain;
-use SQLgreyGUI\Repositories\OptOutEmailRepositoryInterface as OptOutEmail;
-use SQLgreyGUI\Repositories\OptOutDomainRepositoryInterface as OptOutDomain;
-use SQLgreyGUI\Repositories\OptInEmailRepositoryInterface as OptInEmail;
+use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as AwlEmail;
+use SQLgreyGUI\Repositories\GreylistRepositoryInterface as Greylist;
 use SQLgreyGUI\Repositories\OptInDomainRepositoryInterface as OptInDomain;
+use SQLgreyGUI\Repositories\OptInEmailRepositoryInterface as OptInEmail;
+use SQLgreyGUI\Repositories\OptOutDomainRepositoryInterface as OptOutDomain;
+use SQLgreyGUI\Repositories\OptOutEmailRepositoryInterface as OptOutEmail;
 
 class StatsController extends Controller
 {
diff --git a/app/Api/v1/Controllers/UserController.php b/app/Api/v1/Controllers/UserController.php
@@ -2,13 +2,13 @@
 
 namespace SQLgreyGUI\Api\v1\Controllers;
 
+use Illuminate\Auth\AuthManager;
 use Illuminate\Contracts\Hashing\Hasher;
+use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 use SQLgreyGUI\Api\v1\Exceptions\ValidationException;
 use SQLgreyGUI\Api\v1\Transformers\UserTransformer;
 use SQLgreyGUI\Repositories\UserRepositoryInterface as Users;
-use Illuminate\Auth\AuthManager;
-use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
diff --git a/app/Api/v1/Controllers/WhitelistController.php b/app/Api/v1/Controllers/WhitelistController.php
@@ -7,8 +7,8 @@
 use SQLgreyGUI\Api\v1\Exceptions\ValidationException;
 use SQLgreyGUI\Api\v1\Transformers\WhitelistDomainTransformer;
 use SQLgreyGUI\Api\v1\Transformers\WhitelistEmailTransformer;
-use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as Emails;
 use SQLgreyGUI\Repositories\AwlDomainRepositoryInterface as Domains;
+use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as Emails;
 
 class WhitelistController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Http\Controllers\Auth;
 
-use SQLgreyGUI\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use SQLgreyGUI\Http\Controllers\Controller;
 
 class ForgotPasswordController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -2,9 +2,9 @@
 
 namespace SQLgreyGUI\Http\Controllers\Auth;
 
-use SQLgreyGUI\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
+use SQLgreyGUI\Http\Controllers\Controller;
 
 class LoginController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,10 +2,10 @@
 
 namespace SQLgreyGUI\Http\Controllers\Auth;
 
-use SQLgreyGUI\User;
-use SQLgreyGUI\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Validator;
+use SQLgreyGUI\Http\Controllers\Controller;
+use SQLgreyGUI\User;
 
 class RegisterController extends Controller
 {
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Http\Controllers\Auth;
 
-use SQLgreyGUI\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
+use SQLgreyGUI\Http\Controllers\Controller;
 
 class ResetPasswordController extends Controller
 {
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -2,10 +2,10 @@
 
 namespace SQLgreyGUI\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
@@ -12,6 +12,5 @@ class EncryptCookies extends BaseEncrypter
      * @var array
      */
     protected $except = [
-        //
     ];
 }
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,6 +12,5 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-        //
     ];
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,10 +2,10 @@
 
 namespace SQLgreyGUI\Models;
 
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Carbon\Carbon;
 use Hash;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 use Laravel\Passport\HasApiTokens;
 
 class User extends Authenticatable
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -3,9 +3,9 @@
 namespace SQLgreyGUI\Providers;
 
 use Carbon\Carbon;
-use Laravel\Passport\Passport;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Passport\Passport;
 use SQLgreyGUI\Repositories\UserProviderInterface;
 
 class AuthServiceProvider extends ServiceProvider
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace SQLgreyGUI\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
diff --git a/app/Repositories/OptInDomainRepositoryInterface.php b/app/Repositories/OptInDomainRepositoryInterface.php
@@ -4,5 +4,4 @@
 
 interface OptInDomainRepositoryInterface extends OptDomainRepositoryInterface
 {
-    //
 }
diff --git a/app/Repositories/OptInEmailRepositoryInterface.php b/app/Repositories/OptInEmailRepositoryInterface.php
@@ -4,5 +4,4 @@
 
 interface OptInEmailRepositoryInterface extends OptEmailRepositoryInterface
 {
-    //
 }
diff --git a/app/Repositories/OptOutDomainRepositoryInterface.php b/app/Repositories/OptOutDomainRepositoryInterface.php
@@ -4,5 +4,4 @@
 
 interface OptOutDomainRepositoryInterface extends OptDomainRepositoryInterface
 {
-    //
 }
diff --git a/app/Repositories/OptOutEmailRepositoryInterface.php b/app/Repositories/OptOutEmailRepositoryInterface.php
@@ -4,5 +4,4 @@
 
 interface OptOutEmailRepositoryInterface extends OptEmailRepositoryInterface
 {
-    //
 }
diff --git a/app/Repositories/UserRepositoryInterface.php b/app/Repositories/UserRepositoryInterface.php
@@ -4,5 +4,4 @@
 
 interface UserRepositoryInterface extends BaseRepositoryInterface
 {
-    //
 }
diff --git a/circle.yml b/circle.yml
@@ -23,8 +23,7 @@ general:
 dependencies:
   override:
     - composer install --no-interaction
-    - yarn install --force
-    - yarn run prod
+    - yarn install --check-files --force
 
 test:
   pre:
diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/public/assets/.gitignore b/public/assets/.gitignore
diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
diff --git a/resources/assets/js/components/Footer.vue b/resources/assets/js/components/Footer.vue
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
diff --git a/webpack.mix.js b/webpack.mix.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`use SQLgreyGUI\Api\v1\Exceptions\ValidationException;`
`8`	`8`	`use SQLgreyGUI\Api\v1\Transformers\WhitelistDomainTransformer;`
`9`	`9`	`use SQLgreyGUI\Api\v1\Transformers\WhitelistEmailTransformer;`
`10`		`-use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as Emails;`
`11`	`10`	`use SQLgreyGUI\Repositories\AwlDomainRepositoryInterface as Domains;`
	`11`	`+use SQLgreyGUI\Repositories\AwlEmailRepositoryInterface as Emails;`
`12`	`12`
`13`	`13`	`class WhitelistController extends Controller`
`14`	`14`	`{`