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
b586a45d
Commit
b586a45d
authored
Nov 26, 2017
by
Viral Solani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move all User related files in to Users folder
parent
71e026d7
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
8 additions
and
16 deletions
+8
-16
UserController.php
app/Http/Controllers/Backend/Access/User/UserController.php
+4
-12
UserPasswordController.php
...ontrollers/Backend/Access/User/UserPasswordController.php
+1
-1
UserStatusController.php
.../Controllers/Backend/Access/User/UserStatusController.php
+2
-2
DashboardController.php
app/Http/Controllers/Backend/DashboardController.php
+1
-1
change-password.blade.php
...rces/views/backend/access/users/change-password.blade.php
+0
-0
create.blade.php
resources/views/backend/access/users/create.blade.php
+0
-0
deactivated.blade.php
resources/views/backend/access/users/deactivated.blade.php
+0
-0
deleted.blade.php
resources/views/backend/access/users/deleted.blade.php
+0
-0
edit.blade.php
resources/views/backend/access/users/edit.blade.php
+0
-0
index.blade.php
resources/views/backend/access/users/index.blade.php
+0
-0
profile-edit.blade.php
resources/views/backend/access/users/profile-edit.blade.php
+0
-0
show.blade.php
resources/views/backend/access/users/show.blade.php
+0
-0
No files found.
app/Http/Controllers/Backend/Access/User/UserController.php
View file @
b586a45d
...
...
@@ -47,7 +47,7 @@ class UserController extends Controller
*/
public
function
index
(
ManageUserRequest
$request
)
{
return
view
(
'backend.access.index'
);
return
view
(
'backend.access.
users.
index'
);
}
/**
...
...
@@ -57,7 +57,7 @@ class UserController extends Controller
*/
public
function
create
(
CreateUserRequest
$request
)
{
return
view
(
'backend.access.create'
)
->
with
([
return
view
(
'backend.access.
users.
create'
)
->
with
([
'roles'
=>
$this
->
roles
->
getAll
(),
]);
}
...
...
@@ -82,7 +82,7 @@ class UserController extends Controller
*/
public
function
show
(
User
$user
,
ShowUserRequest
$request
)
{
return
view
(
'backend.access.show'
)
return
view
(
'backend.access.
users.
show'
)
->
withUser
(
$user
);
}
...
...
@@ -100,15 +100,7 @@ class UserController extends Controller
ksort
(
$userPermissions
);
ksort
(
$permissions
);
/*return view('backend.access.edit')->with([
'user' => $user,
'userRoles' => $user->roles->pluck('id')->all(),
'roles' => $this->roles->getAll(),
'userPermissions' => $userPermissions,
'permissions' => $permissions
]);*/
return
view
(
'backend.access.edit'
,
compact
(
'userPermissions'
,
'permissions'
))
return
view
(
'backend.access.users.edit'
,
compact
(
'userPermissions'
,
'permissions'
))
->
withUser
(
$user
)
->
withUserRoles
(
$user
->
roles
->
pluck
(
'id'
)
->
all
())
->
withRoles
(
$this
->
roles
->
getAll
());
...
...
app/Http/Controllers/Backend/Access/User/UserPasswordController.php
View file @
b586a45d
...
...
@@ -34,7 +34,7 @@ class UserPasswordController extends Controller
*/
public
function
edit
(
User
$user
,
ManageUserRequest
$request
)
{
return
view
(
'backend.access.change-password'
)
return
view
(
'backend.access.
users.
change-password'
)
->
withUser
(
$user
);
}
...
...
app/Http/Controllers/Backend/Access/User/UserStatusController.php
View file @
b586a45d
...
...
@@ -35,7 +35,7 @@ class UserStatusController extends Controller
*/
public
function
getDeactivated
(
ManageDeactivatedRequest
$request
)
{
return
view
(
'backend.access.deactivated'
);
return
view
(
'backend.access.
users.
deactivated'
);
}
/**
...
...
@@ -45,7 +45,7 @@ class UserStatusController extends Controller
*/
public
function
getDeleted
(
ManageDeletedRequest
$request
)
{
return
view
(
'backend.access.deleted'
);
return
view
(
'backend.access.
users.
deleted'
);
}
/**
...
...
app/Http/Controllers/Backend/DashboardController.php
View file @
b586a45d
...
...
@@ -64,7 +64,7 @@ class DashboardController extends Controller
*/
public
function
editProfile
(
Request
$request
)
{
return
view
(
'backend.access.profile-edit'
)
return
view
(
'backend.access.
users.
profile-edit'
)
->
withLoggedInUser
(
access
()
->
user
());
}
...
...
resources/views/backend/access/change-password.blade.php
→
resources/views/backend/access/
users/
change-password.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/create.blade.php
→
resources/views/backend/access/
users/
create.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/deactivated.blade.php
→
resources/views/backend/access/
users/
deactivated.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/deleted.blade.php
→
resources/views/backend/access/
users/
deleted.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/edit.blade.php
→
resources/views/backend/access/
users/
edit.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/index.blade.php
→
resources/views/backend/access/
users/
index.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/profile-edit.blade.php
→
resources/views/backend/access/
users/
profile-edit.blade.php
100755 → 100644
View file @
b586a45d
File moved
resources/views/backend/access/show.blade.php
→
resources/views/backend/access/
users/
show.blade.php
100755 → 100644
View file @
b586a45d
File moved
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