@@ -2,33 +2,33 @@ |
||
2 | 2 | |
3 | 3 | class ErrorHandler |
4 | 4 | { |
5 | - public function unAuthorized() |
|
6 | - { |
|
7 | - return ['status' => 401, 'message' => 'Please login before any action']; |
|
8 | - } |
|
5 | + public function unAuthorized() |
|
6 | + { |
|
7 | + return ['status' => 401, 'message' => 'Please login before any action']; |
|
8 | + } |
|
9 | 9 | |
10 | - public function loginFailed() |
|
11 | - { |
|
12 | - return ['status' => 400, 'message' => 'Wrong mail or password']; |
|
13 | - } |
|
10 | + public function loginFailed() |
|
11 | + { |
|
12 | + return ['status' => 400, 'message' => 'Wrong mail or password']; |
|
13 | + } |
|
14 | 14 | |
15 | - public function noPermissions() |
|
16 | - { |
|
17 | - return ['status' => 401, 'message' => 'No permissions']; |
|
18 | - } |
|
15 | + public function noPermissions() |
|
16 | + { |
|
17 | + return ['status' => 401, 'message' => 'No permissions']; |
|
18 | + } |
|
19 | 19 | |
20 | - public function cannotCreateSetting() |
|
21 | - { |
|
22 | - return ['status' => 400, 'message' => 'Can\'t create setting']; |
|
23 | - } |
|
20 | + public function cannotCreateSetting() |
|
21 | + { |
|
22 | + return ['status' => 400, 'message' => 'Can\'t create setting']; |
|
23 | + } |
|
24 | 24 | |
25 | - public function cannotUpdateSettingKey() |
|
26 | - { |
|
27 | - return ['status' => 400, 'message' => 'Can\'t update setting key']; |
|
28 | - } |
|
25 | + public function cannotUpdateSettingKey() |
|
26 | + { |
|
27 | + return ['status' => 400, 'message' => 'Can\'t update setting key']; |
|
28 | + } |
|
29 | 29 | |
30 | - public function notFound($text) |
|
31 | - { |
|
32 | - return ['status' => 404, 'message' => 'The requested ' . $text . ' not found']; |
|
33 | - } |
|
30 | + public function notFound($text) |
|
31 | + { |
|
32 | + return ['status' => 404, 'message' => 'The requested ' . $text . ' not found']; |
|
33 | + } |
|
34 | 34 | } |
35 | 35 | \ No newline at end of file |
@@ -29,6 +29,6 @@ |
||
29 | 29 | |
30 | 30 | public function notFound($text) |
31 | 31 | { |
32 | - return ['status' => 404, 'message' => 'The requested ' . $text . ' not found']; |
|
32 | + return ['status' => 404, 'message' => 'The requested '.$text.' not found']; |
|
33 | 33 | } |
34 | 34 | } |
35 | 35 | \ No newline at end of file |
@@ -8,20 +8,20 @@ |
||
8 | 8 | |
9 | 9 | class SettingsController extends BaseApiController |
10 | 10 | { |
11 | - /** |
|
12 | - * The name of the model that is used by the base api controller |
|
13 | - * to preform actions like (add, edit ... etc). |
|
14 | - * @var string |
|
15 | - */ |
|
16 | - protected $model = 'settings'; |
|
11 | + /** |
|
12 | + * The name of the model that is used by the base api controller |
|
13 | + * to preform actions like (add, edit ... etc). |
|
14 | + * @var string |
|
15 | + */ |
|
16 | + protected $model = 'settings'; |
|
17 | 17 | |
18 | - /** |
|
19 | - * The validations rules used by the base api controller |
|
20 | - * to check before add. |
|
21 | - * @var array |
|
22 | - */ |
|
23 | - protected $validationRules = [ |
|
24 | - 'name' => 'required|string|max:100', |
|
25 | - 'value' => 'required|string|max:100' |
|
26 | - ]; |
|
18 | + /** |
|
19 | + * The validations rules used by the base api controller |
|
20 | + * to check before add. |
|
21 | + * @var array |
|
22 | + */ |
|
23 | + protected $validationRules = [ |
|
24 | + 'name' => 'required|string|max:100', |
|
25 | + 'value' => 'required|string|max:100' |
|
26 | + ]; |
|
27 | 27 | } |
@@ -13,14 +13,14 @@ |
||
13 | 13 | * to preform actions like (add, edit ... etc). |
14 | 14 | * @var string |
15 | 15 | */ |
16 | - protected $model = 'settings'; |
|
16 | + protected $model = 'settings'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * The validations rules used by the base api controller |
20 | 20 | * to check before add. |
21 | 21 | * @var array |
22 | 22 | */ |
23 | - protected $validationRules = [ |
|
23 | + protected $validationRules = [ |
|
24 | 24 | 'name' => 'required|string|max:100', |
25 | 25 | 'value' => 'required|string|max:100' |
26 | 26 | ]; |
@@ -13,13 +13,13 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('settings', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->string('value',100); |
|
20 | - $table->softDeletes(); |
|
21 | - $table->timestamps(); |
|
22 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100); |
|
18 | + $table->string('key',100)->unique(); |
|
19 | + $table->string('value',100); |
|
20 | + $table->softDeletes(); |
|
21 | + $table->timestamps(); |
|
22 | + }); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->string('value',100); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('key', 100)->unique(); |
|
19 | + $table->string('value', 100); |
|
20 | 20 | $table->softDeletes(); |
21 | 21 | $table->timestamps(); |
22 | 22 | }); |
@@ -5,40 +5,40 @@ |
||
5 | 5 | |
6 | 6 | class Log extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'logs'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | - |
|
15 | - public function getCreatedAtAttribute($value) |
|
16 | - { |
|
17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | - } |
|
19 | - |
|
20 | - public function getUpdatedAtAttribute($value) |
|
21 | - { |
|
22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | - } |
|
24 | - |
|
25 | - public function getDeletedAtAttribute($value) |
|
26 | - { |
|
27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | - } |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'logs'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | + |
|
15 | + public function getCreatedAtAttribute($value) |
|
16 | + { |
|
17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | + } |
|
19 | + |
|
20 | + public function getUpdatedAtAttribute($value) |
|
21 | + { |
|
22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | + } |
|
24 | + |
|
25 | + public function getDeletedAtAttribute($value) |
|
26 | + { |
|
27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | + } |
|
29 | 29 | |
30 | - public function user() |
|
31 | - { |
|
32 | - return $this->belongsTo('App\Modules\Acl\AclUser'); |
|
33 | - } |
|
34 | - |
|
35 | - public function item() |
|
36 | - { |
|
37 | - return $this->morphTo(); |
|
38 | - } |
|
39 | - |
|
40 | - public static function boot() |
|
41 | - { |
|
42 | - parent::boot(); |
|
43 | - } |
|
30 | + public function user() |
|
31 | + { |
|
32 | + return $this->belongsTo('App\Modules\Acl\AclUser'); |
|
33 | + } |
|
34 | + |
|
35 | + public function item() |
|
36 | + { |
|
37 | + return $this->morphTo(); |
|
38 | + } |
|
39 | + |
|
40 | + public static function boot() |
|
41 | + { |
|
42 | + parent::boot(); |
|
43 | + } |
|
44 | 44 | } |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Log extends Model{ |
|
6 | +class Log extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'logs'; |
@@ -8,9 +8,9 @@ |
||
8 | 8 | class LogsController extends BaseApiController |
9 | 9 | { |
10 | 10 | /** |
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'logs'; |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'logs'; |
|
16 | 16 | } |
@@ -12,5 +12,5 @@ |
||
12 | 12 | * to preform actions like (add, edit ... etc). |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $model = 'logs'; |
|
15 | + protected $model = 'logs'; |
|
16 | 16 | } |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('logs', function (Blueprint $table) { |
|
15 | + Schema::create('logs', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('action',100); |
|
18 | - $table->string('item_name',100); |
|
19 | - $table->string('item_type',100); |
|
17 | + $table->string('action', 100); |
|
18 | + $table->string('item_name', 100); |
|
19 | + $table->string('item_type', 100); |
|
20 | 20 | $table->integer('item_id'); |
21 | 21 | $table->integer('user_id'); |
22 | 22 | $table->softDeletes(); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $table->string('view_name',100); |
19 | 19 | $table->softDeletes(); |
20 | 20 | $table->timestamps(); |
21 | - }); |
|
21 | + }); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -8,30 +8,30 @@ |
||
8 | 8 | class NotificationsController extends BaseApiController |
9 | 9 | { |
10 | 10 | /** |
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'notifications'; |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'notifications'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * Set the notification notified to true. |
|
19 | - * |
|
20 | - * @param integer $id |
|
21 | - * @return \Illuminate\Http\Response |
|
22 | - */ |
|
23 | - public function getNotified($id) |
|
24 | - { |
|
25 | - return \Response::json(\Core::notifications()->notified($id), 200); |
|
26 | - } |
|
17 | + /** |
|
18 | + * Set the notification notified to true. |
|
19 | + * |
|
20 | + * @param integer $id |
|
21 | + * @return \Illuminate\Http\Response |
|
22 | + */ |
|
23 | + public function getNotified($id) |
|
24 | + { |
|
25 | + return \Response::json(\Core::notifications()->notified($id), 200); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Set the notification notified to all. |
|
30 | - * |
|
31 | - * @return \Illuminate\Http\Response |
|
32 | - */ |
|
33 | - public function getNotifyall() |
|
34 | - { |
|
35 | - return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
36 | - } |
|
28 | + /** |
|
29 | + * Set the notification notified to all. |
|
30 | + * |
|
31 | + * @return \Illuminate\Http\Response |
|
32 | + */ |
|
33 | + public function getNotifyall() |
|
34 | + { |
|
35 | + return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
36 | + } |
|
37 | 37 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | * to preform actions like (add, edit ... etc). |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $model = 'notifications'; |
|
15 | + protected $model = 'notifications'; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Set the notification notified to true. |
@@ -15,14 +15,14 @@ |
||
15 | 15 | Schema::create('notifications', function (Blueprint $table) { |
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('name',100); |
18 | - $table->text('description')->nullable(); |
|
18 | + $table->text('description')->nullable(); |
|
19 | 19 | $table->string('item_name',100); |
20 | 20 | $table->string('item_type',100); |
21 | 21 | $table->integer('item_id'); |
22 | 22 | $table->boolean('notified'); |
23 | 23 | $table->softDeletes(); |
24 | 24 | $table->timestamps(); |
25 | - }); |
|
25 | + }); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -12,12 +12,12 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('notifications', function (Blueprint $table) { |
|
15 | + Schema::create('notifications', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
17 | + $table->string('name', 100); |
|
18 | 18 | $table->text('description')->nullable(); |
19 | - $table->string('item_name',100); |
|
20 | - $table->string('item_type',100); |
|
19 | + $table->string('item_name', 100); |
|
20 | + $table->string('item_type', 100); |
|
21 | 21 | $table->integer('item_id'); |
22 | 22 | $table->boolean('notified'); |
23 | 23 | $table->softDeletes(); |
@@ -5,40 +5,40 @@ |
||
5 | 5 | |
6 | 6 | class Notification extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'notifications'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
14 | - |
|
15 | - public function getCreatedAtAttribute($value) |
|
16 | - { |
|
17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | - } |
|
19 | - |
|
20 | - public function getUpdatedAtAttribute($value) |
|
21 | - { |
|
22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | - } |
|
24 | - |
|
25 | - public function getDeletedAtAttribute($value) |
|
26 | - { |
|
27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | - } |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'notifications'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
14 | + |
|
15 | + public function getCreatedAtAttribute($value) |
|
16 | + { |
|
17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
18 | + } |
|
19 | + |
|
20 | + public function getUpdatedAtAttribute($value) |
|
21 | + { |
|
22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
23 | + } |
|
24 | + |
|
25 | + public function getDeletedAtAttribute($value) |
|
26 | + { |
|
27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
28 | + } |
|
29 | 29 | |
30 | - public function item() |
|
31 | - { |
|
32 | - return $this->morphTo(); |
|
33 | - } |
|
34 | - |
|
35 | - public static function boot() |
|
36 | - { |
|
37 | - parent::boot(); |
|
38 | - |
|
39 | - Notification::created(function($notification) |
|
40 | - { |
|
41 | - \Redis::publish('notification', json_encode($notification->toArray())); |
|
42 | - }); |
|
43 | - } |
|
30 | + public function item() |
|
31 | + { |
|
32 | + return $this->morphTo(); |
|
33 | + } |
|
34 | + |
|
35 | + public static function boot() |
|
36 | + { |
|
37 | + parent::boot(); |
|
38 | + |
|
39 | + Notification::created(function($notification) |
|
40 | + { |
|
41 | + \Redis::publish('notification', json_encode($notification->toArray())); |
|
42 | + }); |
|
43 | + } |
|
44 | 44 | } |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Notification extends Model{ |
|
6 | +class Notification extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'notifications'; |