Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-adminpanel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
laravel-adminpanel
Commits
a4956390
Unverified
Commit
a4956390
authored
Nov 01, 2017
by
Viral Solani
Committed by
GitHub
Nov 01, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18 from viralsolani/analysis-8KJaDA
Apply fixes from StyleCI
parents
0e316be3
ade26d19
Changes
28
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
116 additions
and
115 deletions
+116
-115
BlogsController.php
app/Http/Controllers/Backend/Blogs/BlogsController.php
+1
-1
ResetPasswordController.php
...ttp/Controllers/Frontend/Auth/ResetPasswordController.php
+3
-3
VerifyJWTToken.php
app/Http/Middleware/VerifyJWTToken.php
+1
-1
StoreUserRequest.php
app/Http/Requests/Backend/Access/User/StoreUserRequest.php
+8
-8
UpdateUserRequest.php
app/Http/Requests/Backend/Access/User/UpdateUserRequest.php
+7
-7
StoreFaqsRequest.php
app/Http/Requests/Backend/Faqs/StoreFaqsRequest.php
+5
-5
UpdateFaqsRequest.php
app/Http/Requests/Backend/Faqs/UpdateFaqsRequest.php
+5
-5
StoreModuleRequest.php
app/Http/Requests/Backend/Modules/StoreModuleRequest.php
+5
-5
UpdateSettingsRequest.php
app/Http/Requests/Backend/Settings/UpdateSettingsRequest.php
+6
-6
RegisterRequest.php
app/Http/Requests/Frontend/Auth/RegisterRequest.php
+10
-10
UpdateProfileRequest.php
app/Http/Requests/Frontend/User/UpdateProfileRequest.php
+7
-7
Generator.php
app/Http/Utilities/Generator.php
+23
-23
Notification.php
app/Http/Utilities/Notification.php
+1
-1
SendEmail.php
app/Http/Utilities/SendEmail.php
+1
-1
Permission.php
app/Models/Access/Permission/Permission.php
+2
-2
Role.php
app/Models/Access/Role/Role.php
+4
-4
User.php
app/Models/Access/User/User.php
+6
-6
BlogCategory.php
app/Models/BlogCategories/BlogCategory.php
+2
-2
BlogCategoryAttribute.php
...BlogCategories/Traits/Attribute/BlogCategoryAttribute.php
+1
-1
BlogTag.php
app/Models/BlogTags/BlogTag.php
+2
-2
Blog.php
app/Models/Blogs/Blog.php
+2
-2
CMSPage.php
app/Models/CMSPages/CMSPage.php
+1
-1
EmailTemplate.php
app/Models/EmailTemplates/EmailTemplate.php
+1
-1
Faq.php
app/Models/Faqs/Faq.php
+1
-1
Menu.php
app/Models/Menu/Menu.php
+1
-1
ModelTrait.php
app/Models/ModelTrait.php
+4
-3
PasswordResetRepository.php
app/Repositories/Api/User/PasswordResetRepository.php
+1
-1
UserRepository.php
app/Repositories/Api/User/UserRepository.php
+5
-5
No files found.
app/Http/Controllers/Backend/Blogs/BlogsController.php
View file @
a4956390
...
@@ -155,7 +155,7 @@ class BlogsController extends Controller
...
@@ -155,7 +155,7 @@ class BlogsController extends Controller
if
(
is_numeric
(
$tag
))
{
if
(
is_numeric
(
$tag
))
{
$tags_array
[]
=
$tag
;
$tags_array
[]
=
$tag
;
}
else
{
}
else
{
$newTag
=
BlogTag
::
create
([
'name'
=>
$tag
,
'status'
=>
1
,
'created_by'
=>
1
]);
$newTag
=
BlogTag
::
create
([
'name'
=>
$tag
,
'status'
=>
1
,
'created_by'
=>
1
]);
$tags_array
[]
=
$newTag
->
id
;
$tags_array
[]
=
$newTag
->
id
;
}
}
}
}
...
...
app/Http/Controllers/Frontend/Auth/ResetPasswordController.php
View file @
a4956390
app/Http/Middleware/VerifyJWTToken.php
View file @
a4956390
...
@@ -26,7 +26,7 @@ class VerifyJWTToken
...
@@ -26,7 +26,7 @@ class VerifyJWTToken
}
elseif
(
$e
instanceof
\Tymon\JWTAuth\Exceptions\TokenInvalidException
)
{
}
elseif
(
$e
instanceof
\Tymon\JWTAuth\Exceptions\TokenInvalidException
)
{
return
response
()
->
json
([
'token_invalid'
],
$e
->
getStatusCode
());
return
response
()
->
json
([
'token_invalid'
],
$e
->
getStatusCode
());
}
else
{
}
else
{
return
response
()
->
json
([
'error'
=>
'Token is required'
]);
return
response
()
->
json
([
'error'
=>
'Token is required'
]);
}
}
}
}
...
...
app/Http/Requests/Backend/Access/User/StoreUserRequest.php
View file @
a4956390
app/Http/Requests/Backend/Access/User/UpdateUserRequest.php
View file @
a4956390
app/Http/Requests/Backend/Faqs/StoreFaqsRequest.php
View file @
a4956390
app/Http/Requests/Backend/Faqs/UpdateFaqsRequest.php
View file @
a4956390
app/Http/Requests/Backend/Modules/StoreModuleRequest.php
View file @
a4956390
app/Http/Requests/Backend/Settings/UpdateSettingsRequest.php
View file @
a4956390
app/Http/Requests/Frontend/Auth/RegisterRequest.php
View file @
a4956390
app/Http/Requests/Frontend/User/UpdateProfileRequest.php
View file @
a4956390
app/Http/Utilities/Generator.php
View file @
a4956390
...
@@ -374,7 +374,7 @@ class Generator
...
@@ -374,7 +374,7 @@ class Generator
'editPermission'
=>
$this
->
edit_permission
,
'editPermission'
=>
$this
->
edit_permission
,
'editRoute'
=>
$this
->
edit_route
,
'editRoute'
=>
$this
->
edit_route
,
'deletePermission'
=>
$this
->
delete_permission
,
'deletePermission'
=>
$this
->
delete_permission
,
'deleteRoute'
=>
$this
->
delete_route
'deleteRoute'
=>
$this
->
delete_route
,
],
lcfirst
(
$this
->
attribute_namespace
));
],
lcfirst
(
$this
->
attribute_namespace
));
//Generate Relationship File
//Generate Relationship File
...
...
app/Http/Utilities/Notification.php
View file @
a4956390
...
@@ -101,7 +101,7 @@ abstract class Notification
...
@@ -101,7 +101,7 @@ abstract class Notification
*/
*/
public
function
setOptions
(
array
$options
)
public
function
setOptions
(
array
$options
)
{
{
foreach
(
$options
as
$optionKey
=>
$option
)
{
foreach
(
$options
as
$optionKey
=>
$option
)
{
$methodName
=
'set'
.
ucfirst
(
$optionKey
);
$methodName
=
'set'
.
ucfirst
(
$optionKey
);
$propertyName
=
'_'
.
$optionKey
;
$propertyName
=
'_'
.
$optionKey
;
if
(
method_exists
(
$methodName
,
$this
))
{
if
(
method_exists
(
$methodName
,
$this
))
{
...
...
app/Http/Utilities/SendEmail.php
View file @
a4956390
...
@@ -91,7 +91,7 @@ class SendEmail
...
@@ -91,7 +91,7 @@ class SendEmail
break
;
break
;
}
}
// Send email code
// Send email code
$message
=
[
'data'
=>
$content
];
$message
=
[
'data'
=>
$content
];
return
Mail
::
send
([
'html'
=>
'emails.template'
],
$message
,
function
(
$message
)
use
(
$data
)
{
return
Mail
::
send
([
'html'
=>
'emails.template'
],
$message
,
function
(
$message
)
use
(
$data
)
{
$message
->
to
(
$data
[
'to'
]);
$message
->
to
(
$data
[
'to'
]);
...
...
app/Models/Access/Permission/Permission.php
View file @
a4956390
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
namespace
App\Models\Access\Permission
;
namespace
App\Models\Access\Permission
;
use
App\Models\Access\Permission\Traits\Attribute\PermissionAttribute
;
use
App\Models\Access\Permission\Traits\Relationship\PermissionRelationship
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Access\Permission\Traits\Attribute\PermissionAttribute
;
use
App\Models\Access\Permission\Traits\Relationship\PermissionRelationship
;
/**
/**
* Class Permission.
* Class Permission.
...
...
app/Models/Access/Role/Role.php
View file @
a4956390
...
@@ -2,13 +2,13 @@
...
@@ -2,13 +2,13 @@
namespace
App\Models\Access\Role
;
namespace
App\Models\Access\Role
;
use
App\Models\Access\Role\Traits\Attribute\RoleAttribute
;
use
App\Models\Access\Role\Traits\Relationship\RoleRelationship
;
use
App\Models\Access\Role\Traits\RoleAccess
;
use
App\Models\Access\Role\Traits\Scope\RoleScope
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Access\Role\Traits\RoleAccess
;
use
App\Models\Access\Role\Traits\Scope\RoleScope
;
use
App\Models\Access\Role\Traits\Attribute\RoleAttribute
;
use
App\Models\Access\Role\Traits\Relationship\RoleRelationship
;
/**
/**
* Class Role.
* Class Role.
...
...
app/Models/Access/User/User.php
View file @
a4956390
...
@@ -2,14 +2,14 @@
...
@@ -2,14 +2,14 @@
namespace
App\Models\Access\User
;
namespace
App\Models\Access\User
;
use
Illuminate\Notifications\Notifiable
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Access\User\Traits\UserAccess
;
use
App\Models\Access\User\Traits\Scope\UserScope
;
use
Illuminate\Foundation\Auth\User
as
Authenticatable
;
use
App\Models\Access\User\Traits\UserSendPasswordReset
;
use
App\Models\Access\User\Traits\Attribute\UserAttribute
;
use
App\Models\Access\User\Traits\Attribute\UserAttribute
;
use
App\Models\Access\User\Traits\Relationship\UserRelationship
;
use
App\Models\Access\User\Traits\Relationship\UserRelationship
;
use
App\Models\Access\User\Traits\Scope\UserScope
;
use
App\Models\Access\User\Traits\UserAccess
;
use
App\Models\Access\User\Traits\UserSendPasswordReset
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Foundation\Auth\User
as
Authenticatable
;
use
Illuminate\Notifications\Notifiable
;
/**
/**
* Class User.
* Class User.
...
...
app/Models/BlogCategories/BlogCategory.php
View file @
a4956390
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
namespace
App\Models\BlogCategories
;
namespace
App\Models\BlogCategories
;
use
App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute
;
use
App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute
;
use
App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship
;
class
BlogCategory
extends
Model
class
BlogCategory
extends
Model
{
{
...
...
app/Models/BlogCategories/Traits/Attribute/BlogCategoryAttribute.php
View file @
a4956390
app/Models/BlogTags/BlogTag.php
View file @
a4956390
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
namespace
App\Models\BlogTags
;
namespace
App\Models\BlogTags
;
use
App\Models\BlogTags\Traits\Attribute\BlogTagAttribute
;
use
App\Models\BlogTags\Traits\Relationship\BlogTagRelationship
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\BlogTags\Traits\Attribute\BlogTagAttribute
;
use
App\Models\BlogTags\Traits\Relationship\BlogTagRelationship
;
class
BlogTag
extends
Model
class
BlogTag
extends
Model
{
{
...
...
app/Models/Blogs/Blog.php
View file @
a4956390
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
namespace
App\Models\Blogs
;
namespace
App\Models\Blogs
;
use
App\Models\Blogs\Traits\Attribute\BlogAttribute
;
use
App\Models\Blogs\Traits\Relationship\BlogRelationship
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Blogs\Traits\Attribute\BlogAttribute
;
use
App\Models\Blogs\Traits\Relationship\BlogRelationship
;
class
Blog
extends
Model
class
Blog
extends
Model
{
{
...
...
app/Models/CMSPages/CMSPage.php
View file @
a4956390
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
namespace
App\Models\CMSPages
;
namespace
App\Models\CMSPages
;
use
App\Models\CMSPages\Traits\Attribute\CMSPageAttribute
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\CMSPages\Traits\Attribute\CMSPageAttribute
;
class
CMSPage
extends
Model
class
CMSPage
extends
Model
{
{
...
...
app/Models/EmailTemplates/EmailTemplate.php
View file @
a4956390
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
namespace
App\Models\EmailTemplates
;
namespace
App\Models\EmailTemplates
;
use
App\Models\EmailTemplates\Traits\Attribute\EmailTemplateAttribute
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\EmailTemplates\Traits\Attribute\EmailTemplateAttribute
;
class
EmailTemplate
extends
Model
class
EmailTemplate
extends
Model
{
{
...
...
app/Models/Faqs/Faq.php
View file @
a4956390
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
namespace
App\Models\Faqs
;
namespace
App\Models\Faqs
;
use
App\Models\Faqs\Traits\Attribute\FaqAttribute
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Faqs\Traits\Attribute\FaqAttribute
;
class
Faq
extends
Model
class
Faq
extends
Model
{
{
...
...
app/Models/Menu/Menu.php
View file @
a4956390
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
namespace
App\Models\Menu
;
namespace
App\Models\Menu
;
use
App\Models\Menu\Traits\Attribute\MenuAttribute
;
use
App\Models\ModelTrait
;
use
App\Models\ModelTrait
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
Illuminate\Database\Eloquent\SoftDeletes
;
use
App\Models\Menu\Traits\Attribute\MenuAttribute
;
class
Menu
extends
Model
class
Menu
extends
Model
{
{
...
...
app/Models/ModelTrait.php
View file @
a4956390
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
namespace
App\Models
;
namespace
App\Models
;
trait
ModelTrait
{
trait
ModelTrait
{
/**
/**
* @return string
* @return string
*/
*/
...
...
app/Repositories/Api/User/PasswordResetRepository.php
View file @
a4956390
...
@@ -53,7 +53,7 @@ class PasswordResetRepository extends BaseRepository
...
@@ -53,7 +53,7 @@ class PasswordResetRepository extends BaseRepository
*/
*/
public
function
update
(
$attributes
)
public
function
update
(
$attributes
)
{
{
$token
=
[
'token'
=>
$attributes
[
'token'
]];
$token
=
[
'token'
=>
$attributes
[
'token'
]];
return
$this
->
query
()
->
where
(
'email'
,
$attributes
[
'email'
])
->
update
(
$attributes
);
return
$this
->
query
()
->
where
(
'email'
,
$attributes
[
'email'
])
->
update
(
$attributes
);
}
}
...
...
app/Repositories/Api/User/UserRepository.php
View file @
a4956390
...
@@ -57,7 +57,7 @@ class UserRepository extends BaseRepository
...
@@ -57,7 +57,7 @@ class UserRepository extends BaseRepository
*/
*/
public
function
resetpassword
(
$data
)
public
function
resetpassword
(
$data
)
{
{
$pass
=
[
'password'
=>
bcrypt
(
$data
[
'password'
])];
$pass
=
[
'password'
=>
bcrypt
(
$data
[
'password'
])];
return
$this
->
query
()
->
where
(
'email'
,
$data
[
'email'
])
->
update
(
$pass
);
return
$this
->
query
()
->
where
(
'email'
,
$data
[
'email'
])
->
update
(
$pass
);
}
}
...
@@ -72,13 +72,13 @@ class UserRepository extends BaseRepository
...
@@ -72,13 +72,13 @@ class UserRepository extends BaseRepository
return
$this
->
query
()
return
$this
->
query
()
->
select
(
'first_name'
,
'last_name'
,
'email'
,
'address'
,
'country_id'
,
'state_id'
,
'city_id'
,
'zip_code'
,
'ssn'
,
'status'
,
'created_at'
,
'updated_at'
)
->
select
(
'first_name'
,
'last_name'
,
'email'
,
'address'
,
'country_id'
,
'state_id'
,
'city_id'
,
'zip_code'
,
'ssn'
,
'status'
,
'created_at'
,
'updated_at'
)
->
where
(
'id'
,
$id
)
->
where
(
'id'
,
$id
)
->
with
([
'country'
=>
function
(
$query
)
{
->
with
([
'country'
=>
function
(
$query
)
{
$query
->
select
(
'id'
,
'country'
);
$query
->
select
(
'id'
,
'country'
);
}])
}])
->
with
([
'state'
=>
function
(
$query
)
{
->
with
([
'state'
=>
function
(
$query
)
{
$query
->
select
(
'id'
,
'state'
);
$query
->
select
(
'id'
,
'state'
);
}])
}])
->
with
([
'city'
=>
function
(
$query
)
{
->
with
([
'city'
=>
function
(
$query
)
{
$query
->
select
(
'id'
,
'city'
);
$query
->
select
(
'id'
,
'city'
);
}])
}])
->
get
()
->
get
()
...
@@ -150,7 +150,7 @@ class UserRepository extends BaseRepository
...
@@ -150,7 +150,7 @@ class UserRepository extends BaseRepository
**/
**/
public
function
confirmUser
(
$email
)
public
function
confirmUser
(
$email
)
{
{
$confirmed
=
[
'confirmed'
=>
'1'
];
$confirmed
=
[
'confirmed'
=>
'1'
];
return
$this
->
query
()
->
where
(
'email'
,
$email
)
->
update
(
$confirmed
);
return
$this
->
query
()
->
where
(
'email'
,
$email
)
->
update
(
$confirmed
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment