Skip to content

Commit 9af2ed5

Browse files
darryldecodedarryldecode
committed
added info page...
1 parent db92f5a commit 9af2ed5

File tree

6 files changed

+102
-18
lines changed

6 files changed

+102
-18
lines changed

‎src/Darryldecode/Backend/Base/Views/includes/scripts.blade.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@
2727
<script type="text/javascript" src="/darryldecode/backend/vendor/bootstrap-markdown-2.8.0/bootstrap-markdown.js"></script>
2828
<script type="text/javascript" src="/darryldecode/backend/vendor/fancybox/jquery.fancybox.pack.js"></script>
2929
<script type="text/javascript" src="/darryldecode/backend/cb/js/backend.js"></script>
30-
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/directives/angular-boostrap-switch.js"></script>
3130

31+
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/directives/angular-boostrap-switch.js"></script>
3232
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/directives/directives.js"></script>
3333
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/filters/filters.js"></script>
3434
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/services/Services.js"></script>
3535
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/services/AlertService.js"></script>
3636
<script type="text/javascript" src="/darryldecode/backend/cb/app/common/services/GlobalLoaderService.js"></script>
3737

38+
<script type="text/javascript" src="/darryldecode/backend/cb/app/dashboard/dashboard.js"></script>
39+
<script type="text/javascript" src="/darryldecode/backend/cb/app/dashboard/factory.js"></script>
40+
<script type="text/javascript" src="/darryldecode/backend/cb/app/dashboard/controller.info.js"></script>
41+
3842
<script type="text/javascript" src="/darryldecode/backend/cb/app/navigation/navigation.js"></script>
3943
<script type="text/javascript" src="/darryldecode/backend/cb/app/navigation/factory.js"></script>
4044
<script type="text/javascript" src="/darryldecode/backend/cb/app/navigation/controller.manage.js"></script>

‎src/Darryldecode/Backend/Components/Dashboard/Controllers/DashboardController.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,14 @@ public function index()
4141

4242
return view('dashboard::dashboard',compact('widgets'));
4343
}
44+
45+
/**
46+
* Display the about this application info page
47+
*
48+
* @return \Illuminate\View\View
49+
*/
50+
public function info()
51+
{
52+
return view('dashboard::info');
53+
}
4454
}

‎src/Darryldecode/Backend/Components/Dashboard/Views/dashboard.blade.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@
2222
</div>
2323
@endforelse
2424

25+
<div class="text-center">
26+
<small>© Laravel Backend | <a href="{{route('dashboard.info')}}">ABOUT <i class="fa fa-info-circle"></i></a></small>
27+
</div>
2528
@stop

‎src/Darryldecode/Backend/Components/Dashboard/Views/info.blade.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
@extends('backend::layouts.master')
2+
3+
@section('content')
4+
5+
<div class="row" data-ng-controller="DashboardInfoController">
6+
<div class="col-lg-6 col-md-6">
7+
<div class="panel panel-default">
8+
<div class="panel-heading">
9+
<h3 class="panel-title">
10+
<i class="fa fa-info-circle"></i> ABOUT
11+
</h3>
12+
</div>
13+
<div class="panel-body">
14+
<table class="table table-bordered">
15+
<tr>
16+
<td>Version</td>
17+
<td>0.1</td>
18+
</tr>
19+
<tr>
20+
<td>Details</td>
21+
<td>Initial Release.</td>
22+
</tr>
23+
</table>
24+
</div>
25+
</div>
26+
</div>
27+
<div class="col-lg-6 col-md-6">
28+
<div class="panel panel-default">
29+
<div class="panel-heading">
30+
<h3 class="panel-title">
31+
RELEASES:
32+
</h3>
33+
</div>
34+
<div class="panel-body">
35+
some..
36+
</div>
37+
</div>
38+
</div>
39+
</div>
40+
41+
@stop

‎src/Darryldecode/Backend/Components/Dashboard/routes.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@
44
'before' => array(),
55
'as' => 'dashboard',
66
'uses' => 'DashboardController@index'
7+
));
8+
Route::get('/dashboard/info', array(
9+
'before' => array(),
10+
'as' => 'dashboard.info',
11+
'uses' => 'DashboardController@info'
712
));

‎src/Darryldecode/Backend/Components/User/Commands/QueryUsersCommand.php‎

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,15 @@ class QueryUsersCommand extends Command implements SelfHandling {
5959
* @var array
6060
*/
6161
protected $args = array();
62+
/**
63+
* @var int|null
64+
*/
65+
private $id;
6266

6367
/**
6468
* query users by parameters, note that when querying by groupId, with relations is disabled
6569
*
70+
* @param int|null $id
6671
* @param string $firstName
6772
* @param string $lastName
6873
* @param string $email
@@ -74,7 +79,8 @@ class QueryUsersCommand extends Command implements SelfHandling {
7479
* @param int $perPage
7580
* @param bool $disablePermissionChecking
7681
*/
77-
public function __construct($firstName = null,
82+
public function __construct($id = null,
83+
$firstName = null,
7884
$lastName = null,
7985
$email = null,
8086
$groupId = null,
@@ -86,6 +92,7 @@ public function __construct($firstName = null,
8692
$disablePermissionChecking = false)
8793
{
8894
parent::__construct();
95+
$this->id = $id;
8996
$this->firstName = $firstName;
9097
$this->lastName = $lastName;
9198
$this->email = $email;
@@ -121,32 +128,46 @@ public function handle(User $user, Group $group, Dispatcher $dispatcher)
121128

122129
$results = null;
123130

124-
$q = $user->with(array_merge(array('groups'),$this->with))
125-
->ofFirstName($this->firstName)
126-
->ofLastName($this->lastName)
127-
->ofEmail($this->email);
128-
129-
if( ($this->groupId) && ($this->groupId!='') )
131+
// if user ID is provided, we will query it by ID
132+
// no need extra work here..
133+
if( $this->id && ($this->id!='') )
130134
{
131-
$q->whereHas('groups', function($q)
132-
{
133-
$q->where('groups.id',$this->groupId);
134-
});
135-
}
135+
$results = $user->with(array_merge(array('groups'),$this->with))->find($this->id);
136136

137-
if( $this->paginated )
138-
{
139-
$results = $q->paginate($this->perPage);
137+
if(!$results)
138+
{
139+
return new CommandResult(false, "User does not exist.", null, 404);
140+
}
140141
}
141142
else
142143
{
143-
$results = $q->get();
144+
$q = $user->with(array_merge(array('groups'),$this->with))
145+
->ofFirstName($this->firstName)
146+
->ofLastName($this->lastName)
147+
->ofEmail($this->email);
148+
149+
if( ($this->groupId) && ($this->groupId!='') )
150+
{
151+
$q->whereHas('groups', function($q)
152+
{
153+
$q->where('groups.id',$this->groupId);
154+
});
155+
}
156+
157+
if( $this->paginated )
158+
{
159+
$results = $q->paginate($this->perPage);
160+
}
161+
else
162+
{
163+
$results = $q->get();
164+
}
144165
}
145166

146167
// fire after query event
147168
$dispatcher->fire('user.afterQuery', array($results));
148169

149170
// return result
150-
return new CommandResult(true, "Query users successful.", $results, 200);
171+
return new CommandResult(true, "Query user(s) successful.", $results, 200);
151172
}
152173
}

0 commit comments

Comments
 (0)