Merge branch 'pipi' into 'master'

change ui:

See merge request online-sistem1/kaunter!11
This commit is contained in:
hafifie rahman
2020-12-03 04:35:05 +00:00
8 changed files with 9 additions and 11 deletions
+6 -6
View File
@@ -14,7 +14,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.menu',compact('cawangan_info','api_url'));
return view('khazanah.menu',compact('cawangan_info','api_url'));
}
public function gadaian()
@@ -22,7 +22,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.gadaian',compact('cawangan_info','api_url'));
return view('khazanah.gadaian',compact('cawangan_info','api_url'));
}
public function tebus()
@@ -30,7 +30,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.tebus',compact('cawangan_info','api_url'));
return view('khazanah.tebus',compact('cawangan_info','api_url'));
}
public function kelulusan()
@@ -38,7 +38,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.kelulusan',compact('cawangan_info','api_url'));
return view('khazanah.kelulusan',compact('cawangan_info','api_url'));
}
@@ -47,7 +47,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.pendahuluan',compact('cawangan_info','api_url'));
return view('khazanah.pendahuluan',compact('cawangan_info','api_url'));
}
@@ -56,7 +56,7 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('homepage.khazanah.serahan',compact('cawangan_info','api_url'));
return view('khazanah.serahan',compact('cawangan_info','api_url'));
}
}
@@ -21,7 +21,7 @@
<a href="#" class="btn btn-primary btn-lg btn-block mb-3">Aliran Tunai</a>
</div>
<div class="row">
<a href="#" class="btn btn-primary btn-lg btn-block mb-3">Kelulusan</a>
<a href="{{ url('kelulusan') }}" class="btn btn-primary btn-lg btn-block mb-3">Kelulusan</a>
</div>
</div>
@@ -3,7 +3,7 @@
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
@@ -5,7 +5,7 @@
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-header">{{ __('Khazanah') }}</div>
<div class="card-body text-center mx-auto">
@@ -13,8 +13,6 @@
<a href="{{ url('khazanahtebus') }}" class="btn btn-info ml-2">Tebus <span class="badge badge-light">2</span></a>
<a href="{{ url('pendahuluan') }}" class="btn btn-info ml-2">Pendahuluan</a>
<a href="{{ url('serahan') }}" class="btn btn-info ml-2">Serahan</a>
<a href="{{ url('kelulusan') }}" class="btn btn-info ml-2">Kelulusan</a>
</div>
</div>
</div>