diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php index 9af46b1..6f39440 100644 --- a/app/Http/Controllers/TetapanController.php +++ b/app/Http/Controllers/TetapanController.php @@ -11,10 +11,25 @@ use Carbon\Carbon; class TetapanController extends Controller { + + public function home(){ + + $auth_user = Auth::user(); + + return view('tetapan.home',compact('auth_user')); + } + public function index(){ $api_url = config('api.url'); $auth_user = Auth::user(); return view('tetapan.index',compact('api_url','auth_user')); } + + public function margin(){ + $api_url = config('api.url'); + $auth_user = Auth::user(); + + return view('tetapan.margin',compact('api_url','auth_user')); + } } diff --git a/public/img/barcode.png b/public/img/barcode.png new file mode 100644 index 0000000..41f633e Binary files /dev/null and b/public/img/barcode.png differ diff --git a/public/img/margin.png b/public/img/margin.png new file mode 100644 index 0000000..940b14b Binary files /dev/null and b/public/img/margin.png differ diff --git a/resources/js/Tetapan/margin.vue b/resources/js/Tetapan/margin.vue new file mode 100644 index 0000000..037359e --- /dev/null +++ b/resources/js/Tetapan/margin.vue @@ -0,0 +1,182 @@ + + + + \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index 02ab9f0..eb716d2 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -254,6 +254,7 @@ Vue.component('audit-component', require('./Audit/Home.vue').default) //Tetapan Vue.component('tetapan-component', require('./Tetapan/index.vue').default) Vue.component('pengguna-component', require('./Pengguna/index.vue').default) +Vue.component('margin-component', require('./Tetapan/margin.vue').default) diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index d272ce8..04f5f47 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -218,7 +218,7 @@ -
  • @@ -232,7 +232,23 @@ Tetapan
    • -     + --}} + + +
  • +
    + + + + + Tetapan +
    +
    • +     {{--
    + Windster Logo +

    Scan Barcode

    +     + + @if ($auth_user->id == 355) + + Windster Logo +

    Ubah Margin

    +     + @else + + @endif + +
    + + +
    +
    + @include('layouts.footer') +@endsection diff --git a/resources/views/tetapan/margin.blade.php b/resources/views/tetapan/margin.blade.php new file mode 100644 index 0000000..c640cee --- /dev/null +++ b/resources/views/tetapan/margin.blade.php @@ -0,0 +1,18 @@ + +@extends('layouts.app') + +@section('content') + +
    +
    + +
    + + + + + +
    +
    + @include('layouts.footer') +@endsection diff --git a/routes/web.php b/routes/web.php index acf9982..f79c88a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -143,6 +143,9 @@ Route::get('/audit/cetakan', ['as'=>'audit.cetak','uses'=>'App\Http\Controllers\ //Tetapan Server Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanController@index'])->middleware(['roleChecker:null,null,operasi,null']); +Route::get('/tetapanhome',['as'=>'tetapan.home','uses'=>'App\Http\Controllers\TetapanController@home'])->middleware(['roleChecker:null,null,operasi,null']); +Route::get('/tetapanmargin',['as'=>'tetapan.margin','uses'=>'App\Http\Controllers\TetapanController@margin'])->middleware(['roleChecker:null,null,operasi,null']); + //Pengguna Route::get('/pengguna',['as'=>'pengguna','uses'=>'App\Http\Controllers\PenggunaController@index'])->middleware(['roleChecker:admin,akaun,operasi,kpo']);