Skip to content

Commit ef9f8a7

Browse files
GaneshKanduGaneshKandu
authored
Merge pull request #20 from php-kchat/dev
css js loading issue in "php artisan serve"
2 parents 80a7080 + 3af2120 commit ef9f8a7

File tree

4 files changed

+112
-10
lines changed

4 files changed

+112
-10
lines changed

‎app/Http/Controllers/ConversationsController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ function Conversations(Request $request){
2323
$pages = range(1, $conversations->lastPage());
2424

2525
if($request->role == 'admin'){
26-
return view('common.conversations',compact('conversations','pages'));
26+
return view('admin.conversations',compact('conversations','pages'));
2727
}
2828

29-
return view('common.conversations',compact('conversations','pages'));
29+
return view('user.conversations',compact('conversations','pages'));
3030
}
3131

3232
function delete(Request $request){

‎resources/views/common/conversations.blade.php renamed to ‎resources/views/admin/conversations.blade.php

File renamed without changes.

‎resources/views/common/msg.blade.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
@section('title', 'Message\'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-
<link href="css/emojionearea.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/font-awesome.min.css" rel="stylesheet" />
9+
<link href="/css/emojionearea.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">
13-
<script src="js/kchat.msg.js"></script>
14-
<script src="js/emojionearea.js"></script>
13+
<script src="/js/kchat.msg.js"></script>
14+
<script src="/js/emojionearea.js"></script>
1515
<meta name="conversation" content="{{ $chat }}" />
1616
@endsection
1717

‎resources/views/user/conversations.blade.php

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
@extends('user.master')
2+
3+
@section('title', 'Conversations\'s')
4+
5+
@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>
11+
<link rel="stylesheet" href="//cdn.materialdesignicons.com/3.7.95/css/materialdesignicons.min.css">
12+
@endsection
13+
14+
@section('body')
15+
<div class="col-md-10 pt-3">
16+
<div class="card shadow-sm rounded bg-white mb-3">
17+
<!-- ---------------------------------------------------------------------------- -->
18+
<table class="table"style="width:100%">
19+
<thead>
20+
<tr>
21+
<th></th>
22+
<th></th>
23+
<th></th>
24+
<th>
25+
<select class="pages mb-3 float-right">
26+
@foreach($pages as $page)
27+
<option value="{{ $page }}" >{{ $page }}</option>
28+
@endforeach
29+
</select>
30+
</th>
31+
<th>
32+
<div class="dropdown show">
33+
<a href="#" data-toggle="dropdown" data-display="static">
34+
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal align-middle">
35+
<circle cx="12" cy="12" r="1"></circle>
36+
<circle cx="19" cy="12" r="1"></circle>
37+
<circle cx="5" cy="12" r="1"></circle>
38+
</svg>
39+
</a>
40+
<div class="dropdown-menu dropdown-menu-right">
41+
<a class="dropdown-item" onclick="SelectAll()" >Select All</a>
42+
<a class="dropdown-item" onclick="delete_convos()" >Delete</a>
43+
</div>
44+
</div>
45+
</th>
46+
</tr>
47+
</thead>
48+
<thead>
49+
<tr>
50+
<th>#</th>
51+
<th>Name</th>
52+
<th>Members</th>
53+
<th>Created at</th>
54+
<th>Action</th>
55+
</tr>
56+
</thead>
57+
<tbody id="member_table" >
58+
@foreach($conversations as $conversation)
59+
<tr class="select member" id="{{ $conversation->id }}" >
60+
<td><a href="/messages?chat={{ $conversation->id }}" ><img src="{{ $conversation->photo }}" width="32" height="32" class="rounded-circle my-n1" alt="[Photo]" onerror="this.onerror=null; this.src='/logo/KChat.svg';"/></a></td>
61+
<td><a href="/messages?chat={{ $conversation->id }}" >{{ $conversation->name }}</a></td>
62+
<td>{{ $conversation->members }}</td>
63+
<td class="timestamp" >{{ $conversation->created_at }}</span></td>
64+
<td>
65+
<div class="dropdown show">
66+
<a href="#" data-toggle="dropdown" data-display="static">
67+
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal align-middle">
68+
<circle cx="12" cy="12" r="1"></circle>
69+
<circle cx="19" cy="12" r="1"></circle>
70+
<circle cx="5" cy="12" r="1"></circle>
71+
</svg>
72+
</a>
73+
<div class="dropdown-menu dropdown-menu-right">
74+
<a class="dropdown-item" data-convoid="{{ $conversation->id }}" onclick="delete_convo({{ $conversation->id }});" >Delete</a>
75+
</div>
76+
</div>
77+
</td>
78+
</tr>
79+
@endforeach
80+
</tbody>
81+
<thead>
82+
<tr>
83+
<th></th>
84+
<th></th>
85+
<th></th>
86+
<th></th>
87+
<th>
88+
<select class="pages mb-3 float-right">
89+
@foreach($pages as $page)
90+
<option value="{{ $page }}" >{{ $page }}</option>
91+
@endforeach
92+
</select>
93+
</th>
94+
</tr>
95+
</thead>
96+
</table>
97+
</div>
98+
</div>
99+
@endsection
100+
101+
@section('script')
102+
@endsection

0 commit comments

Comments
 (0)