Replaced Moment with Carbon #84
4 changed files with 32 additions and 9 deletions
|
@ -5,18 +5,41 @@ namespace App\Http\Controllers\API;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Services\Assets\FileUploadService;
|
use App\Services\Assets\FileUploadService;
|
||||||
|
use App\Interfaces\MemberRepositoryInterface;
|
||||||
|
use App\Services\Data\SettingsService;
|
||||||
|
|
||||||
class FileUploadAPIController extends Controller
|
class FileUploadAPIController extends Controller
|
||||||
{
|
{
|
||||||
protected $upload;
|
protected $upload;
|
||||||
|
protected $member;
|
||||||
|
protected $settings;
|
||||||
|
|
||||||
public function __construct(FileUploadService $fileUploadService)
|
public function __construct(
|
||||||
{
|
FileUploadService $fileUploadService,
|
||||||
$this->upload = $fileUploadService;
|
MemberRepositoryInterface $memberRepo,
|
||||||
|
SettingsService $settingsService
|
||||||
|
) {
|
||||||
|
$this->upload = $fileUploadService;
|
||||||
|
$this->member = $memberRepo;
|
||||||
|
$this->settings = $settingsService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function upload(Request $request, $type = null)
|
public function upload(Request $request, $type = null)
|
||||||
{
|
{
|
||||||
return $this->upload->handleFile($request, $type);
|
$result = $this->upload->handleFile($request, $type);
|
||||||
|
//update configs for specfic uploads
|
||||||
|
switch ($request['source']) {
|
||||||
|
case 'avatar-upload':
|
||||||
|
$member = [];
|
||||||
|
$member = session('member');
|
||||||
|
$member['avatar'] = $result['filePath'];
|
||||||
|
$member = (object) $member;
|
||||||
|
$this->member->update($member);
|
||||||
|
break;
|
||||||
|
case 'background-upload':
|
||||||
|
$this->settings->updateGlobalData('background', $result['filePath']);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,10 +54,10 @@ class MemberRepository implements MemberRepositoryInterface
|
||||||
|
|
||||||
public function update($member)
|
public function update($member)
|
||||||
{
|
{
|
||||||
//TODO: need to add member avatar updating
|
|
||||||
$index = findIndex($this->folks, ['id' => $member->id]);
|
$index = findIndex($this->folks, ['id' => $member->id]);
|
||||||
$this->folks[$index]['handle'] = $member->handle;
|
$this->folks[$index]['handle'] = $member->handle;
|
||||||
$this->folks[$index]['email'] = $member->email;
|
$this->folks[$index]['email'] = $member->email;
|
||||||
|
$this->folks[$index]['avatar'] = $member->avatar;
|
||||||
$this->folks[$index]['updated'] = Carbon::now();
|
$this->folks[$index]['updated'] = Carbon::now();
|
||||||
//save new folks file
|
//save new folks file
|
||||||
$this->docs::writeSettings($this->folks, env('FOLKS_PATH'));
|
$this->docs::writeSettings($this->folks, env('FOLKS_PATH'));
|
||||||
|
@ -77,7 +77,7 @@ class MemberRepository implements MemberRepositoryInterface
|
||||||
'handle' => $found['handle'],
|
'handle' => $found['handle'],
|
||||||
'email' => $found['email'],
|
'email' => $found['email'],
|
||||||
'role' => $found['role'],
|
'role' => $found['role'],
|
||||||
'avatar' => $found['avi'],
|
'avatar' => $found['avatar'],
|
||||||
'key' => $found['key'],
|
'key' => $found['key'],
|
||||||
'secret' => $found['secret'],
|
'secret' => $found['secret'],
|
||||||
];
|
];
|
||||||
|
|
|
@ -23,8 +23,8 @@ class FileUploadService
|
||||||
case 'jpg':
|
case 'jpg':
|
||||||
case 'png':
|
case 'png':
|
||||||
case 'gif':
|
case 'gif':
|
||||||
if (isset($options["source"])) {
|
if (isset($request["source"])) {
|
||||||
if ($options["source"] == "avatar-upload") {
|
if ($request["source"] == "avatar-upload") {
|
||||||
$filesPath = '/assets/images/user/' . $path . '/';
|
$filesPath = '/assets/images/user/' . $path . '/';
|
||||||
//Member::updateData('avi', $filesPath . $file->getClientFileName());
|
//Member::updateData('avi', $filesPath . $file->getClientFileName());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
"id": "",
|
"id": "",
|
||||||
"handle": "",
|
"handle": "",
|
||||||
"avi": "/assets/images/global/default-avi.png",
|
"avatar": "/assets/images/global/default-avi.png",
|
||||||
"email": "",
|
"email": "",
|
||||||
"password": "",
|
"password": "",
|
||||||
"key": "",
|
"key": "",
|
||||||
|
|
Loading…
Add table
Reference in a new issue