Skip to content

Commit 78bb94c

Browse files
maab16maab16
committed
Added permission_url_prefix helper and use it on custom.js and User.vue
1 parent 97891e6 commit 78bb94c

File tree

10 files changed

+109
-94
lines changed

10 files changed

+109
-94
lines changed

‎config/permission.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
return [
4-
'prefix' => 'admin',
4+
'prefix' => '/admin',
55
'namespace' => '\CodexShaper\Permission',
66
'controller_namespace' => '\CodexShaper\Permission\Http\Controllers',
77
'models' => [

‎resources/assets/dashboard/js/app.js‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2036,7 +2036,7 @@ __webpack_require__.r(__webpack_exports__);
20362036
//
20372037
//
20382038
/* harmony default export */ __webpack_exports__["default"] = ({
2039-
props: ['addAction', 'editAction'],
2039+
props: ['addAction', 'editAction', 'prefix'],
20402040
data: function data() {
20412041
return {
20422042
users: [],
@@ -2060,7 +2060,8 @@ __webpack_require__.r(__webpack_exports__);
20602060
var _this = this;
20612061

20622062
var parent = this;
2063-
fetch('/admin/users/all').then(function (res) {
2063+
var url = this.prefix + '/users/all';
2064+
fetch(url).then(function (res) {
20642065
return res.json();
20652066
}).then(function (res) {
20662067
_this.destroyDataTables();
@@ -2075,7 +2076,8 @@ __webpack_require__.r(__webpack_exports__);
20752076
fetchRoles: function fetchRoles() {
20762077
var _this2 = this;
20772078

2078-
fetch('/admin/roles/all').then(function (res) {
2079+
var url = this.prefix + '/roles/all';
2080+
fetch(url).then(function (res) {
20792081
return res.json();
20802082
}).then(function (res) {
20812083
_this2.destroyDataTables();
@@ -2085,6 +2087,9 @@ __webpack_require__.r(__webpack_exports__);
20852087
return console.log(err);
20862088
});
20872089
},
2090+
showAddUserModal: function showAddUserModal(event) {
2091+
this.resetForm();
2092+
},
20882093
addUser: function addUser(event) {
20892094
var self = this;
20902095
axios({
@@ -2101,14 +2106,15 @@ __webpack_require__.r(__webpack_exports__);
21012106
editUser: function editUser(event) {
21022107
var id = event.target.getAttribute('data-id');
21032108
var self = this;
2109+
var url = this.prefix + '/user/' + id;
21042110
axios({
21052111
method: 'get',
2106-
url: '/admin/user/edit/' + id,
2112+
url: url,
21072113
responseType: 'json'
21082114
}).then(function (response) {
21092115
// console.log( response.data );
21102116
self.user = response.data.user;
2111-
self.user.checkedRoles = response.data.userRoles;
2117+
self.user.checkedRoles = response.data.checkedRoles;
21122118
});
21132119
},
21142120
updateUser: function updateUser(event) {
@@ -2127,9 +2133,10 @@ __webpack_require__.r(__webpack_exports__);
21272133
viewUser: function viewUser(event) {
21282134
var id = event.target.getAttribute('data-id');
21292135
var parent = this;
2136+
var url = this.prefix + '/user/' + id;
21302137
axios({
21312138
method: 'get',
2132-
url: '/admin/user/' + id,
2139+
url: url,
21332140
responseType: 'json'
21342141
}).then(function (response) {
21352142
// console.log( response.data );
@@ -2138,6 +2145,8 @@ __webpack_require__.r(__webpack_exports__);
21382145
});
21392146
},
21402147
deleteUser: function deleteUser(event) {
2148+
var _this3 = this;
2149+
21412150
event.preventDefault();
21422151
var id = event.target.getAttribute('data-id');
21432152
var self = this;
@@ -2150,9 +2159,10 @@ __webpack_require__.r(__webpack_exports__);
21502159
cancelButtonText: 'No, keep it'
21512160
}).then(function (result) {
21522161
if (result.value) {
2162+
var url = _this3.prefix + '/user/' + id;
21532163
axios({
21542164
method: 'delete',
2155-
url: '/admin/user/delete/' + id
2165+
url: url
21562166
}).then(function (response) {
21572167
// console.log( response.data );
21582168
// self.resetForm();
@@ -40454,7 +40464,27 @@ var render = function() {
4045440464
var _c = _vm._self._c || _h
4045540465
return _c("div", { staticClass: "users-container" }, [
4045640466
_c("div", { staticClass: "card shadow mb-4" }, [
40457-
_vm._m(0),
40467+
_c("div", { staticClass: "card-header py-3" }, [
40468+
_c("h6", { staticClass: "m-0 font-weight-bold text-primary" }, [
40469+
_c(
40470+
"a",
40471+
{
40472+
staticClass: "btn btn-success btn-icon-split",
40473+
attrs: {
40474+
href: "#",
40475+
"data-toggle": "modal",
40476+
"data-target": "#addUserModal"
40477+
},
40478+
on: { click: _vm.showAddUserModal }
40479+
},
40480+
[
40481+
_vm._m(0),
40482+
_vm._v(" "),
40483+
_c("span", { staticClass: "text" }, [_vm._v("Add User")])
40484+
]
40485+
)
40486+
])
40487+
]),
4045840488
_vm._v(" "),
4045940489
_c("div", { staticClass: "card-body" }, [
4046040490
_c("div", { staticClass: "table-responsive" }, [
@@ -41146,27 +41176,8 @@ var staticRenderFns = [
4114641176
var _vm = this
4114741177
var _h = _vm.$createElement
4114841178
var _c = _vm._self._c || _h
41149-
return _c("div", { staticClass: "card-header py-3" }, [
41150-
_c("h6", { staticClass: "m-0 font-weight-bold text-primary" }, [
41151-
_c(
41152-
"a",
41153-
{
41154-
staticClass: "btn btn-success btn-icon-split",
41155-
attrs: {
41156-
href: "#",
41157-
"data-toggle": "modal",
41158-
"data-target": "#addUserModal"
41159-
}
41160-
},
41161-
[
41162-
_c("span", { staticClass: "icon text-white-50" }, [
41163-
_c("i", { staticClass: "fas fa-plus" })
41164-
]),
41165-
_vm._v(" "),
41166-
_c("span", { staticClass: "text" }, [_vm._v("Add User")])
41167-
]
41168-
)
41169-
])
41179+
return _c("span", { staticClass: "icon text-white-50" }, [
41180+
_c("i", { staticClass: "fas fa-plus" })
4117041181
])
4117141182
},
4117241183
function() {
@@ -53697,8 +53708,8 @@ __webpack_require__.r(__webpack_exports__);
5369753708
/*! no static exports found */
5369853709
/***/ (function(module, exports, __webpack_require__) {
5369953710

53700-
__webpack_require__(/*! G:\laravel\dashboard\packages\package\laravel-permission\resources\assets\js\app.js */"./resources/assets/js/app.js");
53701-
module.exports = __webpack_require__(/*! G:\laravel\dashboard\packages\package\laravel-permission\resources\assets\sass\app.scss */"./resources/assets/sass/app.scss");
53711+
__webpack_require__(/*! G:\laravel\packages\package\laravel-permission\resources\assets\js\app.js */"./resources/assets/js/app.js");
53712+
module.exports = __webpack_require__(/*! G:\laravel\packages\package\laravel-permission\resources\assets\sass\app.scss */"./resources/assets/sass/app.scss");
5370253713

5370353714

5370453715
/***/ })

‎resources/assets/dashboard/js/custom.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
if( result.success == true ) {
2222

2323
var viewBtn = '<a href="#" class="view_role btn btn-warning" title="View" data-id="'+result.role.id+'" data-toggle="modal" data-target="#viewRoleModal">View</a> ';
24-
var editBtn = '<a href="#" class="edit_role btn btn-info" data-id="'+result.role.id+'" data-action="/admin/role/'+result.role.id+'" title="Edit" data-toggle="modal" data-target="#editRoleModal">Edit</a> ';
24+
var editBtn = '<a href="#" class="edit_role btn btn-info" data-id="'+result.role.id+'" data-action="'+permission_prefix+'/role/'+result.role.id+'" title="Edit" data-toggle="modal" data-target="#editRoleModal">Edit</a> ';
2525
var deleteBtn = '<a href="#" class="delete_role btn btn-danger" title="Delete" data-id="'+result.role.id+'">Delete</a> ';
2626

2727
$('#role_table').DataTable().row.add([
@@ -36,7 +36,7 @@
3636
}
3737
},
3838
error: function(err){
39-
console.log( err );
39+
// console.log( err );
4040
}
4141
});
4242
});
@@ -48,7 +48,7 @@
4848
// var action = $(this).data('action');
4949

5050
$.ajax({
51-
url: '/admin/role/'+id,
51+
url: permission_prefix+'/role/'+id,
5252
method: 'GET',
5353
dataType: 'json',
5454
data: {
@@ -76,7 +76,7 @@
7676
}
7777
},
7878
error: function( err ){
79-
console.log(err);
79+
// console.log(err);
8080
}
8181
});
8282
});
@@ -95,7 +95,7 @@
9595
'id' : id
9696
},
9797
success: function(result){
98-
console.log( result );
98+
// console.log( result );
9999
if( result.success == true ){
100100
document.getElementById("edit_role_form").reset();
101101
var form = $('#edit_role_form');
@@ -119,7 +119,7 @@
119119
}
120120
},
121121
error: function( err ){
122-
console.log(err);
122+
// console.log(err);
123123
}
124124
});
125125
});
@@ -147,7 +147,7 @@
147147
var row_id = $('#row_'+result.role.id).data("row");
148148

149149
var viewBtn = '<a href="#" class="view_role btn btn-warning" title="View" data-id="'+result.role.id+'" data-toggle="modal" data-target="#viewRoleModal">View</a> ';
150-
var editBtn = '<a href="#" class="edit_role btn btn-info" data-id="'+result.role.id+'" data-action="/admin/role/'+result.role.id+'" title="Edit" data-toggle="modal" data-target="#editRoleModal">Edit</a> ';
150+
var editBtn = '<a href="#" class="edit_role btn btn-info" data-id="'+result.role.id+'" data-action="'+permission_prefix+'/role/'+result.role.id+'" title="Edit" data-toggle="modal" data-target="#editRoleModal">Edit</a> ';
151151
var deleteBtn = '<a href="#" class="delete_role btn btn-danger" title="Delete" data-id="'+result.role.id+'">Delete</a> ';
152152

153153
$('#role_table').DataTable().row(row_id).data([
@@ -162,7 +162,7 @@
162162
}
163163
},
164164
error: function( err ) {
165-
console.log( err );
165+
// console.log( err );
166166
}
167167
});
168168
});
@@ -179,7 +179,7 @@
179179
}).then((result) => {
180180
if (result.value) {
181181
$.ajax({
182-
url: '/admin/role/delete',
182+
url: permission_prefix+'/role',
183183
method: 'POST',
184184
dataType: 'json',
185185
data: {
@@ -188,7 +188,7 @@
188188
'role_id': $(this).data('id'),
189189
},
190190
success: function(result){
191-
console.log( result );
191+
// console.log( result );
192192
if( result.success == true ) {
193193
// console.log( data );
194194
Swal.fire(
@@ -207,7 +207,7 @@
207207
}
208208
},
209209
error: function(err){
210-
console.log( err );
210+
// console.log( err );
211211
}
212212
});
213213
} else if (result.dismiss === Swal.DismissReason.cancel) {
@@ -242,11 +242,11 @@
242242
cache: false,
243243
processData: false,
244244
success: function(result){
245-
console.log( result );
245+
// console.log( result );
246246
if( result.success == true ) {
247247

248248
var viewBtn = '<a href="#" class="view_permission btn btn-warning" title="View" data-id="'+result.permission.id+'" data-toggle="modal" data-target="#viewPermissionModal">View</a> ';
249-
var editBtn = '<a href="#" class="edit_permission btn btn-info" data-id="'+result.permission.id+'" data-action="/admin/permission/'+result.permission.id+'" title="Edit" data-toggle="modal" data-target="#editPermissionModal">Edit</a> ';
249+
var editBtn = '<a href="#" class="edit_permission btn btn-info" data-id="'+result.permission.id+'" data-action="'+permission_prefix+'/permission/'+result.permission.id+'" title="Edit" data-toggle="modal" data-target="#editPermissionModal">Edit</a> ';
250250
var deleteBtn = '<a href="#" class="delete_permission btn btn-danger" title="Delete" data-id="'+result.permission.id+'">Delete</a> ';
251251

252252
$('#permission_table').DataTable().row.add([
@@ -261,7 +261,7 @@
261261
}
262262
},
263263
error: function(err){
264-
console.log( err );
264+
// console.log( err );
265265
}
266266
});
267267
});
@@ -273,14 +273,14 @@
273273
// var action = $(this).data('action');
274274

275275
$.ajax({
276-
url: '/admin/permission/'+id,
276+
url: permission_prefix+'/permission/'+id,
277277
method: 'GET',
278278
dataType: 'json',
279279
data: {
280280
'id' : id
281281
},
282282
success: function(result){
283-
console.log( result );
283+
// console.log( result );
284284
if( result.success == true ){
285285
var form = $('#edit_permission_form');
286286
$("#permission_id").val(id);
@@ -291,7 +291,7 @@
291291
}
292292
},
293293
error: function( err ){
294-
console.log(err);
294+
// console.log(err);
295295
}
296296
});
297297
});
@@ -310,7 +310,7 @@
310310
'id' : id
311311
},
312312
success: function(result){
313-
console.log( result );
313+
// console.log( result );
314314
if( result.success == true ){
315315

316316
document.getElementById("edit_permission_form").reset();
@@ -335,7 +335,7 @@
335335
}
336336
},
337337
error: function( err ){
338-
console.log(err);
338+
// console.log(err);
339339
}
340340
});
341341
});
@@ -358,12 +358,12 @@
358358
cache: false,
359359
processData: false,
360360
success: function( result ){
361-
console.log( result );
361+
// console.log( result );
362362
if( result.success == true ) {
363363
var row_id = $('#row_'+result.permission.id).data("row");
364364

365365
var viewBtn = '<a href="#" class="view_permission btn btn-warning" title="View" data-id="'+result.permission.id+'" data-toggle="modal" data-target="#viewPermissionModal">View</a> ';
366-
var editBtn = '<a href="#" class="edit_permission btn btn-info" data-id="'+result.permission.id+'" data-action="/admin/permission/'+result.permission.id+'" title="Edit" data-toggle="modal" data-target="#editPermissionModal">Edit</a> ';
366+
var editBtn = '<a href="#" class="edit_permission btn btn-info" data-id="'+result.permission.id+'" data-action="'+permission_prefix+'/permission/'+result.permission.id+'" title="Edit" data-toggle="modal" data-target="#editPermissionModal">Edit</a> ';
367367
var deleteBtn = '<a href="#" class="delete_permission btn btn-danger" title="Delete" data-id="'+result.permission.id+'">Delete</a> ';
368368

369369
$('#permission_table').DataTable().row(row_id).data([
@@ -378,7 +378,7 @@
378378
}
379379
},
380380
error: function( err ) {
381-
console.log( err );
381+
// console.log( err );
382382
}
383383
});
384384
});
@@ -395,7 +395,7 @@
395395
}).then((result) => {
396396
if (result.value) {
397397
$.ajax({
398-
url: '/admin/permission/delete',
398+
url: permission_prefix+'/permission',
399399
method: 'POST',
400400
dataType: 'json',
401401
data: {
@@ -404,7 +404,7 @@
404404
'permission_id': $(this).data('id'),
405405
},
406406
success: function(result){
407-
console.log( result );
407+
// console.log( result );
408408
if( result.success == true ) {
409409
// console.log( data );
410410
Swal.fire(
@@ -423,7 +423,7 @@
423423
}
424424
},
425425
error: function(err){
426-
console.log( err );
426+
// console.log( err );
427427
}
428428
});
429429
} else if (result.dismiss === Swal.DismissReason.cancel) {

0 commit comments

Comments
 (0)