KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix spatutnya

Browse Source
This commit is contained in:
hafifierahman
2021-11-02 09:36:25 +08:00
parent 3f08a09c39
commit ed3c366e27
9 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+6 -1
View File
@@ -47,7 +47,12 @@ class LoginController extends Controller
$getlogdata = loguser::where('emel','=', $request->email)->orderBy('recno', 'desc')->skip(1)->first();
session(['logindate' => $getlogdata['date']]);
if($getlogdata)
{
session(['logindate' => $getlogdata['date']]);
}else{
session(['logindate' => $current->toDateTimeString()]);
}
}
app/Http/Controllers/BayaranController.php
+1 -1
View File
@@ -335,7 +335,7 @@ class BayaranController extends Controller
}
public function failedPayment(){
return view('pembayaran.failed_express');
return view('pembayaran.result.gagal');
}
}
app/Models/User.php
+1
View File
@@ -17,6 +17,7 @@ class User extends Authenticatable implements MustVerifyEmail
* @var array
*/
protected $fillable = [
'icno',
'name',
'email',
'password',
public/argon/js/ifvisible.js
Vendored
+26
View File
File diff suppressed because one or more lines are too long
resources/views/auth/register.blade.php
+1 -1
View File
@@ -72,7 +72,7 @@
<div class="row my-4">
<div class="col-12">
<div class="custom-control custom-control-alternative custom-checkbox">
<input class="custom-control-input" id="customCheckRegister" type="checkbox">
<input class="custom-control-input" id="customCheckRegister" type="checkbox" required>
<label class="custom-control-label" for="customCheckRegister">
<span class="text-muted">{{ __('Saya setuju dengan segala') }} <a href="#!">{{ __('Terma & Syarat') }}</a></span>
</label>
resources/views/dashboard.blade.php
+30 -2
View File
@@ -2,7 +2,7 @@
@section('content')
@include('layouts.headers.cards')
@include('modal.sessionmodal')
<!-- Header -->
@@ -26,7 +26,7 @@
<div class="container-fluid mt--7">
<div class="row d-flex justify-content-center">
<div class="col-xl-2 col-sm-12">
@@ -47,6 +47,9 @@
</div>
</div>
<a href="#" class="linktarget" style="color:black;" data-toggle="modal" data-target="#sessionModal">modal</a>
<div class="col-xl-2 col-sm-12">
<div class="card bg-light pl-2 pr-2 pb-2 h-70 mt-5">
<a href="{{ route('pembayaransag') }}" onclick="loadingbtn();"><div class="card mb-sm-0 mb-4 mb-xl-0 ml-sm-0 mt-2 bg-primary">
@@ -182,6 +185,31 @@
}
});
}
function d(el){
return document.getElementById(el);
}
setInterval(function(){
var info = ifvisible.getIdleInfo();
// console.log(info);
// Give 3% margin to stabilaze user output
if(info.timeLeftPer < 3){
console.log('masuk');
info.timeLeftPer = 0;
info.timeLeft = ifvisible.getIdleDuration();
}
// console.log(info.timeLeft);
d("seconds").innerHTML = parseInt(info.timeLeft / 1000), 10;
// d("idlebar").style.width = info.timeLeftPer+'%';
}, 100);
var dur = (ifvisible.getIdleDuration() / 1000);
d('seconds').innerHTML = dur;
// d('idleTime').innerHTML = dur + " seconds";
</script>
resources/views/layouts/app.blade.php
+23 -1
View File
@@ -28,19 +28,40 @@
<script src="{{ asset('argon') }}/vendor/jquery/dist/jquery.min.js"></script>
<script src="{{ asset('argon') }}/vendor/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="{{ asset('argon') }}/js/ifvisible.js"></script>
<script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<script type="text/javascript" src="{{ asset('argon') }}/js/main.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script>
{{-- <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script> --}}
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
/>
<script src="{{ asset('argon') }}/js/bootstrap-notify.js"></script>
<script>
ifvisible.setIdleDuration(10);
// ifvisible.idle(function(){
// $('#sessionModal').modal('show');
// console.log('sessionmodalshow');
// });
if( ifvisible.now() ){
// Display pop-up
console.log('visible');
}
ifvisible.on("idle", function(){
$('#sessionModal').modal('show');
console.log('reload');
});
</script>
<style>
div.checker span {
@@ -289,6 +310,7 @@
<div class="main-content">
@include('layouts.navbars.navbar')
@include('modal.sessionmodal')
@yield('content')
<div id="background" class="animate__animated animate__fadeIn" style="display: none;">
resources/views/layouts/navbars/navs/auth.blade.php
+1 -1
View File
@@ -13,7 +13,7 @@
@endphp
<div class="row">
<span class="text-white d-none d-lg-inline-block">{{ (Auth::user()->first_time_login === 0) ? 'Selamat datang untuk pertama kali!' : 'Log masuk terakhir pada ' . $logDate }} MYT</span>
<span class="text-white d-none d-lg-inline-block">{{ (Auth::user()->first_time_login === 0) ? 'Selamat datang untuk pertama kali!' : 'Log masuk terakhir pada ' . $logDate . ' MYT'}} </span>
</div>
</div>
resources/views/modal/sessionmodal.blade.php
+32
View File
@@ -0,0 +1,32 @@
<div class="modal animate__animated animate__bounceInDown" id="sessionModal">
<div class="modal-dialog modal-md modal-dialog-centered">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header bg-primary">
<h2 class="modal-title text-white">Sesi anda akan tamat tempoh!</h2>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
<!-- Modal body -->
<div class="modal-body">
<i class="fas fa-exclamation-triangle text-danger fa-1x"></i><span class="ml-2 mt-2">Sesi dalam talian anda akan tamat tempoh dalam</span>
<div class="text-warning mx-auto text-center display-4">
<span class="label label-warning" id="seconds">00</span><span>Saat</span>
{{-- <span id="idleTime" class="label label-warning">00 seconds</span> --}}
</div>
<span>Tekan "Teruskan" untuk meneruskan urusan, atau tekan "Keluar" untuk menamatkan sesi sekarang.</span>
</div>
<!-- Modal footer -->
<div class="modal-footer mx-auto text-center">
<button type="button" class="btn btn-primary" data-dismiss="modal">Teruskan</button>
<button type="button" class="btn btn-danger" data-dismiss="modal">Keluar</button>
</div>
</div>
</div>
</div>