Skip to content

Commit

Permalink
Remove Laravolt dependency. Closes #3376
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrooksuk committed Jun 23, 2019
1 parent 066837f commit 8f91f6d
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 344 deletions.
14 changes: 1 addition & 13 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,19 @@
namespace CachetHQ\Cachet\Models;

use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\UserPresenter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use McCool\LaravelAutoPresenter\HasPresenter;

/**
* This is the user model.
*
* @author James Brooks <[email protected]>
*/
class User extends Authenticatable implements HasPresenter
class User extends Authenticatable
{
use Notifiable, ValidatingTrait;

Expand Down Expand Up @@ -211,14 +209,4 @@ public function getHasTwoFactorAttribute()
{
return trim($this->google_2fa_secret) !== '';
}

/**
* Get the presenter class.
*
* @return string
*/
public function getPresenterClass()
{
return UserPresenter::class;
}
}
51 changes: 0 additions & 51 deletions app/Presenters/UserPresenter.php

This file was deleted.

1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"jenssegers/date": "^3.4",
"laravel/framework": "5.7.*",
"laravel/tinker": "^1.0",
"laravolt/avatar": "^2.1",
"mccool/laravel-auto-presenter": "^7.1",
"nexmo/client": "^1.5",
"pragmarx/google2fa": "^0.7.1",
Expand Down
Loading

0 comments on commit 8f91f6d

Please sign in to comment.