@@ -10,32 +10,32 @@ |
||
10 | 10 | class PushNotificationDevice extends Model |
11 | 11 | { |
12 | 12 | |
13 | - use SoftDeletes; |
|
14 | - protected $table = 'push_notification_devices'; |
|
15 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
16 | - protected $hidden = ['deleted_at', 'access_token']; |
|
17 | - protected $guarded = ['id']; |
|
18 | - public $fillable = ['device_token', 'user_id', 'access_token']; |
|
13 | + use SoftDeletes; |
|
14 | + protected $table = 'push_notification_devices'; |
|
15 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
16 | + protected $hidden = ['deleted_at', 'access_token']; |
|
17 | + protected $guarded = ['id']; |
|
18 | + public $fillable = ['device_token', 'user_id', 'access_token']; |
|
19 | 19 | |
20 | - public function user() |
|
21 | - { |
|
22 | - return $this->belongsTo(AclUser::class); |
|
23 | - } |
|
20 | + public function user() |
|
21 | + { |
|
22 | + return $this->belongsTo(AclUser::class); |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * Encrypt the access_token attribute before |
|
27 | - * saving it in the storage. |
|
28 | - * |
|
29 | - * @param string $value |
|
30 | - */ |
|
31 | - public function setLoginTokenAttribute($value) |
|
32 | - { |
|
33 | - $this->attributes['access_token'] = encrypt($value); |
|
34 | - } |
|
25 | + /** |
|
26 | + * Encrypt the access_token attribute before |
|
27 | + * saving it in the storage. |
|
28 | + * |
|
29 | + * @param string $value |
|
30 | + */ |
|
31 | + public function setLoginTokenAttribute($value) |
|
32 | + { |
|
33 | + $this->attributes['access_token'] = encrypt($value); |
|
34 | + } |
|
35 | 35 | |
36 | - public static function boot() |
|
37 | - { |
|
38 | - parent::boot(); |
|
39 | - PushNotificationDevice::observe(PushNotificationDeviceObserver::class); |
|
40 | - } |
|
36 | + public static function boot() |
|
37 | + { |
|
38 | + parent::boot(); |
|
39 | + PushNotificationDevice::observe(PushNotificationDeviceObserver::class); |
|
40 | + } |
|
41 | 41 | } |
@@ -6,64 +6,64 @@ |
||
6 | 6 | |
7 | 7 | class PushNotificationDevicesTableSeeder extends Seeder |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the database seeds. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function run() |
|
15 | - { |
|
16 | - /** |
|
17 | - * Insert the permissions related to settings table. |
|
18 | - */ |
|
19 | - \DB::table('permissions')->insert( |
|
20 | - [ |
|
21 | - /** |
|
22 | - * pushNotificationDevices model permissions. |
|
23 | - */ |
|
24 | - [ |
|
25 | - 'name' => 'index', |
|
26 | - 'model' => 'pushNotificationDevice', |
|
27 | - 'created_at' => \DB::raw('NOW()'), |
|
28 | - 'updated_at' => \DB::raw('NOW()') |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'show', |
|
32 | - 'model' => 'pushNotificationDevice', |
|
33 | - 'created_at' => \DB::raw('NOW()'), |
|
34 | - 'updated_at' => \DB::raw('NOW()') |
|
35 | - ], |
|
36 | - [ |
|
37 | - 'name' => 'store', |
|
38 | - 'model' => 'pushNotificationDevice', |
|
39 | - 'created_at' => \DB::raw('NOW()'), |
|
40 | - 'updated_at' => \DB::raw('NOW()') |
|
41 | - ], |
|
42 | - [ |
|
43 | - 'name' => 'update', |
|
44 | - 'model' => 'pushNotificationDevice', |
|
45 | - 'created_at' => \DB::raw('NOW()'), |
|
46 | - 'updated_at' => \DB::raw('NOW()') |
|
47 | - ], |
|
48 | - [ |
|
49 | - 'name' => 'destroy', |
|
50 | - 'model' => 'pushNotificationDevice', |
|
51 | - 'created_at' => \DB::raw('NOW()'), |
|
52 | - 'updated_at' => \DB::raw('NOW()') |
|
53 | - ], |
|
54 | - [ |
|
55 | - 'name' => 'deleted', |
|
56 | - 'model' => 'pushNotificationDevice', |
|
57 | - 'created_at' => \DB::raw('NOW()'), |
|
58 | - 'updated_at' => \DB::raw('NOW()') |
|
59 | - ], |
|
60 | - [ |
|
61 | - 'name' => 'restore', |
|
62 | - 'model' => 'pushNotificationDevice', |
|
63 | - 'created_at' => \DB::raw('NOW()'), |
|
64 | - 'updated_at' => \DB::raw('NOW()') |
|
65 | - ] |
|
66 | - ] |
|
67 | - ); |
|
68 | - } |
|
9 | + /** |
|
10 | + * Run the database seeds. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function run() |
|
15 | + { |
|
16 | + /** |
|
17 | + * Insert the permissions related to settings table. |
|
18 | + */ |
|
19 | + \DB::table('permissions')->insert( |
|
20 | + [ |
|
21 | + /** |
|
22 | + * pushNotificationDevices model permissions. |
|
23 | + */ |
|
24 | + [ |
|
25 | + 'name' => 'index', |
|
26 | + 'model' => 'pushNotificationDevice', |
|
27 | + 'created_at' => \DB::raw('NOW()'), |
|
28 | + 'updated_at' => \DB::raw('NOW()') |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'show', |
|
32 | + 'model' => 'pushNotificationDevice', |
|
33 | + 'created_at' => \DB::raw('NOW()'), |
|
34 | + 'updated_at' => \DB::raw('NOW()') |
|
35 | + ], |
|
36 | + [ |
|
37 | + 'name' => 'store', |
|
38 | + 'model' => 'pushNotificationDevice', |
|
39 | + 'created_at' => \DB::raw('NOW()'), |
|
40 | + 'updated_at' => \DB::raw('NOW()') |
|
41 | + ], |
|
42 | + [ |
|
43 | + 'name' => 'update', |
|
44 | + 'model' => 'pushNotificationDevice', |
|
45 | + 'created_at' => \DB::raw('NOW()'), |
|
46 | + 'updated_at' => \DB::raw('NOW()') |
|
47 | + ], |
|
48 | + [ |
|
49 | + 'name' => 'destroy', |
|
50 | + 'model' => 'pushNotificationDevice', |
|
51 | + 'created_at' => \DB::raw('NOW()'), |
|
52 | + 'updated_at' => \DB::raw('NOW()') |
|
53 | + ], |
|
54 | + [ |
|
55 | + 'name' => 'deleted', |
|
56 | + 'model' => 'pushNotificationDevice', |
|
57 | + 'created_at' => \DB::raw('NOW()'), |
|
58 | + 'updated_at' => \DB::raw('NOW()') |
|
59 | + ], |
|
60 | + [ |
|
61 | + 'name' => 'restore', |
|
62 | + 'model' => 'pushNotificationDevice', |
|
63 | + 'created_at' => \DB::raw('NOW()'), |
|
64 | + 'updated_at' => \DB::raw('NOW()') |
|
65 | + ] |
|
66 | + ] |
|
67 | + ); |
|
68 | + } |
|
69 | 69 | } |
@@ -8,17 +8,17 @@ |
||
8 | 8 | |
9 | 9 | class OauthClient extends Client |
10 | 10 | { |
11 | - protected $dates = ['created_at', 'updated_at']; |
|
12 | - public $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked']; |
|
11 | + protected $dates = ['created_at', 'updated_at']; |
|
12 | + public $fillable = ['name', 'redirect', 'user_id', 'personal_access_client', 'password_client', 'revoked']; |
|
13 | 13 | |
14 | - public function user() |
|
15 | - { |
|
16 | - return $this->belongsTo(AclUser::class); |
|
17 | - } |
|
14 | + public function user() |
|
15 | + { |
|
16 | + return $this->belongsTo(AclUser::class); |
|
17 | + } |
|
18 | 18 | |
19 | - public static function boot() |
|
20 | - { |
|
21 | - parent::boot(); |
|
22 | - OauthClient::observe(OauthClientObserver::class); |
|
23 | - } |
|
19 | + public static function boot() |
|
20 | + { |
|
21 | + parent::boot(); |
|
22 | + OauthClient::observe(OauthClientObserver::class); |
|
23 | + } |
|
24 | 24 | } |
@@ -8,40 +8,40 @@ |
||
8 | 8 | |
9 | 9 | class SetSessions |
10 | 10 | { |
11 | - protected $app; |
|
12 | - protected $session; |
|
11 | + protected $app; |
|
12 | + protected $session; |
|
13 | 13 | |
14 | - /** |
|
15 | - * Init new object. |
|
16 | - * |
|
17 | - * @param App $app |
|
18 | - * @param Session $session |
|
19 | - * |
|
20 | - * @return void |
|
21 | - */ |
|
22 | - public function __construct(App $app, Session $session) |
|
23 | - { |
|
24 | - $this->app = $app; |
|
25 | - $this->session = $session; |
|
26 | - } |
|
14 | + /** |
|
15 | + * Init new object. |
|
16 | + * |
|
17 | + * @param App $app |
|
18 | + * @param Session $session |
|
19 | + * |
|
20 | + * @return void |
|
21 | + */ |
|
22 | + public function __construct(App $app, Session $session) |
|
23 | + { |
|
24 | + $this->app = $app; |
|
25 | + $this->session = $session; |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Handle an incoming request. |
|
30 | - * |
|
31 | - * @param \Illuminate\Http\Request $request |
|
32 | - * @param \Closure $next |
|
33 | - * @return mixed |
|
34 | - */ |
|
35 | - public function handle($request, Closure $next) |
|
36 | - { |
|
37 | - $locale = $request->header('Accept-Language', 'en'); |
|
38 | - $locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en'; |
|
39 | - $timeZone = $request->header('time-zone', 0); |
|
28 | + /** |
|
29 | + * Handle an incoming request. |
|
30 | + * |
|
31 | + * @param \Illuminate\Http\Request $request |
|
32 | + * @param \Closure $next |
|
33 | + * @return mixed |
|
34 | + */ |
|
35 | + public function handle($request, Closure $next) |
|
36 | + { |
|
37 | + $locale = $request->header('Accept-Language', 'en'); |
|
38 | + $locale = $locale == 'ar' || $locale == 'all' ? $locale : 'en'; |
|
39 | + $timeZone = $request->header('time-zone', 0); |
|
40 | 40 | |
41 | - $this->session->put('time-zone', $timeZone); |
|
42 | - $this->session->put('locale', $locale); |
|
43 | - $this->app->setLocale($locale); |
|
41 | + $this->session->put('time-zone', $timeZone); |
|
42 | + $this->session->put('locale', $locale); |
|
43 | + $this->app->setLocale($locale); |
|
44 | 44 | |
45 | - return $next($request); |
|
46 | - } |
|
45 | + return $next($request); |
|
46 | + } |
|
47 | 47 | } |
@@ -8,39 +8,39 @@ |
||
8 | 8 | |
9 | 9 | class SetRelations |
10 | 10 | { |
11 | - protected $arr; |
|
12 | - protected $route; |
|
11 | + protected $arr; |
|
12 | + protected $route; |
|
13 | 13 | |
14 | - /** |
|
15 | - * Init new object. |
|
16 | - * |
|
17 | - * @param Route $route |
|
18 | - * @param Arr $arr |
|
19 | - * |
|
20 | - * @return void |
|
21 | - */ |
|
22 | - public function __construct(Route $route, Arr $arr) |
|
23 | - { |
|
24 | - $this->arr = $arr; |
|
25 | - $this->route = $route; |
|
26 | - } |
|
14 | + /** |
|
15 | + * Init new object. |
|
16 | + * |
|
17 | + * @param Route $route |
|
18 | + * @param Arr $arr |
|
19 | + * |
|
20 | + * @return void |
|
21 | + */ |
|
22 | + public function __construct(Route $route, Arr $arr) |
|
23 | + { |
|
24 | + $this->arr = $arr; |
|
25 | + $this->route = $route; |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Handle an incoming request. |
|
30 | - * |
|
31 | - * @param \Illuminate\Http\Request $request |
|
32 | - * @param \Closure $next |
|
33 | - * @return mixed |
|
34 | - */ |
|
35 | - public function handle($request, Closure $next) |
|
36 | - { |
|
37 | - $routeActions = explode('@', $this->route->currentRouteAction()); |
|
38 | - $modelName = explode('\\', $routeActions[0]); |
|
39 | - $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
40 | - $route = explode('@', $this->route->currentRouteAction())[1]; |
|
41 | - $relations = $this->arr->get(config('core.relations'), $modelName, false); |
|
42 | - $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : []; |
|
28 | + /** |
|
29 | + * Handle an incoming request. |
|
30 | + * |
|
31 | + * @param \Illuminate\Http\Request $request |
|
32 | + * @param \Closure $next |
|
33 | + * @return mixed |
|
34 | + */ |
|
35 | + public function handle($request, Closure $next) |
|
36 | + { |
|
37 | + $routeActions = explode('@', $this->route->currentRouteAction()); |
|
38 | + $modelName = explode('\\', $routeActions[0]); |
|
39 | + $modelName = lcfirst(str_replace('Controller', '', end($modelName))); |
|
40 | + $route = explode('@', $this->route->currentRouteAction())[1]; |
|
41 | + $relations = $this->arr->get(config('core.relations'), $modelName, false); |
|
42 | + $request->relations = $relations && isset($relations[$route]) ? $relations[$route] : []; |
|
43 | 43 | |
44 | - return $next($request); |
|
45 | - } |
|
44 | + return $next($request); |
|
45 | + } |
|
46 | 46 | } |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * Here goes your error messages. |
|
7 | - */ |
|
8 | - 'connectionError' => 'Connection error', |
|
9 | - 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
10 | - 'dbQueryError' => 'Please check the given inputes', |
|
11 | - 'cannotCreateSetting' => 'Can\'t create setting', |
|
12 | - 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
13 | - 'notFound' => 'The requested :replace not found', |
|
14 | - 'cannotUploadImage' => 'Can\'t upload the given image' |
|
5 | + /** |
|
6 | + * Here goes your error messages. |
|
7 | + */ |
|
8 | + 'connectionError' => 'Connection error', |
|
9 | + 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
10 | + 'dbQueryError' => 'Please check the given inputes', |
|
11 | + 'cannotCreateSetting' => 'Can\'t create setting', |
|
12 | + 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
13 | + 'notFound' => 'The requested :replace not found', |
|
14 | + 'cannotUploadImage' => 'Can\'t upload the given image' |
|
15 | 15 | |
16 | 16 | ]; |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * Here goes your error messages. |
|
7 | - */ |
|
8 | - 'connectionError' => 'خطأ في الاتصال', |
|
9 | - 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
10 | - 'dbQueryError' => 'خطا في البيانات', |
|
11 | - 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
12 | - 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
13 | - 'notFound' => 'ال :replace المطلوب غير موجود', |
|
14 | - 'cannotUploadImage' => 'لا يمكن رفع هذه الصورة' |
|
5 | + /** |
|
6 | + * Here goes your error messages. |
|
7 | + */ |
|
8 | + 'connectionError' => 'خطأ في الاتصال', |
|
9 | + 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
10 | + 'dbQueryError' => 'خطا في البيانات', |
|
11 | + 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
12 | + 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
13 | + 'notFound' => 'ال :replace المطلوب غير موجود', |
|
14 | + 'cannotUploadImage' => 'لا يمكن رفع هذه الصورة' |
|
15 | 15 | |
16 | 16 | ]; |
@@ -9,109 +9,109 @@ |
||
9 | 9 | |
10 | 10 | class BaseApiController extends Controller |
11 | 11 | { |
12 | - /** |
|
13 | - * Array of eager loaded relations. |
|
14 | - * |
|
15 | - * @var array |
|
16 | - */ |
|
17 | - protected $relations; |
|
12 | + /** |
|
13 | + * Array of eager loaded relations. |
|
14 | + * |
|
15 | + * @var array |
|
16 | + */ |
|
17 | + protected $relations; |
|
18 | 18 | |
19 | - /** |
|
20 | - * @var object |
|
21 | - */ |
|
22 | - protected $service; |
|
19 | + /** |
|
20 | + * @var object |
|
21 | + */ |
|
22 | + protected $service; |
|
23 | 23 | |
24 | - /** |
|
25 | - * Path of the model resource. |
|
26 | - * |
|
27 | - * @var string |
|
28 | - */ |
|
29 | - protected $modelResource; |
|
24 | + /** |
|
25 | + * Path of the model resource. |
|
26 | + * |
|
27 | + * @var string |
|
28 | + */ |
|
29 | + protected $modelResource; |
|
30 | 30 | |
31 | - /** |
|
32 | - * Path of the sotre form request. |
|
33 | - * |
|
34 | - * @var string |
|
35 | - */ |
|
36 | - protected $storeFormRequest; |
|
31 | + /** |
|
32 | + * Path of the sotre form request. |
|
33 | + * |
|
34 | + * @var string |
|
35 | + */ |
|
36 | + protected $storeFormRequest; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Init new object. |
|
40 | - * |
|
41 | - * @param mixed $service |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - public function __construct($service) |
|
45 | - { |
|
46 | - $this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository')); |
|
47 | - } |
|
38 | + /** |
|
39 | + * Init new object. |
|
40 | + * |
|
41 | + * @param mixed $service |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public function __construct($service) |
|
45 | + { |
|
46 | + $this->service = new CachingDecorator($service, \App::make('Illuminate\Contracts\Cache\Repository')); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * Fetch all records with relations from storage. |
|
51 | - * |
|
52 | - * @param Request $request |
|
53 | - * @return \Illuminate\Http\Response |
|
54 | - */ |
|
55 | - public function index(Request $request) |
|
56 | - { |
|
57 | - return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed'))); |
|
58 | - } |
|
49 | + /** |
|
50 | + * Fetch all records with relations from storage. |
|
51 | + * |
|
52 | + * @param Request $request |
|
53 | + * @return \Illuminate\Http\Response |
|
54 | + */ |
|
55 | + public function index(Request $request) |
|
56 | + { |
|
57 | + return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed'))); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Fetch the single object with relations from storage. |
|
62 | - * |
|
63 | - * @param Request $request |
|
64 | - * @param integer $id Id of the requested model. |
|
65 | - * @return \Illuminate\Http\Response |
|
66 | - */ |
|
67 | - public function show(Request $request, $id) |
|
68 | - { |
|
69 | - return new $this->modelResource($this->service->find($id, $request->relations)); |
|
70 | - } |
|
60 | + /** |
|
61 | + * Fetch the single object with relations from storage. |
|
62 | + * |
|
63 | + * @param Request $request |
|
64 | + * @param integer $id Id of the requested model. |
|
65 | + * @return \Illuminate\Http\Response |
|
66 | + */ |
|
67 | + public function show(Request $request, $id) |
|
68 | + { |
|
69 | + return new $this->modelResource($this->service->find($id, $request->relations)); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * Insert the given model to storage. |
|
74 | - * |
|
75 | - * @return \Illuminate\Http\Response |
|
76 | - */ |
|
77 | - public function store() |
|
78 | - { |
|
79 | - $data = \App::make($this->storeFormRequest)->validated(); |
|
80 | - return new $this->modelResource($this->service->save($data)); |
|
81 | - } |
|
72 | + /** |
|
73 | + * Insert the given model to storage. |
|
74 | + * |
|
75 | + * @return \Illuminate\Http\Response |
|
76 | + */ |
|
77 | + public function store() |
|
78 | + { |
|
79 | + $data = \App::make($this->storeFormRequest)->validated(); |
|
80 | + return new $this->modelResource($this->service->save($data)); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * Update the given model to storage. |
|
85 | - * |
|
86 | - * @param integer $id |
|
87 | - * @return \Illuminate\Http\Response |
|
88 | - */ |
|
89 | - public function update($id) |
|
90 | - { |
|
91 | - $data = \App::make($this->storeFormRequest)->validated(); |
|
92 | - $data['id'] = $id; |
|
93 | - return new $this->modelResource($this->service->save($data)); |
|
94 | - } |
|
83 | + /** |
|
84 | + * Update the given model to storage. |
|
85 | + * |
|
86 | + * @param integer $id |
|
87 | + * @return \Illuminate\Http\Response |
|
88 | + */ |
|
89 | + public function update($id) |
|
90 | + { |
|
91 | + $data = \App::make($this->storeFormRequest)->validated(); |
|
92 | + $data['id'] = $id; |
|
93 | + return new $this->modelResource($this->service->save($data)); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * Delete by the given id from storage. |
|
98 | - * |
|
99 | - * @param integer $id Id of the deleted model. |
|
100 | - * @return \Illuminate\Http\Response |
|
101 | - */ |
|
102 | - public function destroy($id) |
|
103 | - { |
|
104 | - return new GeneralResource($this->service->delete($id)); |
|
105 | - } |
|
96 | + /** |
|
97 | + * Delete by the given id from storage. |
|
98 | + * |
|
99 | + * @param integer $id Id of the deleted model. |
|
100 | + * @return \Illuminate\Http\Response |
|
101 | + */ |
|
102 | + public function destroy($id) |
|
103 | + { |
|
104 | + return new GeneralResource($this->service->delete($id)); |
|
105 | + } |
|
106 | 106 | |
107 | - /** |
|
108 | - * Restore the deleted model. |
|
109 | - * |
|
110 | - * @param integer $id Id of the restored model. |
|
111 | - * @return \Illuminate\Http\Response |
|
112 | - */ |
|
113 | - public function restore($id) |
|
114 | - { |
|
115 | - return new GeneralResource($this->service->restore($id)); |
|
116 | - } |
|
107 | + /** |
|
108 | + * Restore the deleted model. |
|
109 | + * |
|
110 | + * @param integer $id Id of the restored model. |
|
111 | + * @return \Illuminate\Http\Response |
|
112 | + */ |
|
113 | + public function restore($id) |
|
114 | + { |
|
115 | + return new GeneralResource($this->service->restore($id)); |
|
116 | + } |
|
117 | 117 | } |
@@ -4,70 +4,70 @@ |
||
4 | 4 | |
5 | 5 | class Media |
6 | 6 | { |
7 | - /** |
|
8 | - * Upload the given image. |
|
9 | - * |
|
10 | - * @param object $image |
|
11 | - * @param string $dir |
|
12 | - * @return string |
|
13 | - */ |
|
14 | - public function uploadImage($image, $dir) |
|
15 | - { |
|
16 | - $image = \Image::make($image); |
|
17 | - return $this->saveImage($image, $dir); |
|
18 | - } |
|
7 | + /** |
|
8 | + * Upload the given image. |
|
9 | + * |
|
10 | + * @param object $image |
|
11 | + * @param string $dir |
|
12 | + * @return string |
|
13 | + */ |
|
14 | + public function uploadImage($image, $dir) |
|
15 | + { |
|
16 | + $image = \Image::make($image); |
|
17 | + return $this->saveImage($image, $dir); |
|
18 | + } |
|
19 | 19 | |
20 | - /** |
|
21 | - * Upload the given image. |
|
22 | - * |
|
23 | - * @param object $image |
|
24 | - * @param string $dir |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function uploadImageBas64($image, $dir) |
|
28 | - { |
|
29 | - if (! strlen($image)) { |
|
30 | - return null; |
|
31 | - } |
|
20 | + /** |
|
21 | + * Upload the given image. |
|
22 | + * |
|
23 | + * @param object $image |
|
24 | + * @param string $dir |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function uploadImageBas64($image, $dir) |
|
28 | + { |
|
29 | + if (! strlen($image)) { |
|
30 | + return null; |
|
31 | + } |
|
32 | 32 | |
33 | - if(filter_var($image, FILTER_VALIDATE_URL)) { |
|
34 | - return $image; |
|
35 | - } |
|
33 | + if(filter_var($image, FILTER_VALIDATE_URL)) { |
|
34 | + return $image; |
|
35 | + } |
|
36 | 36 | |
37 | - try { |
|
38 | - $base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image)); |
|
39 | - $image = \Image::make($base); |
|
40 | - } catch (\Exception $e) { |
|
41 | - \Errors::cannotUploadImage(); |
|
42 | - } |
|
37 | + try { |
|
38 | + $base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image)); |
|
39 | + $image = \Image::make($base); |
|
40 | + } catch (\Exception $e) { |
|
41 | + \Errors::cannotUploadImage(); |
|
42 | + } |
|
43 | 43 | |
44 | - return $this->saveImage($image, $dir); |
|
45 | - } |
|
44 | + return $this->saveImage($image, $dir); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Delete the given image. |
|
49 | - * |
|
50 | - * @param object $path |
|
51 | - * @return void |
|
52 | - */ |
|
53 | - public function deleteImage($path) |
|
54 | - { |
|
55 | - \Storage::delete($path); |
|
56 | - } |
|
47 | + /** |
|
48 | + * Delete the given image. |
|
49 | + * |
|
50 | + * @param object $path |
|
51 | + * @return void |
|
52 | + */ |
|
53 | + public function deleteImage($path) |
|
54 | + { |
|
55 | + \Storage::delete($path); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Save the given image. |
|
60 | - * |
|
61 | - * @param object $image |
|
62 | - * @param string $dir |
|
63 | - * @return string |
|
64 | - */ |
|
65 | - protected function saveImage($image, $dir) |
|
66 | - { |
|
67 | - $imageName = 'image'.uniqid().time().'.jpg'; |
|
68 | - $path = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName; |
|
69 | - \Storage::put($path, $image->stream()); |
|
58 | + /** |
|
59 | + * Save the given image. |
|
60 | + * |
|
61 | + * @param object $image |
|
62 | + * @param string $dir |
|
63 | + * @return string |
|
64 | + */ |
|
65 | + protected function saveImage($image, $dir) |
|
66 | + { |
|
67 | + $imageName = 'image'.uniqid().time().'.jpg'; |
|
68 | + $path = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName; |
|
69 | + \Storage::put($path, $image->stream()); |
|
70 | 70 | |
71 | - return $path; |
|
72 | - } |
|
71 | + return $path; |
|
72 | + } |
|
73 | 73 | } |
@@ -26,11 +26,11 @@ |
||
26 | 26 | */ |
27 | 27 | public function uploadImageBas64($image, $dir) |
28 | 28 | { |
29 | - if (! strlen($image)) { |
|
29 | + if ( ! strlen($image)) { |
|
30 | 30 | return null; |
31 | 31 | } |
32 | 32 | |
33 | - if(filter_var($image, FILTER_VALIDATE_URL)) { |
|
33 | + if (filter_var($image, FILTER_VALIDATE_URL)) { |
|
34 | 34 | return $image; |
35 | 35 | } |
36 | 36 |