lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Laravolt dependency. Closes #3376

Browse Source
This commit is contained in:
James Brooks
2019-06-23 16:08:03 +01:00
parent 066837fa71
commit 8f91f6d92f
7 changed files with 89 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Models/User.php
View File

@@ -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 <james@alt-three.com>
*/
class User extends Authenticatable implements HasPresenter
class User extends Authenticatable
{
use Notifiable, ValidatingTrait;
@@ -211,14 +209,4 @@ class User extends Authenticatable implements HasPresenter
{
return trim($this->google_2fa_secret) !== '';
}
/**
* Get the presenter class.
*
* @return string
*/
public function getPresenterClass()
{
return UserPresenter::class;
}
}

51
app/Presenters/UserPresenter.php
View File

@@ -1,51 +0,0 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace CachetHQ\Cachet\Presenters;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Support\Facades\Config;
use Laravolt\Avatar\Facade as Avatar;
use McCool\LaravelAutoPresenter\BasePresenter;
/**
* This is the user presenter class.
*
* @author James Brooks <james@alt-three.com>
*/
class UserPresenter extends BasePresenter implements Arrayable
{
/**
* Returns the users avatar.
*
* @return string
*/
public function avatar()
{
if (Config::get('setting.enable_external_dependencies')) {
return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5(strtolower($this->email)), 200);
}
return Avatar::create($this->username)->toBase64();
}
/**
* Convert the presenter instance to an array.
*
* @return string[]
*/
public function toArray()
{
return array_merge($this->wrappedObject->toArray(), [
'avatar' => $this->avatar(),
]);
}
}

1
composer.json
View File

@@ -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",

348
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "616135d38596e8d3c78ed774082dad7e",
"content-hash": "256b508cf308e596a15b1e4625e3e932",
"packages": [
{
"name": "alt-three/badger",
@@ -358,16 +358,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.100.4",
"version": "3.100.9",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3"
"reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/803f3cdc37f42112c4df1af0a77e25130b9448d3",
"reference": "803f3cdc37f42112c4df1af0a77e25130b9448d3",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/858a3566f6bce79bb6449a9faff45ab3d8f75a3a",
"reference": "858a3566f6bce79bb6449a9faff45ab3d8f75a3a",
"shasum": ""
},
"require": {
@@ -437,7 +437,7 @@
"s3",
"sdk"
],
"time": "2019-06-14T18:12:13+00:00"
"time": "2019-06-21T18:12:55+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -602,62 +602,6 @@
],
"time": "2018-11-02T09:03:50+00:00"
},
{
"name": "danielstjules/stringy",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/danielstjules/Stringy.git",
"reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/danielstjules/Stringy/zipball/df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
"reference": "df24ab62d2d8213bbbe88cc36fc35a4503b4bd7e",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"symfony/polyfill-mbstring": "~1.1"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Stringy\\": "src/"
},
"files": [
"src/Create.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Daniel St. Jules",
"email": "danielst.jules@gmail.com",
"homepage": "http://www.danielstjules.com"
}
],
"description": "A string manipulation library with multibyte support",
"homepage": "https://github.com/danielstjules/Stringy",
"keywords": [
"UTF",
"helpers",
"manipulation",
"methods",
"multibyte",
"string",
"utf-8",
"utility",
"utils"
],
"time": "2017-06-12T01:10:27+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
"version": "0.1",
@@ -991,21 +935,24 @@
},
{
"name": "doctrine/lexer",
"version": "v1.0.1",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/lexer.git",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
"reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "^4.5"
},
"type": "library",
"extra": {
"branch-alias": {
@@ -1013,8 +960,8 @@
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Lexer\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1035,13 +982,16 @@
"email": "schmittjoh@gmail.com"
}
],
"description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "http://www.doctrine-project.org",
"description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
"homepage": "https://www.doctrine-project.org/projects/lexer.html",
"keywords": [
"annotations",
"docblock",
"lexer",
"parser"
"parser",
"php"
],
"time": "2014-09-09T13:34:57+00:00"
"time": "2019-06-08T11:03:04+00:00"
},
{
"name": "dragonmantank/cron-expression",
@@ -1099,16 +1049,16 @@
},
{
"name": "egulias/email-validator",
"version": "2.1.8",
"version": "2.1.9",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "c26463ff9241f27907112fbcd0c86fa670cfef98"
"reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
"reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/128cc721d771ec2c46ce59698f4ca42b73f71b25",
"reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25",
"shasum": ""
},
"require": {
@@ -1152,7 +1102,7 @@
"validation",
"validator"
],
"time": "2019-05-16T22:02:54+00:00"
"time": "2019-06-23T10:14:27+00:00"
},
{
"name": "erusev/parsedown",
@@ -1822,76 +1772,6 @@
],
"time": "2018-12-04T20:46:45+00:00"
},
{
"name": "intervention/image",
"version": "2.4.2",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "e82d274f786e3d4b866a59b173f42e716f0783eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/e82d274f786e3d4b866a59b173f42e716f0783eb",
"reference": "e82d274f786e3d4b866a59b173f42e716f0783eb",
"shasum": ""
},
"require": {
"ext-fileinfo": "*",
"guzzlehttp/psr7": "~1.1",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "~0.9.2",
"phpunit/phpunit": "^4.8 || ^5.7"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
"ext-imagick": "to use Imagick based image processing.",
"intervention/imagecache": "Caching extension for the Intervention Image library"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.4-dev"
},
"laravel": {
"providers": [
"Intervention\\Image\\ImageServiceProvider"
],
"aliases": {
"Image": "Intervention\\Image\\Facades\\Image"
}
}
},
"autoload": {
"psr-4": {
"Intervention\\Image\\": "src/Intervention/Image"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Oliver Vogel",
"email": "oliver@olivervogel.com",
"homepage": "http://olivervogel.com/"
}
],
"description": "Image handling and manipulation library with support for Laravel integration",
"homepage": "http://image.intervention.io/",
"keywords": [
"gd",
"image",
"imagick",
"laravel",
"thumbnail",
"watermark"
],
"time": "2018-05-29T14:19:03+00:00"
},
{
"name": "jakub-onderka/php-console-color",
"version": "v0.2",
@@ -2413,72 +2293,6 @@
],
"time": "2018-10-12T19:39:35+00:00"
},
{
"name": "laravolt/avatar",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/laravolt/avatar.git",
"reference": "58470dbbac0704772d87e775ac60dcd1580f022a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravolt/avatar/zipball/58470dbbac0704772d87e775ac60dcd1580f022a",
"reference": "58470dbbac0704772d87e775ac60dcd1580f022a",
"shasum": ""
},
"require": {
"danielstjules/stringy": "~3.1",
"illuminate/cache": "~5.2",
"illuminate/support": "~5.2",
"intervention/image": "^2.1",
"php": ">=7.0"
},
"require-dev": {
"mockery/mockery": "^0.9.1",
"phpunit/phpunit": "~6.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
},
"laravel": {
"providers": [
"Laravolt\\Avatar\\ServiceProvider"
],
"aliases": {
"Avatar": "Laravolt\\Avatar\\Facade"
}
}
},
"autoload": {
"psr-4": {
"Laravolt\\Avatar\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bayu Hendra Winata",
"email": "uyab.exe@gmail.com",
"homepage": "http://id-laravel.com",
"role": "Developer"
}
],
"description": "Turn name, email, and any other string into initial-based avatar or gravatar.",
"homepage": "https://github.com/laravolt/avatar",
"keywords": [
"avatar",
"gravatar",
"laravel",
"laravolt"
],
"time": "2019-05-24T23:46:54+00:00"
},
{
"name": "lcobucci/jwt",
"version": "3.3.1",
@@ -2605,16 +2419,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.52",
"version": "1.0.53",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "c5a5097156387970e6f0ccfcdf03f752856f3391"
"reference": "08e12b7628f035600634a5e76d95b5eb66cea674"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391",
"reference": "c5a5097156387970e6f0ccfcdf03f752856f3391",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/08e12b7628f035600634a5e76d95b5eb66cea674",
"reference": "08e12b7628f035600634a5e76d95b5eb66cea674",
"shasum": ""
},
"require": {
@@ -2685,7 +2499,7 @@
"sftp",
"storage"
],
"time": "2019-05-20T20:21:14+00:00"
"time": "2019-06-18T20:09:29+00:00"
},
{
"name": "mccool/laravel-auto-presenter",
@@ -4190,16 +4004,16 @@
},
{
"name": "symfony/event-dispatcher-contracts",
"version": "v1.1.1",
"version": "v1.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
"reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69"
"reference": "c61766f4440ca687de1084a5c00b08e167a2575c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8fa2cf2177083dd59cf8e44ea4b6541764fbda69",
"reference": "8fa2cf2177083dd59cf8e44ea4b6541764fbda69",
"url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c",
"reference": "c61766f4440ca687de1084a5c00b08e167a2575c",
"shasum": ""
},
"require": {
@@ -4244,7 +4058,7 @@
"interoperability",
"standards"
],
"time": "2019-05-22T12:23:29+00:00"
"time": "2019-06-20T06:46:26+00:00"
},
{
"name": "symfony/finder",
@@ -4920,23 +4734,23 @@
},
{
"name": "symfony/service-contracts",
"version": "v1.1.2",
"version": "v1.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0"
"reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/191afdcb5804db960d26d8566b7e9a2843cab3a0",
"reference": "191afdcb5804db960d26d8566b7e9a2843cab3a0",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d",
"reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d",
"shasum": ""
},
"require": {
"php": "^7.1.3"
"php": "^7.1.3",
"psr/container": "^1.0"
},
"suggest": {
"psr/container": "",
"symfony/service-implementation": ""
},
"type": "library",
@@ -4974,7 +4788,7 @@
"interoperability",
"standards"
],
"time": "2019-05-28T07:50:59+00:00"
"time": "2019-06-13T11:15:36+00:00"
},
{
"name": "symfony/translation",
@@ -5054,16 +4868,16 @@
},
{
"name": "symfony/translation-contracts",
"version": "v1.1.2",
"version": "v1.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
"reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d"
"reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/93597ce975d91c52ebfaca1253343cd9ccb7916d",
"reference": "93597ce975d91c52ebfaca1253343cd9ccb7916d",
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/cb4b18ad7b92a26e83b65dde940fab78339e6f3c",
"reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c",
"shasum": ""
},
"require": {
@@ -5107,7 +4921,7 @@
"interoperability",
"standards"
],
"time": "2019-05-27T08:16:38+00:00"
"time": "2019-06-13T11:15:36+00:00"
},
{
"name": "symfony/var-dumper",
@@ -5234,16 +5048,16 @@
},
{
"name": "twig/twig",
"version": "v2.11.2",
"version": "v2.11.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "84a463403da1c81afbcedda8f0e788c78bd25a79"
"reference": "699ed2342557c88789a15402de5eb834dedd6792"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/84a463403da1c81afbcedda8f0e788c78bd25a79",
"reference": "84a463403da1c81afbcedda8f0e788c78bd25a79",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792",
"reference": "699ed2342557c88789a15402de5eb834dedd6792",
"shasum": ""
},
"require": {
@@ -5297,7 +5111,7 @@
"keywords": [
"templating"
],
"time": "2019-06-05T11:17:07+00:00"
"time": "2019-06-18T15:37:11+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -5831,16 +5645,16 @@
},
{
"name": "filp/whoops",
"version": "2.3.1",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
"reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
"url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
"reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
"shasum": ""
},
"require": {
@@ -5888,7 +5702,7 @@
"throwable",
"whoops"
],
"time": "2018-10-23T09:00:00+00:00"
"time": "2019-06-23T09:00:00+00:00"
},
{
"name": "fzaninotto/faker",
@@ -6537,16 +6351,16 @@
},
{
"name": "phpspec/prophecy",
"version": "1.8.0",
"version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06"
"reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
"reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
"shasum": ""
},
"require": {
@@ -6567,8 +6381,8 @@
}
},
"autoload": {
"psr-0": {
"Prophecy\\": "src/"
"psr-4": {
"Prophecy\\": "src/Prophecy"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -6596,7 +6410,7 @@
"spy",
"stub"
],
"time": "2018-08-05T17:53:17+00:00"
"time": "2019-06-13T12:50:23+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -6754,16 +6568,16 @@
},
{
"name": "phpunit/php-timer",
"version": "2.1.1",
"version": "2.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
"reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
"reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
"reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
"shasum": ""
},
"require": {
@@ -6799,7 +6613,7 @@
"keywords": [
"timer"
],
"time": "2019-02-20T10:12:59+00:00"
"time": "2019-06-07T04:22:29+00:00"
},
{
"name": "phpunit/php-token-stream",
@@ -6852,16 +6666,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.5.12",
"version": "7.5.13",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c"
"reference": "b9278591caa8630127f96c63b598712b699e671c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c",
"reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b9278591caa8630127f96c63b598712b699e671c",
"reference": "b9278591caa8630127f96c63b598712b699e671c",
"shasum": ""
},
"require": {
@@ -6932,7 +6746,7 @@
"testing",
"xunit"
],
"time": "2019-05-28T11:59:40+00:00"
"time": "2019-06-19T12:01:51+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -7502,16 +7316,16 @@
},
{
"name": "theseer/tokenizer",
"version": "1.1.2",
"version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
"reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
"reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
"shasum": ""
},
"require": {
@@ -7538,7 +7352,7 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"time": "2019-04-04T09:56:43+00:00"
"time": "2019-06-13T22:48:21+00:00"
},
{
"name": "tightenco/mailthief",

1
config/app.php
View File

@@ -185,7 +185,6 @@ return [
GrahamCampbell\Security\SecurityServiceProvider::class,
Jenssegers\Date\DateServiceProvider::class,
Laravel\Tinker\TinkerServiceProvider::class,
Laravolt\Avatar\ServiceProvider::class,
McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class,
PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,

5
resources/views/dashboard/partials/sidebar.blade.php
View File

@@ -2,10 +2,7 @@
<div class="sidebar-inner">
<div class="profile">
<a href="{{ cachet_route('dashboard.user') }}">
<span class="avatar"><img src="{{ $currentUser->avatar }}"></span>
</a>
<a href="{{ cachet_route('dashboard.user') }}">
<h4 class="username">{{ $currentUser->username }}</h4>
<h4 class="username"><i class='ion ion-person'></i> {{ $currentUser->username }}</h4>
</a>
</div>
<div class="clearfix"></div>

13
resources/views/dashboard/team/index.blade.php
View File

@@ -27,13 +27,12 @@
<div class="user-grid">
@foreach($teamMembers as $member)
<div class="user col-sm-3 col-xs-6">
<a href="@if($currentUser->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
<img src="{{ $member->avatar }}">
</a>
<div class="name">{{ $member->username }}</div>
<div class="email">{{ $member->email }}</div>
</div>
<a href="@if($currentUser->id == $member->id) {{ cachet_route('dashboard.team.edit', $member) }} @else /dashboard/team/{{ $member->id }} @endif">
<div class="user col-sm-3 col-xs-6">
<div class="name">{{ $member->username }}</div>
<div class="email">{{ $member->email }}</div>
</div>
</a>
@endforeach
</div>
</div>