Skip to content

Commit d526f0b

Browse files
GaneshKanduGaneshKandu
committed
assets loading issues resolved
1 parent 4b11b96 commit d526f0b

File tree

9 files changed

+108
-73
lines changed

9 files changed

+108
-73
lines changed

‎app/Http/Kernel.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ class Kernel extends HttpKernel
5555
'GetCounts' => [
5656
Middleware\GetCounts::class,
5757
],
58+
59+
'CheckRole' => [
60+
Middleware\CheckRole::class,
61+
],
5862
];
5963

6064
/**

‎app/Http/Middleware/CheckRole.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
namespace App\Http\Middleware;
4+
5+
use Closure;
6+
use Illuminate\Http\Request;
7+
use Illuminate\Support\Facades\Auth;
8+
9+
class CheckRole
10+
{
11+
/**
12+
* Handle an incoming request.
13+
*
14+
* @param \Illuminate\Http\Request $request
15+
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
16+
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
17+
*/
18+
public function handle(Request $request, Closure $next)
19+
{
20+
$user = Auth::user();
21+
//print_r(Auth()->user()->role);
22+
23+
return $next($request);
24+
}
25+
}

‎database/migrations/2014_10_12_000000_create_users_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public function up()
2525
$table->string('department')->nullable();
2626
$table->string('about')->nullable();
2727
$table->string('photo')->nullable()->default('/logo/KChat.svg');
28+
$table->integer('role')->default(1);
2829
$table->rememberToken();
2930
$table->timestamps();
3031
});

‎resources/views/activities.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@section('title', 'Activitie\'s')
44

55
@section('header')
6-
<link href="css/bootstrap.min.css" rel="stylesheet">
7-
<link href="css/notification.css" rel="stylesheet">
8-
<link href="css/font-awesome.min.css" rel="stylesheet" />
9-
<script src="js/jquery.min.js"></script>
10-
<script src="js/bootstrap.bundle.min.js"></script>
6+
<link href="/css/bootstrap.min.css" rel="stylesheet">
7+
<link href="/css/notification.css" rel="stylesheet">
8+
<link href="/css/font-awesome.min.css" rel="stylesheet" />
9+
<script src="/js/jquery.min.js"></script>
10+
<script src="/js/bootstrap.bundle.min.js"></script>
1111
<link rel="stylesheet" href="//cdn.materialdesignicons.com/3.7.95/css/materialdesignicons.min.css">
12-
<link href="css/kchat.css" rel="stylesheet">
12+
<link href="/css/kchat.css" rel="stylesheet">
1313
@endsection
1414

1515
@section('body')

‎resources/views/activity.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
@section('title', 'Member\'s')
44

55
@section('header')
6-
<link href="css/bootstrap.min.css" rel="stylesheet">
7-
<link href="css/kchat.css" rel="stylesheet">
8-
<link href="css/activity.css" rel="stylesheet">
9-
<link href="css/font-awesome.min.css" rel="stylesheet" />
10-
<script src="js/jquery.min.js"></script>
11-
<script src="js/bootstrap.bundle.min.js"></script>
6+
<link href="/css/bootstrap.min.css" rel="stylesheet">
7+
<link href="/css/kchat.css" rel="stylesheet">
8+
<link href="/css/activity.css" rel="stylesheet">
9+
<link href="/css/font-awesome.min.css" rel="stylesheet" />
10+
<script src="/js/jquery.min.js"></script>
11+
<script src="/js/bootstrap.bundle.min.js"></script>
1212
<link rel="stylesheet" href="//cdn.materialdesignicons.com/3.7.95/css/materialdesignicons.min.css">
1313
@endsection
1414

‎resources/views/dashboard.blade.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@section('title', 'Dashboard')
44

55
@section('header')
6-
<link href="css/bootstrap.min.css" rel="stylesheet">
7-
<link href="css/kchat.css" rel="stylesheet">
8-
<link href="css/dash.css" rel="stylesheet">
9-
<link href="css/font-awesome.min.css" rel="stylesheet" />
10-
<script src="js/jquery.min.js"></script>
11-
<script src="js/bootstrap.bundle.min.js"></script>
12-
<script src="js/chart.js"></script>
6+
<link href="/css/bootstrap.min.css" rel="stylesheet">
7+
<link href="/css/kchat.css" rel="stylesheet">
8+
<link href="/css/dash.css" rel="stylesheet">
9+
<link href="/css/font-awesome.min.css" rel="stylesheet" />
10+
<script src="/js/jquery.min.js"></script>
11+
<script src="/js/bootstrap.bundle.min.js"></script>
12+
<script src="/js/chart.js"></script>
1313
<link rel="stylesheet" href="//cdn.materialdesignicons.com/3.7.95/css/materialdesignicons.min.css">
1414
@endsection
1515

‎resources/views/layouts/master.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</div>
6464
</div>
6565
@yield('script')
66-
<script src="js/kchat.js"></script>
66+
<script src="/js/kchat.js"></script>
6767
@yield('javascript')
6868
</body>
6969
</html>

‎resources/views/settings.blade.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
@section('title', 'Setting\'s')
44

55
@section('header')
6-
<link href="css/bootstrap.min.css" rel="stylesheet">
7-
<link href="css/kchat.css" rel="stylesheet">
8-
<link href="css/font-awesome.min.css" rel="stylesheet" />
9-
<script src="js/jquery.min.js"></script>
10-
<script src="js/bootstrap.bundle.min.js"></script>
6+
<link href="/css/bootstrap.min.css" rel="stylesheet">
7+
<link href="/css/kchat.css" rel="stylesheet">
8+
<link href="/css/font-awesome.min.css" rel="stylesheet" />
9+
<script src="/js/jquery.min.js"></script>
10+
<script src="/js/bootstrap.bundle.min.js"></script>
1111
<link rel="stylesheet" href="//cdn.materialdesignicons.com/3.7.95/css/materialdesignicons.min.css">
1212
@endsection
1313

‎routes/web.php

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -34,57 +34,62 @@
3434
});
3535

3636
Route::group(['middleware' => ['CheckLogin']],function(){
37-
38-
Route::group(['middleware' => ['GetCounts']],function(){
39-
40-
Route::get('/members', [UserController::class, 'members'])->name('Members List');
37+
38+
//Route::group(['middleware' => ['CheckRole']],function(){
39+
//Route::prefix('admin')->name('admin.')->middleware(['CheckRole'])->group(function () {
40+
41+
Route::group(['middleware' => ['GetCounts']],function(){
42+
43+
Route::get('/members', [UserController::class, 'members'])->name('Members List');
4144

42-
Route::get('/activity', [ActivityController::class, 'activity'])->name('Activities');
43-
44-
Route::get('/notification', [NotificationController::class, 'notification'])->name('Notification\'s');
45+
Route::get('/activity', [ActivityController::class, 'activity'])->name('Activities');
46+
47+
Route::get('/notification', [NotificationController::class, 'notification'])->name('Notification\'s');
4548

46-
Route::get('/settings', [SettingController::class, 'Setting'])->name('Setting\'s');
47-
48-
Route::get('/profile', [UserController::class, 'profile'])->name('Profile');
49-
50-
Route::get('/', [DashboardController::class, 'index'])->name('Dashboard');
51-
52-
Route::get('/messages', [MessageController::class, 'messages'])->name('Messages Controller');
53-
54-
});
55-
56-
Route::post('/logout', [AuthController::class, 'logout'])->name('Logout');
57-
58-
Route::post('/members/delete_users', [UserController::class, 'delete_users'])->name('Delete Members');
59-
60-
Route::post('/members/set_inactive_users', [UserController::class, 'set_inactive_users'])->name('Set Inactive Members');
61-
62-
Route::post('/members/set_active_users', [UserController::class, 'set_active_users'])->name('Set Active Members');
63-
64-
Route::post('/members/block_users', [UserController::class, 'block_users'])->name('Block Members');
65-
66-
Route::post('/members/unblock_users', [UserController::class, 'unblock_users'])->name('Unblock Members');
67-
68-
Route::post('/members/newconversation', [UserController::class, 'NewConversation'])->name('New Conversation');
69-
70-
Route::post('/profile', [UserController::class, 'SaveProfile'])->name('Save Profile');
71-
72-
Route::post('/setting/savedpt', [SettingController::class, 'AddDepartment'])->name('Add Department');
73-
74-
Route::post('/setting/timezone', [SettingController::class, 'TimeZone'])->name('TimeZone');
75-
76-
Route::post('/setting/deletedpt', [SettingController::class, 'DeleteDepartment'])->name('Delete Department');
49+
Route::get('/settings', [SettingController::class, 'Setting'])->name('Setting\'s');
50+
51+
Route::get('/profile', [UserController::class, 'profile'])->name('Profile');
52+
53+
Route::get('/', [DashboardController::class, 'index'])->name('Dashboard');
54+
55+
Route::get('/messages', [MessageController::class, 'messages'])->name('Messages Controller');
56+
57+
});
58+
59+
Route::post('/logout', [AuthController::class, 'logout'])->name('Logout');
60+
61+
Route::post('/members/delete_users', [UserController::class, 'delete_users'])->name('Delete Members');
62+
63+
Route::post('/members/set_inactive_users', [UserController::class, 'set_inactive_users'])->name('Set Inactive Members');
64+
65+
Route::post('/members/set_active_users', [UserController::class, 'set_active_users'])->name('Set Active Members');
66+
67+
Route::post('/members/block_users', [UserController::class, 'block_users'])->name('Block Members');
68+
69+
Route::post('/members/unblock_users', [UserController::class, 'unblock_users'])->name('Unblock Members');
70+
71+
Route::post('/members/newconversation', [UserController::class, 'NewConversation'])->name('New Conversation');
72+
73+
Route::post('/profile', [UserController::class, 'SaveProfile'])->name('Save Profile');
74+
75+
Route::post('/setting/savedpt', [SettingController::class, 'AddDepartment'])->name('Add Department');
76+
77+
Route::post('/setting/timezone', [SettingController::class, 'TimeZone'])->name('TimeZone');
78+
79+
Route::post('/setting/deletedpt', [SettingController::class, 'DeleteDepartment'])->name('Delete Department');
7780

78-
Route::post('/activity/delete', [ActivityController::class, 'delete'])->name('Delete Activities');
79-
80-
Route::post('/notification/delete', [NotificationController::class, 'delete'])->name('Delete Notification\'s');
81-
82-
Route::post('/messages', [KchatController::class, 'kchat'])->name('All Json Responses');
83-
84-
Route::post('/messages/update', [MessageController::class, 'UpdateConversation'])->name('Update Conversation');
85-
86-
Route::post('/getConvo', [KchatController::class, 'getConvo'])->name('get Conversations list via search');
81+
Route::post('/activity/delete', [ActivityController::class, 'delete'])->name('Delete Activities');
8782

88-
Route::post('/ajax_members', [UserController::class, 'members_ajax'])->name('Members List on Ajax call');
83+
Route::post('/notification/delete', [NotificationController::class, 'delete'])->name('Delete Notification\'s');
84+
85+
Route::post('/messages', [KchatController::class, 'kchat'])->name('All Json Responses');
86+
87+
Route::post('/messages/update', [MessageController::class, 'UpdateConversation'])->name('Update Conversation');
88+
89+
Route::post('/getConvo', [KchatController::class, 'getConvo'])->name('get Conversations list via search');
90+
91+
Route::post('/ajax_members', [UserController::class, 'members_ajax'])->name('Members List on Ajax call');
8992

93+
//});
94+
9095
});

0 commit comments

Comments
 (0)