diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 7fc637c..8b66c4a 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -62,12 +62,12 @@ class LoginController extends Controller $auth_user = Auth::guard('web')->user(); $api_url = config('api.url'); - - if($auth_user['roles'] == 'admin' && $auth_user['operasi'] == 'operasi'){ + if($auth_user['roles'] == 'admin' || $auth_user['roles'] == 'operasi'){ $user = User::find($auth_user['id']); $user->cawangan = $request->cawangan; $user->save(); + return redirect()->route('home'); }elseif($auth_user['roles'] == 'akaun'){ $user = User::find($auth_user['id']); @@ -76,6 +76,7 @@ class LoginController extends Controller return redirect()->route('akaun.home'); }else{ + return redirect('login')->with('error', 'Oppes! You have entered invalid credentials'); } // if($auth_user['roles'] == 'teller'){ diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 39910d7..f5dddd6 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -63,5 +63,6 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'roleChecker' => \App\Http\Middleware\RoleChecker::class, ]; } diff --git a/app/Http/Middleware/RoleChecker.php b/app/Http/Middleware/RoleChecker.php new file mode 100644 index 0000000..44eab13 --- /dev/null +++ b/app/Http/Middleware/RoleChecker.php @@ -0,0 +1,40 @@ +role->pluck('name')->toArray() : []; + $roles = Auth::check() ? Auth::user()->roles : null; + + if ($admin == $roles) + { + return $next($request); + + } else if ($akaun == $roles) + { + return $next($request); + + } else if ($operasi == $roles) + { + return $next($request); + } + + return Redirect::route('home'); + } +} diff --git a/public/img/background.jpg b/public/img/background.jpg new file mode 100644 index 0000000..ba945d6 Binary files /dev/null and b/public/img/background.jpg differ diff --git a/public/js/app.js b/public/js/app.js index 231964d..7da0db9 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -16713,6 +16713,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar // // // +// /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ data: function data() { return { @@ -18726,17 +18727,39 @@ __webpack_require__.r(__webpack_exports__); }, dataLabels: { enabled: true, + distributed: true, style: { - colors: ['#333'] + colors: ['#333'], + fontSize: '12px', + fontWeight: 'bold' + }, + dropShadow: { + enabled: true, + left: 2, + top: 2, + opacity: 0.5 }, offsetY: -30, + background: { + enabled: true, + foreColor: '#fff', + borderRadius: 2, + padding: 4, + opacity: 0.9, + borderWidth: 1, + borderColor: '#fff' + }, formatter: function formatter(val, opt) { var total = (val - opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value']) / opt.w.globals.seriesGoals[0][opt.dataPointIndex][0]['value'] * 100; if (isNaN(total)) { return 0.00; } else { - return total.toFixed(2); + if (isFinite(total)) { + return total.toFixed(2); + } else { + return 0.00; + } } } }, @@ -18750,7 +18773,7 @@ __webpack_require__.r(__webpack_exports__); showForSingleSeries: true, customLegendItems: ['Gadai', 'Tebus', 'Expected'], markers: { - fillColors: ['#3498db', '#e74c3c', '#775DD0'] + fillColors: ['#70a1ff', '#7bed9f', '#e74c3c'] } }, yaxis: { @@ -18759,7 +18782,8 @@ __webpack_require__.r(__webpack_exports__); } }, fill: { - opacity: 1 + opacity: 1, + colors: ['#70a1ff', '#7bed9f'] }, tooltip: { y: { @@ -18888,7 +18912,11 @@ var self = undefined; if (isNaN(total)) { return 0.00; } else { - return total.toFixed(2); + if (isFinite(total)) { + return total.toFixed(2); + } else { + return 0.00; + } } } }, @@ -19018,7 +19046,11 @@ var _formatter = new Intl.NumberFormat('en-US', { if (isNaN(total)) { return 0.00; } else { - return total.toFixed(2); + if (isFinite(total)) { + return total.toFixed(2); + } else { + return 0.00; + } } } }, @@ -19142,7 +19174,11 @@ var _formatter = new Intl.NumberFormat('en-US', { if (isNaN(total)) { return 0.00; } else { - return total.toFixed(2); + if (isFinite(total)) { + return total.toFixed(2); + } else { + return 0.00; + } } } }, @@ -19365,6 +19401,9 @@ var formatter = new Intl.NumberFormat('en-US', { props: { petibesi: { type: Array + }, + kodcaw: { + type: String } }, data: function data() { @@ -19377,7 +19416,7 @@ var formatter = new Intl.NumberFormat('en-US', { totalPage: 0, currentPage: 1, lastPage: 5, - kodcaw: 'KB2', + kodcaw: '', showpetibesi: [], paginate: {}, activePage: 1 @@ -19412,7 +19451,7 @@ var formatter = new Intl.NumberFormat('en-US', { getPetibesi: function getPetibesi(pageNumber) { var _this = this; - this.axios.get('http://localhost:8000/admin/getPetiBesiPaginate/' + this.kodcaw, { + this.axios.get('http://localhost:8000/admin/getPetiBesiPaginate/' + this.$props.kodcaw, { params: { page: pageNumber } @@ -19967,6 +20006,9 @@ var formatter = new Intl.NumberFormat('en-US', { }, arraytunai: { type: Array + }, + kodcaw: { + type: String } }, data: function data() { @@ -19981,7 +20023,7 @@ var formatter = new Intl.NumberFormat('en-US', { currentPage: 1, lastPage: 5, activePage: 1, - kodcaw: 'KB2', + kodcaw: '', kodlaluan: '' }; }, @@ -20034,7 +20076,7 @@ var formatter = new Intl.NumberFormat('en-US', { getTunai: function getTunai(pageNumber) { var _this2 = this; - this.axios.get('http://localhost:8000/admin/getTunaiPaginate/' + this.kodcaw, { + this.axios.get('http://localhost:8000/admin/getTunaiPaginate/' + this.$props.kodcaw, { params: { page: pageNumber, kodlaluan: this.kodlaluan @@ -72634,8 +72676,8 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ - _c("div", { staticClass: "w-1/3 p-8 mx-auto" }, [ + _c("div", { staticClass: "flex w-full" }, [ + _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", { @@ -72772,8 +72814,8 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ - _c("div", { staticClass: "w-1/3 p-8 mx-auto" }, [ + _c("div", { staticClass: "flex w-full" }, [ + _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", { @@ -73132,8 +73174,8 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ - _c("div", { staticClass: "w-1/3 p-8 mx-auto" }, [ + _c("div", { staticClass: "flex w-full" }, [ + _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", { @@ -73294,7 +73336,7 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ + _c("div", { staticClass: "flex w-full" }, [ _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", @@ -73441,7 +73483,7 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ + _c("div", { staticClass: "flex w-full" }, [ _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", @@ -73695,8 +73737,8 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ - _c("div", { staticClass: "w-1/3 p-8 mx-auto" }, [ + _c("div", { staticClass: "flex w-full" }, [ + _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", { @@ -73833,8 +73875,8 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ - _c("div", { staticClass: "w-1/3 p-8 mx-auto" }, [ + _c("div", { staticClass: "flex w-full" }, [ + _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", { @@ -73971,7 +74013,7 @@ var render = function () { var _h = _vm.$createElement var _c = _vm._self._c || _h return _c("div", { staticClass: "container" }, [ - _c("div", { staticClass: "flex w-screen" }, [ + _c("div", { staticClass: "flex w-full" }, [ _c("div", { staticClass: "w-1/2 p-8 mx-auto" }, [ _c( "div", @@ -103291,7 +103333,7 @@ if (typeof window !== 'undefined' && window.Vue) { /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"_args":[["axios@0.21.4","C:\\\\laragon\\\\www\\\\adminpkb"]],"_development":true,"_from":"axios@0.21.4","_id":"axios@0.21.4","_inBundle":false,"_integrity":"sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==","_location":"/axios","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"axios@0.21.4","name":"axios","escapedName":"axios","rawSpec":"0.21.4","saveSpec":null,"fetchSpec":"0.21.4"},"_requiredBy":["#DEV:/"],"_resolved":"https://registry.npmjs.org/axios/-/axios-0.21.4.tgz","_spec":"0.21.4","_where":"C:\\\\laragon\\\\www\\\\adminpkb","author":{"name":"Matt Zabriskie"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"bugs":{"url":"https://github.com/axios/axios/issues"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"dependencies":{"follow-redirects":"^1.14.0"},"description":"Promise based HTTP client for the browser and node.js","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"homepage":"https://axios-http.com","jsdelivr":"dist/axios.min.js","keywords":["xhr","http","ajax","promise","node"],"license":"MIT","main":"index.js","name":"axios","repository":{"type":"git","url":"git+https://github.com/axios/axios.git"},"scripts":{"build":"NODE_ENV=production grunt build","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","examples":"node ./examples/server.js","fix":"eslint --fix lib/**/*.js","postversion":"git push && git push --tags","preversion":"npm test","start":"node ./sandbox/server.js","test":"grunt test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"},"typings":"./index.d.ts","unpkg":"dist/axios.min.js","version":"0.21.4"}'); +module.exports = JSON.parse('{"_from":"axios@^0.21","_id":"axios@0.21.4","_inBundle":false,"_integrity":"sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==","_location":"/axios","_phantomChildren":{},"_requested":{"type":"range","registry":true,"raw":"axios@^0.21","name":"axios","escapedName":"axios","rawSpec":"^0.21","saveSpec":null,"fetchSpec":"^0.21"},"_requiredBy":["#DEV:/","#USER"],"_resolved":"https://registry.npmjs.org/axios/-/axios-0.21.4.tgz","_shasum":"c67b90dc0568e5c1cf2b0b858c43ba28e2eda575","_spec":"axios@^0.21","_where":"C:\\\\laragon\\\\www\\\\adminpkb","author":{"name":"Matt Zabriskie"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"bugs":{"url":"https://github.com/axios/axios/issues"},"bundleDependencies":false,"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"dependencies":{"follow-redirects":"^1.14.0"},"deprecated":false,"description":"Promise based HTTP client for the browser and node.js","devDependencies":{"coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.3.0","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^23.0.0","grunt-karma":"^4.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^4.0.2","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^6.3.2","karma-chrome-launcher":"^3.1.0","karma-firefox-launcher":"^2.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^4.3.6","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.8","karma-webpack":"^4.0.2","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^8.2.1","sinon":"^4.5.0","terser-webpack-plugin":"^4.2.3","typescript":"^4.0.5","url-search-params":"^0.10.0","webpack":"^4.44.2","webpack-dev-server":"^3.11.0"},"homepage":"https://axios-http.com","jsdelivr":"dist/axios.min.js","keywords":["xhr","http","ajax","promise","node"],"license":"MIT","main":"index.js","name":"axios","repository":{"type":"git","url":"git+https://github.com/axios/axios.git"},"scripts":{"build":"NODE_ENV=production grunt build","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","examples":"node ./examples/server.js","fix":"eslint --fix lib/**/*.js","postversion":"git push && git push --tags","preversion":"npm test","start":"node ./sandbox/server.js","test":"grunt test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"},"typings":"./index.d.ts","unpkg":"dist/axios.min.js","version":"0.21.4"}'); /***/ }) diff --git a/resources/js/Akaun/Ansuran.vue b/resources/js/Akaun/Ansuran.vue index 1eee06b..996c45c 100644 --- a/resources/js/Akaun/Ansuran.vue +++ b/resources/js/Akaun/Ansuran.vue @@ -1,8 +1,8 @@