Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0bd32aab4a | ||
|
|
444c159ab9 | ||
|
|
55cbe4087c | ||
|
|
ac867a2526 | ||
|
|
b0fcdaa375 | ||
|
|
55d369df47 | ||
|
|
c5413d5b50 | ||
|
|
8bafc735c4 | ||
|
|
1bfd5609a5 | ||
|
|
602fc14760 | ||
|
|
eb6ebd635e |
@@ -10,13 +10,18 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"igaster/laravel-theme": "2.0.6",
|
||||
"orchestra/asset": "^3.6"
|
||||
},
|
||||
"require-dev": {
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Leenooks\\": "src"
|
||||
}
|
||||
},
|
||||
"files": [
|
||||
"src/helpers.php"
|
||||
]
|
||||
},
|
||||
"extra": {
|
||||
"laravel": {
|
||||
|
||||
6
readme.md
Normal file
6
readme.md
Normal file
@@ -0,0 +1,6 @@
|
||||
* User Switch
|
||||
Add the following routes
|
||||
```
|
||||
Route::get( 'admin/switch/start/{id}', 'UserController@user_switch_start' );
|
||||
Route::get( 'admin/switch/stop', 'UserController@user_switch_stop' );
|
||||
```
|
||||
@@ -136,4 +136,5 @@ return [
|
||||
'loggedin' => 'Logged in!',
|
||||
'entering' => 'Entering...',
|
||||
'registered' => 'User Registered!',
|
||||
'switchoff' => 'Switch Back',
|
||||
];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<div id="app" v-cloak>
|
||||
<div class="register-box">
|
||||
<div class="register-logo">
|
||||
<a href="{{ url('/home') }}"><b>Pipeline</b>Management</a>
|
||||
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||
</div>
|
||||
|
||||
@if (count($errors) > 0)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
@include('adminlte::layouts.partials.htmlheader')
|
||||
@show
|
||||
|
||||
<body class="fixed skin-blue sidebar-mini">
|
||||
<body class="fixed hold-transition skin-blue sidebar-mini">
|
||||
<div id="app" v-cloak>
|
||||
<div class="wrapper">
|
||||
@include('adminlte::layouts.partials.mainheader')
|
||||
@@ -36,6 +36,9 @@
|
||||
@include('adminlte::layouts.partials.scripts')
|
||||
{{-- Scripts --}}
|
||||
{!! Asset::scripts() !!}
|
||||
|
||||
@yield('page-scripts')
|
||||
@show
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,5 +1,5 @@
|
||||
<!-- Main Footer -->
|
||||
<footer class="main-footer">
|
||||
<footer class="main-footer no-print">
|
||||
<!-- To the right -->
|
||||
<div class="pull-right hidden-xs">
|
||||
<a href="#"></a><b>{{ config('app.name') }}</b></a>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here') </title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
|
||||
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
@@ -14,6 +15,10 @@
|
||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<style>
|
||||
body { color: #333; }
|
||||
</style>
|
||||
|
||||
<script>
|
||||
//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
|
||||
window.trans =
|
||||
@@ -29,12 +34,6 @@
|
||||
echo json_encode($trans);
|
||||
@endphp
|
||||
</script>
|
||||
<script src="https://code.highcharts.com/highcharts.js"></script>
|
||||
<style>
|
||||
#favourite.selected {
|
||||
color: orange;
|
||||
}
|
||||
</style>
|
||||
|
||||
<!-- STYLESHEETS -->
|
||||
{!! Asset::styles() !!}
|
||||
|
||||
@@ -42,7 +42,10 @@
|
||||
</li>
|
||||
@endif
|
||||
|
||||
<li class="dropdown user user-menu" id="user_menu">
|
||||
<!-- Top Menu Items -->
|
||||
@include('adminlte::layouts.partials.topmenu')
|
||||
|
||||
<li class="dropdown user user-menu @if($user->switched) bg-red @endif" id="user_menu">
|
||||
<!-- Menu Toggle Button -->
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||
<!-- The user image in the navbar-->
|
||||
@@ -66,16 +69,22 @@
|
||||
</div>
|
||||
|
||||
<div class="pull-right">
|
||||
<a href="{{ url('/logout') }}" class="btn btn-default btn-flat" id="logout"
|
||||
onclick="event.preventDefault();
|
||||
document.getElementById('logout-form').submit();">
|
||||
{{ trans('adminlte_lang::message.signout') }}
|
||||
</a>
|
||||
@if ($user->switched)
|
||||
<a href="{{ url('/admin/switch/stop') }}" class="btn btn-default btn-flat" id="switch">
|
||||
{{ trans('adminlte_lang::message.switchoff') }}
|
||||
</a>
|
||||
@else
|
||||
<a href="{{ url('/logout') }}" class="btn btn-default btn-flat" id="logout"
|
||||
onclick="event.preventDefault();
|
||||
document.getElementById('logout-form').submit();">
|
||||
{{ trans('adminlte_lang::message.signout') }}
|
||||
</a>
|
||||
|
||||
<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
|
||||
{{ csrf_field() }}
|
||||
<input type="submit" value="logout" style="display: none;">
|
||||
</form>
|
||||
<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
|
||||
{{ csrf_field() }}
|
||||
<input type="submit" value="logout" style="display: none;">
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -92,4 +101,4 @@
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
</header>
|
||||
</header>
|
||||
@@ -2,12 +2,21 @@
|
||||
|
||||
<!-- JQuery and bootstrap are required by Laravel 5.3 in resources/assets/js/bootstrap.js-->
|
||||
<!-- Laravel App -->
|
||||
<script src="{{ url (mix('/js/app.js')) }}" type="text/javascript"></script>
|
||||
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
|
||||
|
||||
<!-- Our our CSRF token to each interaction -->
|
||||
{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
|
||||
<script type="text/javascript">
|
||||
$.ajaxSetup({
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
@yield('page-scripts')
|
||||
<!-- Optionally, you can add Slimscroll and FastClick plugins.
|
||||
Both of these plugins are recommended to enhance the
|
||||
user experience. Slimscroll is required when using the
|
||||
fixed layout. -->
|
||||
<script src="{{ url('/plugins/jquery.slimscroll.min.js') }}" type="text/javascript"></script>
|
||||
<script src="{{ url('/plugins/fastclick/fastclick.min.js') }}" type="text/javascript"></script>
|
||||
@js('/site/js/jquery.slimscroll.min.js','jq.slimscroll')
|
||||
@js('/site/js/fastclick.min.js','jq.fastclick')
|
||||
@@ -37,7 +37,7 @@
|
||||
</aside>
|
||||
|
||||
@section('page-scripts')
|
||||
<script src="{{ url('/plugins/bootstrap3-typeahead.min.js') }}"></script>
|
||||
@js('/site/js/bootstrap3-typeahead.min.js','bs-typeahead')
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<ul class="sidebar-menu" data-widget="tree">
|
||||
<li class="header">Menu</li>
|
||||
<li class="header"><b>MENU</b></li>
|
||||
<!-- Optionally, you can add icons to the links -->
|
||||
<li @if(Route::current()->getName() == 'home')class="active"@endif><a href="{{ url('home',['date'=>(isset($ido) ? $ido->id : NULL)]) }}"><i class='fa fa-link'></i> <span>{{ trans('adminlte_lang::message.home') }}</span></a></li>
|
||||
</ul>
|
||||
|
||||
66
src/Commands/ScheduleList.php
Normal file
66
src/Commands/ScheduleList.php
Normal file
@@ -0,0 +1,66 @@
|
||||
<?php
|
||||
|
||||
namespace Leenooks\Commands;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
|
||||
class ScheduleList extends Command
|
||||
{
|
||||
protected $signature = 'schedule:list';
|
||||
|
||||
protected $description = 'List when scheduled commands are executed.';
|
||||
|
||||
/**
|
||||
* @var Schedule
|
||||
*/
|
||||
protected $schedule;
|
||||
|
||||
/**
|
||||
* ScheduleList constructor.
|
||||
*
|
||||
* @param Schedule $schedule
|
||||
*/
|
||||
public function __construct(Schedule $schedule)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->schedule = $schedule;
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the console command.
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle()
|
||||
{
|
||||
$events = array_map(function ($event) {
|
||||
return [
|
||||
'cron' => $event->expression,
|
||||
'command' => static::fixupCommand($event->command),
|
||||
];
|
||||
}, $this->schedule->events());
|
||||
|
||||
$this->table(
|
||||
['Cron', 'Command'],
|
||||
$events
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* If it's an artisan command, strip off the PHP
|
||||
*
|
||||
* @param $command
|
||||
* @return string
|
||||
*/
|
||||
protected static function fixupCommand($command)
|
||||
{
|
||||
$parts = explode(' ', $command);
|
||||
if (count($parts) > 2 && $parts[1] === "'artisan'") {
|
||||
array_shift($parts);
|
||||
}
|
||||
|
||||
return implode(' ', $parts);
|
||||
}
|
||||
}
|
||||
57
src/Controllers/AdminController.php
Normal file
57
src/Controllers/AdminController.php
Normal file
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
namespace Leenooks\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Redirect;
|
||||
use Session;
|
||||
|
||||
use App\User;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function switch_authorised($id)
|
||||
{
|
||||
return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($id)) ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
public function switch_session()
|
||||
{
|
||||
return ! Session::get('orig_user');
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo Change the background color (or something) so we know we are switched
|
||||
*/
|
||||
public function user_switch_start($id)
|
||||
{
|
||||
if ($this->switch_session() AND $this->switch_authorised($id))
|
||||
{
|
||||
$uo = User::find($id);
|
||||
|
||||
if (! $uo)
|
||||
abort(404,'User not found');
|
||||
|
||||
Session::put('orig_user',Auth::id());
|
||||
Auth::login($uo);
|
||||
}
|
||||
|
||||
return Redirect::to('/home');
|
||||
}
|
||||
|
||||
public function user_switch_stop()
|
||||
{
|
||||
if ($id = Session::pull('orig_user')) {
|
||||
$uo = User::find($id);
|
||||
Auth::login($uo);
|
||||
}
|
||||
|
||||
return Redirect::to('/home');
|
||||
}
|
||||
}
|
||||
57
src/Traits/CompositeKeys.php
Normal file
57
src/Traits/CompositeKeys.php
Normal file
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
namespace Leenooks\Traits;
|
||||
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
|
||||
/**
|
||||
* Trait CompositeKeys
|
||||
* Enable Models to have multiple primary keys
|
||||
*
|
||||
* Need to add to the Model...
|
||||
* public $incrementing = false;
|
||||
* protected $primaryKey = [<ARRAY_OF_KEYS>];
|
||||
*
|
||||
* @package Leenooks\Traits
|
||||
*/
|
||||
trait CompositeKeys {
|
||||
/**
|
||||
* Set the keys for a save update query.
|
||||
*
|
||||
* @param \Illuminate\Database\Eloquent\Builder $query
|
||||
* @return \Illuminate\Database\Eloquent\Builder
|
||||
*/
|
||||
protected function setKeysForSaveQuery(Builder $query)
|
||||
{
|
||||
$keys = $this->getKeyName();
|
||||
|
||||
if (! is_array($keys)) {
|
||||
return parent::setKeysForSaveQuery($query);
|
||||
}
|
||||
|
||||
foreach($keys as $keyName) {
|
||||
$query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the primary key value for a save query.
|
||||
*
|
||||
* @param mixed $keyName
|
||||
* @return mixed
|
||||
*/
|
||||
protected function getKeyForSaveQuery($keyName = null)
|
||||
{
|
||||
if (is_null($keyName)) {
|
||||
$keyName = $this->getKeyName();
|
||||
}
|
||||
|
||||
if (isset($this->original[$keyName])) {
|
||||
return $this->original[$keyName];
|
||||
}
|
||||
|
||||
return $this->getAttribute($keyName);
|
||||
}
|
||||
}
|
||||
21
src/Traits/UserSwitch.php
Normal file
21
src/Traits/UserSwitch.php
Normal file
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Check if users have been switched
|
||||
*/
|
||||
namespace Leenooks\Traits;
|
||||
|
||||
use Session;
|
||||
|
||||
trait UserSwitch
|
||||
{
|
||||
public function getSwitchedAttribute()
|
||||
{
|
||||
return Session::get('orig_user');
|
||||
}
|
||||
|
||||
public function isAdmin($id)
|
||||
{
|
||||
return isset($this->admin) ? $this->admin : FALSE;
|
||||
}
|
||||
}
|
||||
15
src/helpers.php
Normal file
15
src/helpers.php
Normal file
@@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
// is_json helper
|
||||
if (! function_exists('is_json')) {
|
||||
function is_json($string) {
|
||||
try {
|
||||
json_decode($string);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return (json_last_error() == JSON_ERROR_NONE);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user