From 719ae098ac7c13ec66d22f20487665c2e3df6a00 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Mon, 3 Nov 2025 01:59:51 +0700 Subject: [PATCH 01/24] new --- package-lock.json | 284 ++++++++++++---------------------------------- yarn.lock | 105 +++++++++++++++++ 2 files changed, 177 insertions(+), 212 deletions(-) diff --git a/package-lock.json b/package-lock.json index 38d52d71..463e1519 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,6 +69,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz", "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==", "dev": true, + "peer": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -608,7 +609,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", "dev": true, - "peer": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -619,7 +619,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", "dev": true, - "peer": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -665,7 +664,6 @@ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", "dev": true, - "peer": true, "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -676,7 +674,6 @@ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, - "peer": true, "dependencies": { "@types/eslint": "*", "@types/estree": "*" @@ -686,22 +683,19 @@ "version": "0.0.51", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/node": { "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@vitejs/plugin-react": { "version": "2.1.0", @@ -742,7 +736,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz", "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==", "dev": true, - "peer": true, "dependencies": { "@babel/parser": "^7.16.4", "@vue/shared": "3.2.45", @@ -755,7 +748,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -765,7 +757,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz", "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==", "dev": true, - "peer": true, "dependencies": { "@vue/compiler-core": "3.2.45", "@vue/shared": "3.2.45" @@ -776,7 +767,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz", "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==", "dev": true, - "peer": true, "dependencies": { "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.45", @@ -795,7 +785,6 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", "dev": true, - "peer": true, "dependencies": { "sourcemap-codec": "^1.4.8" } @@ -805,7 +794,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -815,7 +803,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz", "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==", "dev": true, - "peer": true, "dependencies": { "@vue/compiler-dom": "3.2.45", "@vue/shared": "3.2.45" @@ -826,7 +813,6 @@ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz", "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", "dev": true, - "peer": true, "dependencies": { "@vue/shared": "3.2.45" } @@ -836,7 +822,6 @@ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz", "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==", "dev": true, - "peer": true, "dependencies": { "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.45", @@ -850,7 +835,6 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", "dev": true, - "peer": true, "dependencies": { "sourcemap-codec": "^1.4.8" } @@ -860,7 +844,6 @@ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz", "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", "dev": true, - "peer": true, "dependencies": { "@vue/reactivity": "3.2.45", "@vue/shared": "3.2.45" @@ -871,7 +854,6 @@ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", "dev": true, - "peer": true, "dependencies": { "@vue/runtime-core": "3.2.45", "@vue/shared": "3.2.45", @@ -883,7 +865,6 @@ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz", "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==", "dev": true, - "peer": true, "dependencies": { "@vue/compiler-ssr": "3.2.45", "@vue/shared": "3.2.45" @@ -896,15 +877,13 @@ "version": "3.2.45", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz", "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/helper-numbers": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1" @@ -914,29 +893,25 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -947,15 +922,13 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -968,7 +941,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dev": true, - "peer": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } @@ -978,7 +950,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dev": true, - "peer": true, "dependencies": { "@xtuc/long": "4.2.2" } @@ -987,15 +958,13 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -1012,7 +981,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", @@ -1026,7 +994,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -1039,7 +1006,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -1054,7 +1020,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "dev": true, - "peer": true, "dependencies": { "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" @@ -1064,15 +1029,13 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/acorn": { "version": "7.4.1", @@ -1216,7 +1179,6 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, - "peer": true, "peerDependencies": { "ajv": "^6.9.1" } @@ -1331,6 +1293,7 @@ "url": "https://opencollective.com/bootstrap" } ], + "peer": true, "peerDependencies": { "jquery": "1.9.1 - 3", "popper.js": "^1.16.1" @@ -1437,6 +1400,7 @@ "url": "https://tidelift.com/funding/github/npm/browserslist" } ], + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001400", "electron-to-chromium": "^1.4.251", @@ -1573,7 +1537,6 @@ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true, - "peer": true, "engines": { "node": ">=6.0" } @@ -1625,8 +1588,7 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/concat-stream": { "version": "1.6.2", @@ -1696,8 +1658,7 @@ "version": "2.6.21", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/d": { "version": "1.0.1", @@ -2095,7 +2056,6 @@ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, - "peer": true, "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -2108,8 +2068,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/es5-ext": { "version": "0.10.53", @@ -2574,7 +2533,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, - "peer": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -2588,7 +2546,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -2610,7 +2567,6 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "peer": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -2623,7 +2579,6 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "peer": true, "engines": { "node": ">=4.0" } @@ -2645,8 +2600,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/esutils": { "version": "1.0.0", @@ -2680,7 +2634,6 @@ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, - "peer": true, "engines": { "node": ">=0.8.x" } @@ -2702,15 +2655,13 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "peer": true + "dev": true }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", @@ -2873,8 +2824,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/globals": { "version": "11.12.0", @@ -3083,7 +3033,6 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, - "peer": true, "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -3098,7 +3047,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -3108,7 +3056,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -3122,7 +3069,8 @@ "node_modules/jquery": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", + "peer": true }, "node_modules/jquery-knob-chif": { "version": "1.2.13", @@ -3200,15 +3148,13 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json5": { "version": "2.2.1", @@ -3293,7 +3239,6 @@ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, - "peer": true, "engines": { "node": ">=6.11.5" } @@ -3371,8 +3316,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/mime-db": { "version": "1.52.0", @@ -3623,7 +3567,6 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -3646,7 +3589,6 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, - "peer": true, "dependencies": { "safe-buffer": "^5.1.0" } @@ -3664,6 +3606,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dev": true, + "peer": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -3811,6 +3754,7 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", "dev": true, + "peer": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -3880,7 +3824,6 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, - "peer": true, "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -3927,7 +3870,6 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, - "peer": true, "dependencies": { "randombytes": "^2.1.0" } @@ -3989,7 +3931,6 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, - "peer": true, "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -4000,7 +3941,6 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -4220,7 +4160,6 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -4249,7 +4188,6 @@ "version": "5.19.0", "resolved": "https://registry.npmjs.org/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz", "integrity": "sha512-7a4oBQw4cjz6C87BLRg3KHVvzpnPlnRTkuDZ7SwcJayQQ4QgOryX5u6wj0q07TXhgtMQLCntZO6nVhHIKPaeUw==", - "peer": true, "dependencies": { "jquery": "^3.5.0", "moment": "~2.24.0", @@ -4265,7 +4203,6 @@ "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", - "peer": true, "engines": { "node": "*" } @@ -4275,7 +4212,6 @@ "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, - "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -4294,7 +4230,6 @@ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", "dev": true, - "peer": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.14", "jest-worker": "^27.4.5", @@ -4329,7 +4264,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -4473,7 +4407,6 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "peer": true, "dependencies": { "punycode": "^2.1.0" } @@ -4488,6 +4421,7 @@ "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.7.tgz", "integrity": "sha512-5vCAmU4S8lyVdFCInu9M54f/g8qbOMakVw5xJ4pjoaDy5wgy9sLLZkGdSLN52dlsBqh0tBqxjaqqa8LgPqwRAA==", "dev": true, + "peer": true, "dependencies": { "esbuild": "^0.15.9", "postcss": "^8.4.16", @@ -4556,7 +4490,6 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, - "peer": true, "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -4570,7 +4503,6 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", "dev": true, - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -4618,7 +4550,6 @@ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, - "peer": true, "engines": { "node": ">=10.13.0" } @@ -4641,7 +4572,6 @@ "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "dev": true, - "peer": true, "peerDependencies": { "acorn": "^8" } @@ -4723,6 +4653,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz", "integrity": "sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==", "dev": true, + "peer": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -5118,7 +5049,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", "dev": true, - "peer": true, "requires": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -5129,7 +5059,6 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", "dev": true, - "peer": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -5174,7 +5103,6 @@ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", "dev": true, - "peer": true, "requires": { "@types/estree": "*", "@types/json-schema": "*" @@ -5185,7 +5113,6 @@ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", "dev": true, - "peer": true, "requires": { "@types/eslint": "*", "@types/estree": "*" @@ -5195,22 +5122,19 @@ "version": "0.0.51", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true, - "peer": true + "dev": true }, "@types/json-schema": { "version": "7.0.11", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true, - "peer": true + "dev": true }, "@types/node": { "version": "18.11.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", - "dev": true, - "peer": true + "dev": true }, "@vitejs/plugin-react": { "version": "2.1.0", @@ -5239,7 +5163,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz", "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==", "dev": true, - "peer": true, "requires": { "@babel/parser": "^7.16.4", "@vue/shared": "3.2.45", @@ -5251,8 +5174,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true + "dev": true } } }, @@ -5261,7 +5183,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz", "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==", "dev": true, - "peer": true, "requires": { "@vue/compiler-core": "3.2.45", "@vue/shared": "3.2.45" @@ -5272,7 +5193,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz", "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==", "dev": true, - "peer": true, "requires": { "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.45", @@ -5291,7 +5211,6 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", "dev": true, - "peer": true, "requires": { "sourcemap-codec": "^1.4.8" } @@ -5300,8 +5219,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true + "dev": true } } }, @@ -5310,7 +5228,6 @@ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz", "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==", "dev": true, - "peer": true, "requires": { "@vue/compiler-dom": "3.2.45", "@vue/shared": "3.2.45" @@ -5321,7 +5238,6 @@ "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz", "integrity": "sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==", "dev": true, - "peer": true, "requires": { "@vue/shared": "3.2.45" } @@ -5331,7 +5247,6 @@ "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz", "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==", "dev": true, - "peer": true, "requires": { "@babel/parser": "^7.16.4", "@vue/compiler-core": "3.2.45", @@ -5345,7 +5260,6 @@ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", "dev": true, - "peer": true, "requires": { "sourcemap-codec": "^1.4.8" } @@ -5357,7 +5271,6 @@ "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz", "integrity": "sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==", "dev": true, - "peer": true, "requires": { "@vue/reactivity": "3.2.45", "@vue/shared": "3.2.45" @@ -5368,7 +5281,6 @@ "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz", "integrity": "sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==", "dev": true, - "peer": true, "requires": { "@vue/runtime-core": "3.2.45", "@vue/shared": "3.2.45", @@ -5380,7 +5292,6 @@ "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz", "integrity": "sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==", "dev": true, - "peer": true, "requires": { "@vue/compiler-ssr": "3.2.45", "@vue/shared": "3.2.45" @@ -5390,15 +5301,13 @@ "version": "3.2.45", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz", "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/helper-numbers": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1" @@ -5408,29 +5317,25 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/helper-api-error": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/helper-buffer": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/helper-numbers": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -5441,15 +5346,13 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/helper-wasm-section": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -5462,7 +5365,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dev": true, - "peer": true, "requires": { "@xtuc/ieee754": "^1.2.0" } @@ -5472,7 +5374,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dev": true, - "peer": true, "requires": { "@xtuc/long": "4.2.2" } @@ -5481,15 +5382,13 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true, - "peer": true + "dev": true }, "@webassemblyjs/wasm-edit": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -5506,7 +5405,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", @@ -5520,7 +5418,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -5533,7 +5430,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -5548,7 +5444,6 @@ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "dev": true, - "peer": true, "requires": { "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" @@ -5558,15 +5453,13 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true + "dev": true }, "@xtuc/long": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "dev": true }, "acorn": { "version": "7.4.1", @@ -5691,7 +5584,6 @@ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, - "peer": true, "requires": {} }, "amdefine": { @@ -5776,6 +5668,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "peer": true, "requires": {} }, "bootstrap-colorpicker": { @@ -5862,6 +5755,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, + "peer": true, "requires": { "caniuse-lite": "^1.0.30001400", "electron-to-chromium": "^1.4.251", @@ -5961,8 +5855,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "peer": true + "dev": true }, "clone": { "version": "1.0.4", @@ -6007,8 +5900,7 @@ "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "dev": true }, "concat-stream": { "version": "1.6.2", @@ -6063,8 +5955,7 @@ "version": "2.6.21", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==", - "dev": true, - "peer": true + "dev": true }, "d": { "version": "1.0.1", @@ -6439,7 +6330,6 @@ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, - "peer": true, "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -6449,8 +6339,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true, - "peer": true + "dev": true }, "es5-ext": { "version": "0.10.53", @@ -6715,7 +6604,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, - "peer": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -6725,8 +6613,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "peer": true + "dev": true } } }, @@ -6740,7 +6627,6 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "peer": true, "requires": { "estraverse": "^5.2.0" }, @@ -6749,8 +6635,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "peer": true + "dev": true } } }, @@ -6768,8 +6653,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "peer": true + "dev": true }, "esutils": { "version": "1.0.0", @@ -6799,8 +6683,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true + "dev": true }, "ext": { "version": "1.4.0", @@ -6821,15 +6704,13 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true, - "peer": true + "dev": true }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true, - "peer": true + "dev": true }, "fast-levenshtein": { "version": "2.0.6", @@ -6952,8 +6833,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, - "peer": true + "dev": true }, "globals": { "version": "11.12.0", @@ -7109,7 +6989,6 @@ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, - "peer": true, "requires": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -7120,15 +6999,13 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "peer": true + "dev": true }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "peer": true, "requires": { "has-flag": "^4.0.0" } @@ -7138,7 +7015,8 @@ "jquery": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", + "peer": true }, "jquery-knob-chif": { "version": "1.2.13", @@ -7203,15 +7081,13 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "peer": true + "dev": true }, "json5": { "version": "2.2.1", @@ -7275,8 +7151,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true + "dev": true }, "loader-utils": { "version": "2.0.0", @@ -7341,8 +7216,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true + "dev": true }, "mime-db": { "version": "1.52.0", @@ -7523,8 +7397,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true, - "peer": true + "dev": true }, "quote-stream": { "version": "1.0.2", @@ -7541,7 +7414,6 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, - "peer": true, "requires": { "safe-buffer": "^5.1.0" } @@ -7559,6 +7431,7 @@ "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dev": true, + "peer": true, "requires": { "loose-envify": "^1.1.0" } @@ -7672,6 +7545,7 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", "dev": true, + "peer": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -7707,7 +7581,6 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, - "peer": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -7744,7 +7617,6 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, - "peer": true, "requires": { "randombytes": "^2.1.0" } @@ -7794,7 +7666,6 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, - "peer": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -7804,8 +7675,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true + "dev": true } } }, @@ -7962,8 +7832,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "peer": true + "dev": true }, "tempusdominus-bootstrap-4": { "version": "5.39.0", @@ -7981,7 +7850,6 @@ "version": "5.19.0", "resolved": "https://registry.npmjs.org/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz", "integrity": "sha512-7a4oBQw4cjz6C87BLRg3KHVvzpnPlnRTkuDZ7SwcJayQQ4QgOryX5u6wj0q07TXhgtMQLCntZO6nVhHIKPaeUw==", - "peer": true, "requires": { "jquery": "^3.5.0", "moment": "~2.24.0", @@ -7991,8 +7859,7 @@ "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", - "peer": true + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" } } }, @@ -8001,7 +7868,6 @@ "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, - "peer": true, "requires": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -8013,8 +7879,7 @@ "version": "8.8.1", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true, - "peer": true + "dev": true } } }, @@ -8023,7 +7888,6 @@ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", "dev": true, - "peer": true, "requires": { "@jridgewell/trace-mapping": "^0.3.14", "jest-worker": "^27.4.5", @@ -8142,7 +8006,6 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "peer": true, "requires": { "punycode": "^2.1.0" } @@ -8157,6 +8020,7 @@ "resolved": "https://registry.npmjs.org/vite/-/vite-3.1.7.tgz", "integrity": "sha512-5vCAmU4S8lyVdFCInu9M54f/g8qbOMakVw5xJ4pjoaDy5wgy9sLLZkGdSLN52dlsBqh0tBqxjaqqa8LgPqwRAA==", "dev": true, + "peer": true, "requires": { "esbuild": "^0.15.9", "fsevents": "~2.3.2", @@ -8194,7 +8058,6 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dev": true, - "peer": true, "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -8205,7 +8068,6 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", "dev": true, - "peer": true, "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -8245,7 +8107,6 @@ "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "dev": true, - "peer": true, "requires": {} } } @@ -8254,8 +8115,7 @@ "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true + "dev": true }, "which": { "version": "2.0.2", diff --git a/yarn.lock b/yarn.lock index d25c49e1..8e7a9e7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -268,6 +268,16 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@esbuild/android-arm@0.15.10": + version "0.15.10" + resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.10.tgz" + integrity sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg== + +"@esbuild/linux-loong64@0.15.10": + version "0.15.10" + resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.10.tgz" + integrity sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg== + "@foliojs-fork/fontkit@^1.9.1": version "1.9.1" resolved "https://registry.npmjs.org/@foliojs-fork/fontkit/-/fontkit-1.9.1.tgz" @@ -1502,11 +1512,106 @@ es6-symbol@3.1.1: d "1" es5-ext "~0.10.14" +esbuild-android-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.10.tgz" + integrity sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA== + +esbuild-android-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.10.tgz" + integrity sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg== + +esbuild-darwin-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.10.tgz" + integrity sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA== + esbuild-darwin-arm64@0.15.10: version "0.15.10" resolved "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.10.tgz" integrity sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ== +esbuild-freebsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.10.tgz" + integrity sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w== + +esbuild-freebsd-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.10.tgz" + integrity sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg== + +esbuild-linux-32@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.10.tgz" + integrity sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w== + +esbuild-linux-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.10.tgz" + integrity sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA== + +esbuild-linux-arm@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.10.tgz" + integrity sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A== + +esbuild-linux-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.10.tgz" + integrity sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A== + +esbuild-linux-mips64le@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.10.tgz" + integrity sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q== + +esbuild-linux-ppc64le@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.10.tgz" + integrity sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ== + +esbuild-linux-riscv64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.10.tgz" + integrity sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q== + +esbuild-linux-s390x@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.10.tgz" + integrity sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA== + +esbuild-netbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.10.tgz" + integrity sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw== + +esbuild-openbsd-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.10.tgz" + integrity sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ== + +esbuild-sunos-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.10.tgz" + integrity sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg== + +esbuild-windows-32@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.10.tgz" + integrity sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg== + +esbuild-windows-64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.10.tgz" + integrity sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA== + +esbuild-windows-arm64@0.15.10: + version "0.15.10" + resolved "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.10.tgz" + integrity sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw== + esbuild@^0.15.9: version "0.15.10" resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.15.10.tgz" From af0e4dadfcdfcaf147a38789a131697c6fdad1a1 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Mon, 3 Nov 2025 14:10:07 +0700 Subject: [PATCH 02/24] yes perubhan 1 --- app/Http/Controllers/AbsensiController.php | 111 ++++++++++++++ .../Controllers/Auth/RegisterController.php | 74 +++------ app/Models/Absensi.php | 46 ++++++ app/Providers/RouteServiceProvider.php | 31 ++++ ...025_11_02_213840_create_absensis_table.php | 32 ++++ ...id_absensi_and_shift_to_absensis_table.php | 23 +++ resources/views/absensi/create.blade.php | 58 +++++++ resources/views/absensi/edit.blade.php | 59 ++++++++ resources/views/absensi/index.blade.php | 56 +++++++ resources/views/absensi/show.blade.php | 34 +++++ resources/views/auth/login.blade.php | 3 - resources/views/layouts/app.blade.php | 141 +++++++++++------- .../views/layouts/partials/sidebar.blade.php | 14 +- routes/web.php | 2 + 14 files changed, 568 insertions(+), 116 deletions(-) create mode 100644 app/Http/Controllers/AbsensiController.php create mode 100644 app/Models/Absensi.php create mode 100644 app/Providers/RouteServiceProvider.php create mode 100644 database/migrations/2025_11_02_213840_create_absensis_table.php create mode 100644 database/migrations/2025_11_02_230527_add_id_absensi_and_shift_to_absensis_table.php create mode 100644 resources/views/absensi/create.blade.php create mode 100644 resources/views/absensi/edit.blade.php create mode 100644 resources/views/absensi/index.blade.php create mode 100644 resources/views/absensi/show.blade.php diff --git a/app/Http/Controllers/AbsensiController.php b/app/Http/Controllers/AbsensiController.php new file mode 100644 index 00000000..de842255 --- /dev/null +++ b/app/Http/Controllers/AbsensiController.php @@ -0,0 +1,111 @@ +has('search')) { + $query->where('status', 'like', "%{$request->search}%") + ->orWhereDate('tanggal', $request->search) + ->orWhere('id_absensi', 'like', "%{$request->search}%") + ->orWhere('shift', 'like', "%{$request->search}%"); + } + + $absensis = $query->orderBy('tanggal', 'desc')->paginate(10); + + return view('absensi.index', compact('absensis')); + } + + /** + * Form tambah data absensi + */ + public function create() + { + return view('absensi.create'); + } + + /** + * Simpan data absensi baru + */ + public function store(Request $request) + { + // validasi input + $validated = $request->validate([ + 'id_absensi' => 'required|string|unique:absensis,id_absensi', + 'pegawai_id' => 'required|integer', + 'tanggal' => 'required|date', + 'jam_masuk' => 'nullable|date_format:H:i', + 'jam_keluar' => 'nullable|date_format:H:i', + 'shift' => 'nullable|string', + 'status' => 'required|string', + ]); + + // simpan data yang tervalidasi + Absensi::create($validated); + + return redirect()->route('absensi.index') + ->with('success', 'Data absensi berhasil ditambahkan.'); + } + + /** + * Tampilkan detail data absensi + */ + public function show($id) + { + $absensi = Absensi::findOrFail($id); + return view('absensi.show', compact('absensi')); + } + + /** + * Form ubah data absensi + */ + public function edit($id) + { + $absensi = Absensi::findOrFail($id); + return view('absensi.edit', compact('absensi')); + } + + /** + * Update data absensi + */ + public function update(Request $request, $id) + { + $validated = $request->validate([ + 'id_absensi' => "required|string|unique:absensis,id_absensi,{$id}", + 'pegawai_id' => 'required|integer', + 'tanggal' => 'required|date', + 'jam_masuk' => 'nullable|date_format:H:i', + 'jam_keluar' => 'nullable|date_format:H:i', + 'shift' => 'nullable|string', + 'status' => 'required|string', + ]); + + $absensi = Absensi::findOrFail($id); + $absensi->update($validated); + + return redirect()->route('absensi.index') + ->with('success', 'Data absensi berhasil diperbarui.'); + } + + /** + * Hapus data absensi + */ + public function destroy($id) + { + Absensi::destroy($id); + + return redirect()->route('absensi.index') + ->with('success', 'Data absensi berhasil dihapus.'); + } +} diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 975ac017..f46c7d96 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -3,73 +3,43 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; -use App\Providers\RouteServiceProvider; use App\Models\User; -use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; class RegisterController extends Controller { - /* - |-------------------------------------------------------------------------- - | Register Controller - |-------------------------------------------------------------------------- - | - | This controller handles the registration of new users as well as their - | validation and creation. By default this controller uses a trait to - | provide this functionality without requiring any additional code. - | - */ - - use RegistersUsers; - - /** - * Where to redirect users after registration. - * - * @var string - */ - protected $redirectTo = RouteServiceProvider::HOME; - /** - * Create a new controller instance. - * - * @return void + * Menampilkan form registrasi. */ - public function __construct() + public function showRegistrationForm() { - $this->middleware('guest'); + return view('auth.register'); } /** - * Get a validator for an incoming registration request. - * - * @param array $data - * @return \Illuminate\Contracts\Validation\Validator + * Menangani pendaftaran pengguna baru. */ - protected function validator(array $data) + public function register(Request $request) { - return Validator::make($data, [ - 'first_name' => ['required', 'string', 'max:255'], - 'last_name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - 'password' => ['required', 'string', 'min:8', 'confirmed'], + // Validasi input + $request->validate([ + 'first_name' => 'required|string|max:255', + 'last_name' => 'required|string|max:255', + 'email' => 'required|string|email|max:255|unique:users', + 'password' => 'required|string|min:8|confirmed', ]); - } - /** - * Create a new user instance after a valid registration. - * - * @param array $data - * @return \App\User - */ - protected function create(array $data) - { - return User::create([ - 'first_name' => $data['first_name'], - 'last_name' => $data['last_name'], - 'email' => $data['email'], - 'password' => Hash::make($data['password']), + // Buat user baru + User::create([ + 'first_name' => $request->first_name, + 'last_name' => $request->last_name, + 'email' => $request->email, + 'password' => Hash::make($request->password), ]); + + // Redirect ke halaman login dengan pesan sukses + return redirect()->route('login')->with('success', 'Registrasi berhasil! Silakan login.'); } -} +} \ No newline at end of file diff --git a/app/Models/Absensi.php b/app/Models/Absensi.php new file mode 100644 index 00000000..9f352637 --- /dev/null +++ b/app/Models/Absensi.php @@ -0,0 +1,46 @@ + 'date', + 'jam_masuk' => 'datetime:H:i', + 'jam_keluar' => 'datetime:H:i', + ]; + + /** + * Relasi ke pegawai (opsional, jika ada tabel pegawai) + */ + // public function pegawai() + // { + // return $this->belongsTo(User::class, 'pegawai_id'); + // } +} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php new file mode 100644 index 00000000..62e013b3 --- /dev/null +++ b/app/Providers/RouteServiceProvider.php @@ -0,0 +1,31 @@ +routes(function () { + Route::middleware('web') + ->group(base_path('routes/web.php')); + + Route::prefix('api') + ->middleware('api') + ->group(base_path('routes/api.php')); + }); + } +} \ No newline at end of file diff --git a/database/migrations/2025_11_02_213840_create_absensis_table.php b/database/migrations/2025_11_02_213840_create_absensis_table.php new file mode 100644 index 00000000..48fee458 --- /dev/null +++ b/database/migrations/2025_11_02_213840_create_absensis_table.php @@ -0,0 +1,32 @@ +id(); + $table->unsignedBigInteger('pegawai_id'); // jika ada relasi ke tabel pegawai + $table->date('tanggal'); + $table->time('jam_masuk')->nullable(); + $table->time('jam_keluar')->nullable(); + $table->string('status'); // hadir, izin, sakit, alpha + $table->timestamps(); + }); + } + + /** + * Hapus tabel absensis jika rollback dilakukan. + */ + public function down(): void + { + Schema::dropIfExists('absensis'); + } +} diff --git a/database/migrations/2025_11_02_230527_add_id_absensi_and_shift_to_absensis_table.php b/database/migrations/2025_11_02_230527_add_id_absensi_and_shift_to_absensis_table.php new file mode 100644 index 00000000..ad2071df --- /dev/null +++ b/database/migrations/2025_11_02_230527_add_id_absensi_and_shift_to_absensis_table.php @@ -0,0 +1,23 @@ +string('id_absensi')->unique()->after('id'); // ID Absensi unik + $table->string('shift')->nullable()->after('jam_keluar'); // Shift bisa null + }); + } + + public function down(): void + { + Schema::table('absensis', function (Blueprint $table) { + $table->dropColumn(['id_absensi', 'shift']); + }); + } +} diff --git a/resources/views/absensi/create.blade.php b/resources/views/absensi/create.blade.php new file mode 100644 index 00000000..41dd3c80 --- /dev/null +++ b/resources/views/absensi/create.blade.php @@ -0,0 +1,58 @@ +@extends('layouts.app') + +@section('content') +
+

Tambah Data Absensi

+
+ @csrf + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + Batal +
+
+@endsection diff --git a/resources/views/absensi/edit.blade.php b/resources/views/absensi/edit.blade.php new file mode 100644 index 00000000..085fbb2f --- /dev/null +++ b/resources/views/absensi/edit.blade.php @@ -0,0 +1,59 @@ +@extends('layouts.app') + +@section('content') +
+

Edit Data Absensi

+
+ @csrf + @method('PUT') + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + Batal +
+
+@endsection diff --git a/resources/views/absensi/index.blade.php b/resources/views/absensi/index.blade.php new file mode 100644 index 00000000..9147499c --- /dev/null +++ b/resources/views/absensi/index.blade.php @@ -0,0 +1,56 @@ +@extends('layouts.app') + +@section('content') +
+

Data Absensi

+ Tambah Absensi + + @if(session('success')) +
{{ session('success') }}
+ @endif + + + + + + + + + + + + + + + + + @foreach ($absensis as $absensi) + + + + + + + + + + + + @endforeach + +
NoID AbsensiPegawai IDTanggalJam MasukJam KeluarShiftStatusAksi
{{ $loop->iteration }}{{ $absensi->id_absensi }}{{ $absensi->pegawai_id }}{{ $absensi->tanggal }}{{ $absensi->jam_masuk }}{{ $absensi->jam_keluar }}{{ $absensi->shift }}{{ $absensi->status }} + Edit +
+ @csrf + @method('DELETE') + +
+
+ + +
+ {{ $absensis->links() }} +
+
+@endsection diff --git a/resources/views/absensi/show.blade.php b/resources/views/absensi/show.blade.php new file mode 100644 index 00000000..0945703f --- /dev/null +++ b/resources/views/absensi/show.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.app') + +@section('content') +
+

Detail Absensi

+ + + + + + + + + + + + + + + + + + + + + + + + + +
ID{{ $absensi->id }}
Pegawai ID{{ $absensi->pegawai_id }}
Tanggal{{ $absensi->tanggal }}
Jam Masuk{{ $absensi->jam_masuk }}
Jam Keluar{{ $absensi->jam_keluar }}
Status{{ ucfirst($absensi->status) }}
+ Kembali +
+@endsection diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a40cf63b..aef2468c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -65,9 +65,6 @@ -

- I forgot my password -

Register a new membership

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 404e2f12..6e2f8e70 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -8,77 +8,102 @@ - {{ config('app.name', 'Laravel') }} + @yield('title', config('app.name', 'Laravel')) - - - - - - - - - - + @vite(['resources/sass/app.scss', 'resources/js/app.js']) -
- + -
- @yield('content') -
+ +
+ @yield('content') +
+
+ + diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index ac9f1f6b..0f27e968 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -40,13 +40,12 @@

{{ __('cart.title') }}

- {{-- -
  • + {{--

  • {{ __('Purchase') }}

     -
    • --}} + --}}
  • @@ -71,6 +70,15 @@

    {{ __('settings.title') }}
    • + + +
  • + + +

    {{ __('Absensi') }}

    +     +
    • +
  • diff --git a/routes/web.php b/routes/web.php index b1980c88..1dc8268d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,6 +8,7 @@ use App\Http\Controllers\PurchaseController; use App\Http\Controllers\SettingController; use App\Http\Controllers\SupplierController; +use App\Http\Controllers\AbsensiController; use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Auth; @@ -25,6 +26,7 @@ Route::resource('customers', CustomerController::class); Route::resource('orders', OrderController::class); Route::resource('suppliers', SupplierController::class); + Route::resource('absensi', AbsensiController::class); Route::get('/cart', [CartController::class, 'index'])->name('cart.index'); Route::post('/cart', [CartController::class, 'store'])->name('cart.store'); From e9ccbad66fe55bb291d25e4cf89b54d4562cea3b Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Mon, 3 Nov 2025 17:04:30 +0700 Subject: [PATCH 03/24] membuat fungsi laporan absensi perubahan 2 --- app/Http/Controllers/AbsensiController.php | 16 +- app/Http/Controllers/LaporanController.php | 115 ++++++++++++ app/Models/Laporan.php | 19 ++ ...025_11_03_080413_create_laporans_table.php | 25 +++ .../2025_11_03_080725_create_gajis_table.php | 29 +++ resources/views/absensi/index.blade.php | 22 ++- resources/views/laporan/create.blade.php | 43 +++++ resources/views/laporan/edit.blade.php | 22 +++ resources/views/laporan/index.blade.php | 74 ++++++++ resources/views/layouts/app.blade.php | 167 ++++++++++++------ .../views/layouts/partials/sidebar.blade.php | 16 +- routes/web.php | 2 + 12 files changed, 477 insertions(+), 73 deletions(-) create mode 100644 app/Http/Controllers/LaporanController.php create mode 100644 app/Models/Laporan.php create mode 100644 database/migrations/2025_11_03_080413_create_laporans_table.php create mode 100644 database/migrations/2025_11_03_080725_create_gajis_table.php create mode 100644 resources/views/laporan/create.blade.php create mode 100644 resources/views/laporan/edit.blade.php create mode 100644 resources/views/laporan/index.blade.php diff --git a/app/Http/Controllers/AbsensiController.php b/app/Http/Controllers/AbsensiController.php index de842255..a55ea3f3 100644 --- a/app/Http/Controllers/AbsensiController.php +++ b/app/Http/Controllers/AbsensiController.php @@ -12,19 +12,21 @@ class AbsensiController extends Controller */ public function index(Request $request) { + // Ambil kata kunci pencarian + $search = $request->input('search'); + + // Query dasar $query = Absensi::query(); - // fitur pencarian - if ($request->has('search')) { - $query->where('status', 'like', "%{$request->search}%") - ->orWhereDate('tanggal', $request->search) - ->orWhere('id_absensi', 'like', "%{$request->search}%") - ->orWhere('shift', 'like', "%{$request->search}%"); + // Jika ada pencarian, filter hanya berdasarkan id_absensi + if (!empty($search)) { + $query->where('id_absensi', 'like', "%{$search}%"); } + // Urutkan berdasarkan tanggal terbaru dan paginasi $absensis = $query->orderBy('tanggal', 'desc')->paginate(10); - return view('absensi.index', compact('absensis')); + return view('absensi.index', compact('absensis', 'search')); } /** diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php new file mode 100644 index 00000000..8ab7783e --- /dev/null +++ b/app/Http/Controllers/LaporanController.php @@ -0,0 +1,115 @@ +input('search'); + + // Query dasar + $query = Laporan::query(); + + // Jika ada pencarian, hanya filter berdasarkan id_laporan + if (!empty($search)) { + $query->where('id_laporan', 'like', "%{$search}%"); + } + + // Urutkan terbaru dan paginasi + $laporans = $query->latest()->paginate(10); + + // Kirim ke view + return view('laporan.index', compact('laporans', 'search')); + } + + /** + * Tampilkan form tambah laporan. + */ + public function create() + { + return view('laporan.create'); + } + + /** + * Simpan laporan baru. + */ + public function store(Request $request) + { + $request->validate([ + 'id_laporan' => 'nullable|string|max:20', + 'id_gaji' => 'nullable|string|max:15', + 'periode' => 'required|string|max:20', + 'tanggal_cetak' => 'required|date', + 'total_gaji' => 'required|numeric', + ]); + + // Generate id laporan otomatis jika kosong + $idLaporan = $request->id_laporan; + if (empty($idLaporan)) { + $last = Laporan::latest('id_laporan')->first(); + $lastNumber = $last ? (int) filter_var($last->id_laporan, FILTER_SANITIZE_NUMBER_INT) : 0; + $idLaporan = 'LAP' . str_pad($lastNumber + 1, 4, '0', STR_PAD_LEFT); + } + + Laporan::create([ + 'id_laporan' => $idLaporan, + 'id_gaji' => $request->id_gaji, + 'periode' => $request->periode, + 'tanggal_cetak' => $request->tanggal_cetak, + 'total_gaji' => $request->total_gaji, + ]); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil ditambahkan.'); + } + + /** + * Tampilkan form edit laporan. + */ + public function edit($id) + { + $laporan = Laporan::findOrFail($id); + return view('laporan.edit', compact('laporan')); + } + + /** + * Perbarui data laporan. + */ + public function update(Request $request, $id) + { + $request->validate([ + 'id_gaji' => 'nullable|string|max:15', + 'periode' => 'required|string|max:20', + 'tanggal_cetak' => 'required|date', + 'total_gaji' => 'required|numeric', + ]); + + $laporan = Laporan::findOrFail($id); + $laporan->update([ + 'id_gaji' => $request->id_gaji, + 'periode' => $request->periode, + 'tanggal_cetak' => $request->tanggal_cetak, + 'total_gaji' => $request->total_gaji, + ]); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil diperbarui.'); + } + + /** + * Hapus laporan. + */ + public function destroy($id) + { + $laporan = Laporan::findOrFail($id); + $laporan->delete(); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil dihapus.'); + } +} diff --git a/app/Models/Laporan.php b/app/Models/Laporan.php new file mode 100644 index 00000000..a268b57e --- /dev/null +++ b/app/Models/Laporan.php @@ -0,0 +1,19 @@ +id('id_laporan'); // Auto increment primary key + $table->unsignedBigInteger('id_gaji')->nullable(); // Relasi ke tabel gaji, boleh kosong + $table->string('periode', 20); + $table->date('tanggal_cetak'); + $table->float('total_gaji'); + $table->timestamps(); + }); + } + + public function down(): void + { + Schema::dropIfExists('laporans'); + } +}; diff --git a/database/migrations/2025_11_03_080725_create_gajis_table.php b/database/migrations/2025_11_03_080725_create_gajis_table.php new file mode 100644 index 00000000..fa175579 --- /dev/null +++ b/database/migrations/2025_11_03_080725_create_gajis_table.php @@ -0,0 +1,29 @@ +id('id_gaji'); // Primary key unik untuk tabel gajis + $table->string('nama_karyawan'); // Nama karyawan + $table->decimal('jumlah_gaji', 10, 2); // Jumlah gaji (format desimal) + $table->timestamps(); // created_at dan updated_at + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('gajis'); + } +}; diff --git a/resources/views/absensi/index.blade.php b/resources/views/absensi/index.blade.php index 9147499c..f7c04445 100644 --- a/resources/views/absensi/index.blade.php +++ b/resources/views/absensi/index.blade.php @@ -3,7 +3,19 @@ @section('content')

    Data Absensi

    -     Tambah Absensi + +
    + Tambah Absensi + + + +
    @if(session('success'))
    {{ session('success') }}
    @@ -24,7 +36,7 @@ - @foreach ($absensis as $absensi) + @forelse ($absensis as $absensi) {{ $loop->iteration }} {{ $absensi->id_absensi }} @@ -44,7 +56,11 @@ - @endforeach + @empty + + Data tidak ditemukan. + + @endforelse diff --git a/resources/views/laporan/create.blade.php b/resources/views/laporan/create.blade.php new file mode 100644 index 00000000..4a271905 --- /dev/null +++ b/resources/views/laporan/create.blade.php @@ -0,0 +1,43 @@ +@extends('layouts.app') + +@section('content') +
    +

    Tambah Laporan

    + +
    + @csrf + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + + +
    +
    +@endsection diff --git a/resources/views/laporan/edit.blade.php b/resources/views/laporan/edit.blade.php new file mode 100644 index 00000000..1abe0ef6 --- /dev/null +++ b/resources/views/laporan/edit.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.app') + +@section('content') +

    Edit Laporan

    +
    + @csrf + @method('PUT') + + + + + + + + + + + + + +
    +@endsection diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php new file mode 100644 index 00000000..bfda0b4c --- /dev/null +++ b/resources/views/laporan/index.blade.php @@ -0,0 +1,74 @@ +@extends('layouts.app') + +@section('content') +
    +

    Daftar Laporan Absensi

    + +
    + + Tambah Laporan + + +
    + +
    +
    + + +
    + + + + + + + + + + + + + @forelse($laporans as $laporan) + + + + + + + + + @empty + + + + @endforelse + +
    ID LaporanID GajiPeriodeTanggal CetakTotal GajiAksi
    {{ $laporan->id_laporan }}{{ $laporan->id_gaji }}{{ $laporan->periode }}{{ $laporan->tanggal_cetak }}{{ number_format($laporan->total_gaji, 0, ',', '.') }} + Edit +
    + @csrf + @method('DELETE') + +
    +
    Tidak ada data laporan.
    +
    + + +
    + {{ $laporans->links() }} +
    +
    +@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6e2f8e70..9aa2a187 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -12,32 +12,103 @@ @vite(['resources/sass/app.scss', 'resources/js/app.js']) + +
    -
    - - - diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 0f27e968..b4e3152a 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -40,12 +40,6 @@

    {{ __('cart.title') }}

    • - {{--
  • - - -

    {{ __('Purchase') }}

    -     -
    • --}}
  • @@ -71,7 +65,7 @@
    • - +
  • @@ -79,6 +73,14 @@
    • + +
  • + + +

    {{ __('Laporan') }}

    +     +
    • +
  • diff --git a/routes/web.php b/routes/web.php index 1dc8268d..3a6fb49c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -9,6 +9,7 @@ use App\Http\Controllers\SettingController; use App\Http\Controllers\SupplierController; use App\Http\Controllers\AbsensiController; +use App\Http\Controllers\LaporanController; use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Auth; @@ -27,6 +28,7 @@ Route::resource('orders', OrderController::class); Route::resource('suppliers', SupplierController::class); Route::resource('absensi', AbsensiController::class); + Route::resource('laporan', LaporanController::class); Route::get('/cart', [CartController::class, 'index'])->name('cart.index'); Route::post('/cart', [CartController::class, 'store'])->name('cart.store'); From 491f869c0604c70c34c7558145663f3e42d51f6f Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 4 Nov 2025 01:26:21 +0700 Subject: [PATCH 04/24] perubahan dashboard --- app/Http/Controllers/AbsensiController.php | 10 +- app/Http/Controllers/LaporanController.php | 167 +++++--- app/Models/Laporan.php | 9 +- ...025_11_03_080413_create_laporans_table.php | 31 +- ...3_171450_add_tanggal_to_laporans_table.php | 28 ++ ...800_add_kode_laporan_to_laporans_table.php | 28 ++ resources/views/absensi/create.blade.php | 2 +- resources/views/absensi/edit.blade.php | 2 +- resources/views/absensi/index.blade.php | 38 +- resources/views/absensi/show.blade.php | 2 +- resources/views/home.blade.php | 404 ++++++++---------- resources/views/laporan/create.blade.php | 2 +- resources/views/laporan/edit.blade.php | 4 +- resources/views/laporan/import.blade.php | 7 + resources/views/laporan/index.blade.php | 155 ++++--- resources/views/laporan/show.blade.php | 31 ++ resources/views/layouts/admin.blade.php | 17 +- routes/web.php | 32 +- 18 files changed, 587 insertions(+), 382 deletions(-) create mode 100644 database/migrations/2025_11_03_171450_add_tanggal_to_laporans_table.php create mode 100644 database/migrations/2025_11_03_181800_add_kode_laporan_to_laporans_table.php create mode 100644 resources/views/laporan/import.blade.php create mode 100644 resources/views/laporan/show.blade.php diff --git a/app/Http/Controllers/AbsensiController.php b/app/Http/Controllers/AbsensiController.php index a55ea3f3..1a6a83cd 100644 --- a/app/Http/Controllers/AbsensiController.php +++ b/app/Http/Controllers/AbsensiController.php @@ -24,8 +24,12 @@ public function index(Request $request) } // Urutkan berdasarkan tanggal terbaru dan paginasi - $absensis = $query->orderBy('tanggal', 'desc')->paginate(10); + // Tambahkan withQueryString() agar pagination tetap membawa parameter pencarian + $absensis = $query->orderBy('tanggal', 'desc') + ->paginate(10) + ->withQueryString(); + // Kirim data ke view return view('absensi.index', compact('absensis', 'search')); } @@ -42,7 +46,7 @@ public function create() */ public function store(Request $request) { - // validasi input + // Validasi input $validated = $request->validate([ 'id_absensi' => 'required|string|unique:absensis,id_absensi', 'pegawai_id' => 'required|integer', @@ -53,7 +57,7 @@ public function store(Request $request) 'status' => 'required|string', ]); - // simpan data yang tervalidasi + // Simpan data yang tervalidasi Absensi::create($validated); return redirect()->route('absensi.index') diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 8ab7783e..ed9cb8e9 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -4,38 +4,79 @@ use App\Models\Laporan; use Illuminate\Http\Request; +use Carbon\Carbon; class LaporanController extends Controller { /** - * Tampilkan daftar laporan. + * Menampilkan daftar laporan (default dan dengan pencarian). */ public function index(Request $request) { - // Ambil kata kunci pencarian dari input - $search = $request->input('search'); - - // Query dasar $query = Laporan::query(); - // Jika ada pencarian, hanya filter berdasarkan id_laporan - if (!empty($search)) { - $query->where('id_laporan', 'like', "%{$search}%"); + // Fitur pencarian berdasarkan kode laporan + if ($request->has('search') && $request->search != '') { + $query->where('kode', 'like', '%' . $request->search . '%'); } - // Urutkan terbaru dan paginasi - $laporans = $query->latest()->paginate(10); + // Urutkan dari yang terbaru + $laporans = $query->orderBy('created_at', 'desc')->paginate(10); + + // Hitung total + $income = $laporans->sum('total_pendapatan'); + $outcome = $laporans->sum('total_pengeluaran'); + $transactions = $laporans->count(); - // Kirim ke view - return view('laporan.index', compact('laporans', 'search')); + return view('laporan.index', compact('laporans', 'income', 'outcome', 'transactions')); } + public function destroy($id) +{ + $laporan = Laporan::findOrFail($id); + $laporan->delete(); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil dihapus.'); +} + + public function show($id) +{ + $laporan = Laporan::findOrFail($id); + return view('laporan.show', compact('laporan')); +} + /** - * Tampilkan form tambah laporan. + * Menampilkan laporan berdasarkan filter waktu. */ - public function create() + public function filter($periode) { - return view('laporan.create'); + $today = Carbon::today(); + + switch ($periode) { + case 'today': + $laporans = Laporan::whereDate('created_at', $today)->get(); + break; + case 'week': + $laporans = Laporan::whereBetween('created_at', [ + $today->copy()->startOfWeek(), + $today->copy()->endOfWeek() + ])->get(); + break; + case 'month': + $laporans = Laporan::whereMonth('created_at', $today->month) + ->whereYear('created_at', $today->year) + ->get(); + break; + default: + $laporans = Laporan::orderBy('created_at', 'desc')->get(); + break; + } + + $income = $laporans->sum('total_pendapatan'); + $outcome = $laporans->sum('total_pengeluaran'); + $transactions = $laporans->count(); + + return view('laporan.index', compact('laporans', 'income', 'outcome', 'transactions')); } /** @@ -44,72 +85,66 @@ public function create() public function store(Request $request) { $request->validate([ - 'id_laporan' => 'nullable|string|max:20', - 'id_gaji' => 'nullable|string|max:15', - 'periode' => 'required|string|max:20', - 'tanggal_cetak' => 'required|date', - 'total_gaji' => 'required|numeric', + 'kode' => 'required|string|max:20|unique:laporans,kode', ]); - // Generate id laporan otomatis jika kosong - $idLaporan = $request->id_laporan; - if (empty($idLaporan)) { - $last = Laporan::latest('id_laporan')->first(); - $lastNumber = $last ? (int) filter_var($last->id_laporan, FILTER_SANITIZE_NUMBER_INT) : 0; - $idLaporan = 'LAP' . str_pad($lastNumber + 1, 4, '0', STR_PAD_LEFT); - } - Laporan::create([ - 'id_laporan' => $idLaporan, - 'id_gaji' => $request->id_gaji, - 'periode' => $request->periode, - 'tanggal_cetak' => $request->tanggal_cetak, - 'total_gaji' => $request->total_gaji, + 'kode' => $request->kode, + 'pegawai' => auth()->user()->name ?? 'Unknown', + 'total_pendapatan' => 0, + 'total_pengeluaran' => 0, ]); - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil ditambahkan.'); + return redirect()->back()->with('success', 'Laporan baru berhasil ditambahkan.'); } /** - * Tampilkan form edit laporan. + * Import data laporan dari file CSV. */ - public function edit($id) - { - $laporan = Laporan::findOrFail($id); - return view('laporan.edit', compact('laporan')); - } - - /** - * Perbarui data laporan. - */ - public function update(Request $request, $id) + public function import(Request $request) { $request->validate([ - 'id_gaji' => 'nullable|string|max:15', - 'periode' => 'required|string|max:20', - 'tanggal_cetak' => 'required|date', - 'total_gaji' => 'required|numeric', + 'csv_file' => 'required|mimes:csv,txt|max:2048', ]); - $laporan = Laporan::findOrFail($id); - $laporan->update([ - 'id_gaji' => $request->id_gaji, - 'periode' => $request->periode, - 'tanggal_cetak' => $request->tanggal_cetak, - 'total_gaji' => $request->total_gaji, - ]); + $file = $request->file('csv_file'); + $path = $file->getRealPath(); + $data = array_map('str_getcsv', file($path)); + $header = array_shift($data); + + foreach ($data as $row) { + $rowData = array_combine($header, $row); + + Laporan::updateOrCreate( + ['kode' => $rowData['kode']], + [ + 'pegawai' => $rowData['pegawai'] ?? 'Unknown', + 'total_pendapatan' => $rowData['total_pendapatan'] ?? 0, + 'total_pengeluaran' => $rowData['total_pengeluaran'] ?? 0, + ] + ); + } - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil diperbarui.'); + return redirect()->back()->with('success', 'Data laporan berhasil diimport.'); } - /** - * Hapus laporan. - */ - public function destroy($id) - { - $laporan = Laporan::findOrFail($id); - $laporan->delete(); + public function edit($id) +{ + $laporan = Laporan::findOrFail($id); + return view('laporan.edit', compact('laporan')); +} + +public function update(Request $request, $id) +{ + $laporan = Laporan::findOrFail($id); + $laporan->id_gaji = $request->id_gaji; + $laporan->periode = $request->periode; + $laporan->tanggal_cetak = $request->tanggal_cetak; + $laporan->total_gaji = $request->total_gaji; + $laporan->save(); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil diperbarui.'); +} + - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil dihapus.'); - } } diff --git a/app/Models/Laporan.php b/app/Models/Laporan.php index a268b57e..d253a1d5 100644 --- a/app/Models/Laporan.php +++ b/app/Models/Laporan.php @@ -11,9 +11,10 @@ class Laporan extends Model protected $primaryKey = 'id_laporan'; protected $fillable = [ - 'id_gaji', - 'periode', - 'tanggal_cetak', - 'total_gaji', + 'id_gaji', + 'periode', + 'tanggal_cetak', + 'total_gaji', ]; + } diff --git a/database/migrations/2025_11_03_080413_create_laporans_table.php b/database/migrations/2025_11_03_080413_create_laporans_table.php index 58ef095b..87f5212e 100644 --- a/database/migrations/2025_11_03_080413_create_laporans_table.php +++ b/database/migrations/2025_11_03_080413_create_laporans_table.php @@ -9,17 +9,28 @@ public function up(): void { Schema::create('laporans', function (Blueprint $table) { - $table->id('id_laporan'); // Auto increment primary key - $table->unsignedBigInteger('id_gaji')->nullable(); // Relasi ke tabel gaji, boleh kosong - $table->string('periode', 20); - $table->date('tanggal_cetak'); - $table->float('total_gaji'); + $table->id('id_laporan'); // primary key, jangan diubah + $table->string('kode_laporan')->unique(); // kode yang bisa diedit + $table->string('id_gaji'); + $table->string('periode'); + $table->date('tanggal_cetak')->nullable(); + $table->decimal('total_gaji', 15, 2)->default(0); $table->timestamps(); }); - } - public function down(): void - { - Schema::dropIfExists('laporans'); } -}; + + public function up() +{ + Schema::table('laporans', function (Blueprint $table) { + $table->string('kode_laporan')->unique()->after('id_laporan'); + }); +} + +public function down() +{ + Schema::table('laporans', function (Blueprint $table) { + $table->dropColumn('kode_laporan'); + }); +} + diff --git a/database/migrations/2025_11_03_171450_add_tanggal_to_laporans_table.php b/database/migrations/2025_11_03_171450_add_tanggal_to_laporans_table.php new file mode 100644 index 00000000..bb4fa8e5 --- /dev/null +++ b/database/migrations/2025_11_03_171450_add_tanggal_to_laporans_table.php @@ -0,0 +1,28 @@ + diff --git a/resources/views/absensi/edit.blade.php b/resources/views/absensi/edit.blade.php index 085fbb2f..2b2d20a2 100644 --- a/resources/views/absensi/edit.blade.php +++ b/resources/views/absensi/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content')
    diff --git a/resources/views/absensi/index.blade.php b/resources/views/absensi/index.blade.php index f7c04445..8f901550 100644 --- a/resources/views/absensi/index.blade.php +++ b/resources/views/absensi/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content')
    @@ -38,7 +38,7 @@ @forelse ($absensis as $absensi) - {{ $loop->iteration }} + {{ $loop->iteration + ($absensis->currentPage() - 1) * $absensis->perPage() }} {{ $absensi->id_absensi }} {{ $absensi->pegawai_id }} {{ $absensi->tanggal }} @@ -64,9 +64,37 @@ - -
    - {{ $absensis->links() }} + +
    +
    + Menampilkan {{ $absensis->firstItem() ?? 0 }} - {{ $absensis->lastItem() ?? 0 }} dari total {{ $absensis->total() }} data +
    + +
    @endsection diff --git a/resources/views/absensi/show.blade.php b/resources/views/absensi/show.blade.php index 0945703f..01f359d4 100644 --- a/resources/views/absensi/show.blade.php +++ b/resources/views/absensi/show.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content')
    diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index bd12183f..8d25e360 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,228 +1,198 @@ @extends('layouts.admin') -@section('content-header', __('dashboard.title')) +@section('content-header', 'Dashboard') + @section('content')
    -
    -
    - -
    -
    -

    {{$orders_count}}

    -

    {{ __('dashboard.Orders_Count') }}

    -
    -
    - -
    - {{ __('common.More_info') }} -
    + + {{-- ======== Top Summary Cards ======== --}} +
    +
    +
    +
    +

    PENGELUARAN (OUTCOME)

    +

    Rp. {{ number_format($outcome ?? 0, 0, ',', '.') }}

    +
    - -
    - -
    -
    -

    {{config('settings.currency_symbol')}} {{number_format($income, 2)}}

    -

    {{ __('dashboard.Income') }}

    -
    -
    - -
    - {{ __('common.More_info') }} -
    +
    +
    +
    +
    +

    PENDAPATAN (INCOME)

    +

    Rp. {{ number_format($income ?? 0, 0, ',', '.') }}

    +
    - -
    - -
    -
    -

    {{config('settings.currency_symbol')}} {{number_format($income_today, 2)}}

    -

    {{ __('dashboard.Income_Today') }}

    -
    -
    - -
    - {{ __('common.More_info') }} -
    +
    +
    +
    +
    +

    JUMLAH TRANSAKSI

    +

    {{ $transactions ?? 0 }}

    +
    - -
    - -
    -
    -

    {{$customers_count}}

    -

    {{ __('dashboard.Customers_Count') }}

    -
    -
    - -
    - {{ __('common.More_info') }} -
    +
    +
    + + {{-- ======== Filter + Buttons ======== --}} +
    +
    + + +
    + +
    + + + Tampil Semua +
    +
    + + {{-- ======== Chart Section ======== --}} +
    +
    +
    Sales Analytics
    + +
    +
    + + {{-- ======== List Laporan ======== --}} + @if(isset($laporans) && count($laporans) > 0) +
    +
    +
    List Laporan
    + + +
    + + + + + + + + + + + + + @foreach($laporans as $i => $laporan) + + + + + + + + + @endforeach + +
    NoKodeTanggalPegawaiTotal PendapatanAksi
    {{ $i+1 }}{{ $laporan->kode }}{{ $laporan->tanggal }}{{ $laporan->pegawai }}Rp. {{ number_format($laporan->total_pendapatan, 0, ',', '.') }} + + + +
    - -
    +
    +
    + @endif +
    -
    -
    -
    -

    Low Stock Product

    -
    -
    -
    - - - - - - - - - - - - - - - - @foreach ($low_stock_products as $product) - - - - - - - - - - - @endforeach - -
    IDNameImageBarcodePriceQuantityStatusUpdated At
    {{$product->id}}{{$product->name}}{{$product->barcode}}{{$product->price}}{{$product->quantity}} - {{$product->status ? __('common.Active') : __('common.Inactive') }} - {{$product->updated_at}}
    -
    -
    -
    -
    -
    -

    Hot Products

    -
    -
    -
    - - - - - - - - - - - - - - - - @foreach ($current_month_products as $product) - - - - - - - - - - - @endforeach - -
    IDNameImageBarcodePriceQuantityStatusUpdated At
    {{$product->id}}{{$product->name}}{{$product->barcode}}{{$product->price}}{{$product->quantity}} - {{$product->status ? __('common.Active') : __('common.Inactive') }} - {{$product->updated_at}}
    -
    -
    -
    + +{{-- ======== Modal Tambah Laporan ======== --}} + -@endsection + +{{-- ======== Script Section ======== --}} +@push('scripts') + + +@endpush +@endsection \ No newline at end of file diff --git a/resources/views/laporan/create.blade.php b/resources/views/laporan/create.blade.php index 4a271905..cec723d2 100644 --- a/resources/views/laporan/create.blade.php +++ b/resources/views/laporan/create.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content')
    diff --git a/resources/views/laporan/edit.blade.php b/resources/views/laporan/edit.blade.php index 1abe0ef6..70e0d552 100644 --- a/resources/views/laporan/edit.blade.php +++ b/resources/views/laporan/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content')

    Edit Laporan

    @@ -7,7 +7,7 @@ @method('PUT') - + diff --git a/resources/views/laporan/import.blade.php b/resources/views/laporan/import.blade.php new file mode 100644 index 00000000..37aefc6e --- /dev/null +++ b/resources/views/laporan/import.blade.php @@ -0,0 +1,7 @@ +@extends('layouts.admin') +@section('content') +
    +

    Import Laporan

    +

    Halaman ini untuk fitur import laporan (belum diimplementasikan).

    +
    +@endsection diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index bfda0b4c..0a919826 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -1,74 +1,117 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('content') -
    -

    Daftar Laporan Absensi

    +
    +

    List Laporan

    -
    - - Tambah Laporan + +
    +
    + +
    - -
    - -
    -
    - - -
    - - - - + +
    ID Laporan
    + + + - + - + - @forelse($laporans as $laporan) - - - - - - - - + @forelse ($laporans as $laporan) + + + + + + + + @empty - - - + + + @endforelse
    No ID GajiPeriode Tanggal CetakPegawai Total GajiAksiAksi
    {{ $laporan->id_laporan }}{{ $laporan->id_gaji }}{{ $laporan->periode }}{{ $laporan->tanggal_cetak }}{{ number_format($laporan->total_gaji, 0, ',', '.') }} - Edit -
    - @csrf - @method('DELETE') - -
    -
    {{ ($laporans->currentPage() - 1) * $laporans->perPage() + $loop->iteration }}{{ $laporan->id_gaji }} + @if($laporan->tanggal_cetak) + {{ \Carbon\Carbon::parse($laporan->tanggal_cetak)->format('d/m/Y') }} + @else + - + @endif + {{ $laporan->pegawai->nama ?? '-' }}Rp {{ number_format($laporan->total_gaji ?? 0, 0, ',', '.') }} + + Ubah + + +
    + @csrf + @method('DELETE') + +
    + + + Detail + +
    Tidak ada data laporan.
    + Data laporan tidak ditemukan. +
    -
    - -
    - {{ $laporans->links() }} + +
    +
    + Menampilkan {{ $laporans->firstItem() ?? 0 }} - {{ $laporans->lastItem() ?? 0 }} dari total {{ $laporans->total() }} data +
    + + +
    @endsection diff --git a/resources/views/laporan/show.blade.php b/resources/views/laporan/show.blade.php new file mode 100644 index 00000000..4cb6219f --- /dev/null +++ b/resources/views/laporan/show.blade.php @@ -0,0 +1,31 @@ +@extends('layouts.admin') + +@section('content') +
    +

    Detail Laporan

    + +
    + + + + + + + + + + + + + + + + + + +
    Kode Laporan{{ $laporan->id_laporan }}
    Tanggal Cetak{{ $laporan->tanggal_cetak ? \Carbon\Carbon::parse($laporan->tanggal_cetak)->format('d/m/Y') : '-' }}
    Pegawai{{ $laporan->pegawai->nama ?? '-' }}
    Total GajiRp {{ number_format($laporan->total_gaji ?? 0, 0, ',', '.') }}
    + + Kembali +
    +
    +@endsection diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index cfac0636..c2e9c4d1 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -7,21 +7,19 @@ @yield('title', config('app.name')) - - - - + + @vite(['resources/sass/app.scss', 'resources/js/app.js']) @yield('css') @@ -31,6 +29,7 @@ @include('layouts.partials.navbar') @include('layouts.partials.sidebar') +
    @@ -53,7 +52,6 @@ @include('layouts.partials.alert.error') @yield('content') -
    @@ -66,8 +64,9 @@
    - + + @yield('js') @yield('model') diff --git a/routes/web.php b/routes/web.php index 3a6fb49c..cc626887 100644 --- a/routes/web.php +++ b/routes/web.php @@ -20,38 +20,58 @@ Auth::routes(); Route::prefix('admin')->middleware(['auth', 'locale'])->group(function () { + Route::get('/', [HomeController::class, 'index'])->name('home'); + Route::get('/settings', [SettingController::class, 'index'])->name('settings.index'); Route::post('/settings', [SettingController::class, 'store'])->name('settings.store'); + Route::resource('products', ProductController::class); Route::resource('customers', CustomerController::class); Route::resource('orders', OrderController::class); Route::resource('suppliers', SupplierController::class); Route::resource('absensi', AbsensiController::class); - Route::resource('laporan', LaporanController::class); + // --- Laporan --- + Route::prefix('laporan')->group(function () { + Route::get('/', [LaporanController::class, 'index'])->name('laporan.index'); + Route::get('/filter/{periode}', [LaporanController::class, 'filter'])->name('laporan.filter'); + Route::post('/import', [LaporanController::class, 'import'])->name('laporan.import'); + Route::post('/store', [LaporanController::class, 'store'])->name('laporan.store'); + Route::get('/{id}', [LaporanController::class, 'show'])->name('laporan.show'); // <-- Tambahkan ini + Route::get('/{id}/edit', [LaporanController::class, 'edit'])->name('laporan.edit'); + Route::put('/{id}', [LaporanController::class, 'update'])->name('laporan.update'); + Route::delete('/{id}', [LaporanController::class, 'destroy'])->name('laporan.destroy'); + Route::put('/laporan/{id}', [LaporanController::class, 'update'])->name('laporan.update'); +}); + + + + // --- Cart --- Route::get('/cart', [CartController::class, 'index'])->name('cart.index'); Route::post('/cart', [CartController::class, 'store'])->name('cart.store'); Route::post('/cart/change-qty', [CartController::class, 'changeQty']); Route::delete('/cart/delete', [CartController::class, 'delete']); Route::delete('/cart/empty', [CartController::class, 'empty']); + // --- Purchase --- Route::get('/purchase', [PurchaseController::class, 'index'])->name('purchase.cart.index'); + + // --- Partial Payment --- Route::post('/orders/partial-payment', [OrderController::class, 'partialPayment'])->name('orders.partial-payment'); + // --- Locale & Language Switch --- Route::get('/locale/{type}', function ($type) { - $translations = trans($type); - return response()->json($translations); + return response()->json(trans($type)); }); Route::get('/lang-switch/{lang}', function ($lang) { $supportedLocales = ['en', 'es']; - if (in_array($lang, $supportedLocales)) { session(['locale' => $lang]); app()->setLocale($lang); } - return redirect()->back(); })->name('lang.switch'); -}); + +}); \ No newline at end of file From 118107388962da15d56a23ee9d16d6078a29ab6f Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 4 Nov 2025 01:36:29 +0700 Subject: [PATCH 05/24] perubahan terakhir minggu 1 --- app/Http/Controllers/LaporanController.php | 2 +- resources/views/home.blade.php | 3 ++- resources/views/laporan/show.blade.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index ed9cb8e9..35a33a89 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -17,7 +17,7 @@ public function index(Request $request) // Fitur pencarian berdasarkan kode laporan if ($request->has('search') && $request->search != '') { - $query->where('kode', 'like', '%' . $request->search . '%'); + $query->where('id_gaji', 'like', '%' . $request->search . '%'); } // Urutkan dari yang terbaru diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 8d25e360..bb9e8d5a 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -40,13 +40,14 @@ +
    - Tampil Semua + Tampil Semua
    diff --git a/resources/views/laporan/show.blade.php b/resources/views/laporan/show.blade.php index 4cb6219f..6635c3ef 100644 --- a/resources/views/laporan/show.blade.php +++ b/resources/views/laporan/show.blade.php @@ -25,7 +25,7 @@ - Kembali + Cetak Laporan
    @endsection From 7835f16f6b4379768d2c3f6e9e3ede85d98d3437 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 4 Nov 2025 01:46:03 +0700 Subject: [PATCH 06/24] perubahan minggu 9 terakhir --- resources/views/layouts/app.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 9aa2a187..8d011da6 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -118,7 +118,14 @@
    + {{-- ======== Success Message ======== --}} + @if(session('success')) + + @endif + {{-- ======== Chart Section ======== --}}
    @@ -71,7 +79,7 @@ No - Kode + ID Gaji Tanggal Pegawai Total Pendapatan @@ -82,7 +90,7 @@ @foreach($laporans as $i => $laporan) {{ $i+1 }} - {{ $laporan->kode }} + {{ $laporan->id_gaji }} {{ $laporan->tanggal }} {{ $laporan->pegawai }} Rp. {{ number_format($laporan->total_pendapatan, 0, ',', '.') }} @@ -98,6 +106,10 @@
    + @else +
    +

    Belum ada laporan yang tersedia.

    +
    @endif
    @@ -107,10 +119,13 @@
    -
    Kode Laporan
    +
    Tambah Laporan
    @csrf - +
    + + +
    @@ -196,4 +211,4 @@ } @endpush -@endsection \ No newline at end of file +@endsection From f0268c3f2460ee5b7a72530276ac646f63dc7a19 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 4 Nov 2025 13:41:59 +0700 Subject: [PATCH 08/24] penambahan id laporan --- app/Http/Controllers/LaporanController.php | 86 +++++++++++----------- resources/views/laporan/index.blade.php | 4 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index b3eae3e1..c66cd8cb 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -16,9 +16,12 @@ public function index(Request $request) { $query = Laporan::query(); - // Fitur pencarian berdasarkan kode laporan + // Fitur pencarian berdasarkan ID Laporan atau ID Gaji if ($request->has('search') && $request->search != '') { - $query->where('id_gaji', 'like', '%' . $request->search . '%'); + $query->where(function ($q) use ($request) { + $q->where('id_laporan', 'like', '%' . $request->search . '%') + ->orWhere('id_gaji', 'like', '%' . $request->search . '%'); + }); } // Urutkan dari yang terbaru @@ -33,18 +36,18 @@ public function index(Request $request) } public function destroy($id) -{ - $laporan = Laporan::findOrFail($id); - $laporan->delete(); + { + $laporan = Laporan::findOrFail($id); + $laporan->delete(); - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil dihapus.'); -} + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil dihapus.'); + } public function show($id) -{ - $laporan = Laporan::findOrFail($id); - return view('laporan.show', compact('laporan')); -} + { + $laporan = Laporan::findOrFail($id); + return view('laporan.show', compact('laporan')); + } /** * Menampilkan laporan berdasarkan filter waktu. @@ -84,25 +87,22 @@ public function filter($periode) * Simpan laporan baru. */ public function store(Request $request) -{ - $validated = $request->validate([ - 'id_gaji' => 'required|exists:gajis,id_gaji', - ]); - - $gaji = Gaji::find($validated['id_gaji']); - - $laporan = Laporan::create([ - 'id_gaji' => $gaji->id_gaji, - 'tanggal_cetak' => now(), - 'total_gaji' => $gaji->total_gaji ?? 0, - 'periode' => $gaji->periode ?? now()->format('F Y'), - ]); - - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil ditambahkan!'); -} + { + $validated = $request->validate([ + 'id_gaji' => 'required|exists:gajis,id_gaji', + ]); + $gaji = Gaji::find($validated['id_gaji']); + $laporan = Laporan::create([ + 'id_gaji' => $gaji->id_gaji, + 'tanggal_cetak' => now(), + 'total_gaji' => $gaji->total_gaji ?? 0, + 'periode' => $gaji->periode ?? now()->format('F Y'), + ]); + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil ditambahkan!'); + } /** * Import data laporan dari file CSV. @@ -135,22 +135,20 @@ public function import(Request $request) } public function edit($id) -{ - $laporan = Laporan::findOrFail($id); - return view('laporan.edit', compact('laporan')); -} - -public function update(Request $request, $id) -{ - $laporan = Laporan::findOrFail($id); - $laporan->id_gaji = $request->id_gaji; - $laporan->periode = $request->periode; - $laporan->tanggal_cetak = $request->tanggal_cetak; - $laporan->total_gaji = $request->total_gaji; - $laporan->save(); - - return redirect()->route('laporan.index')->with('success', 'Laporan berhasil diperbarui.'); -} - + { + $laporan = Laporan::findOrFail($id); + return view('laporan.edit', compact('laporan')); + } + public function update(Request $request, $id) + { + $laporan = Laporan::findOrFail($id); + $laporan->id_gaji = $request->id_gaji; + $laporan->periode = $request->periode; + $laporan->tanggal_cetak = $request->tanggal_cetak; + $laporan->total_gaji = $request->total_gaji; + $laporan->save(); + + return redirect()->route('laporan.index')->with('success', 'Laporan berhasil diperbarui.'); + } } diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 0a919826..1e861aa8 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -25,6 +25,7 @@ class="form-control" No + ID Laporan ID Gaji Tanggal Cetak Pegawai @@ -36,6 +37,7 @@ class="form-control" @forelse ($laporans as $laporan) {{ ($laporans->currentPage() - 1) * $laporans->perPage() + $loop->iteration }} + {{ $laporan->id_laporan }} {{ $laporan->id_gaji }} @if($laporan->tanggal_cetak) @@ -75,7 +77,7 @@ class="btn btn-sm text-white" @empty - + Data laporan tidak ditemukan. From 3ba316f5d6b9c9d976c510bf06dde2bc9a12cbeb Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 4 Nov 2025 14:21:49 +0700 Subject: [PATCH 09/24] id baru --- resources/views/laporan/index.blade.php | 8 ++++---- resources/views/laporan/show.blade.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php index 1e861aa8..83109e9d 100644 --- a/resources/views/laporan/index.blade.php +++ b/resources/views/laporan/index.blade.php @@ -25,8 +25,8 @@ class="form-control" No - ID Laporan - ID Gaji + + ID Laporan Tanggal Cetak Pegawai Total Gaji @@ -37,7 +37,7 @@ class="form-control" @forelse ($laporans as $laporan) {{ ($laporans->currentPage() - 1) * $laporans->perPage() + $loop->iteration }} - {{ $laporan->id_laporan }} + {{ $laporan->id_gaji }} @if($laporan->tanggal_cetak) @@ -77,7 +77,7 @@ class="btn btn-sm text-white" @empty - + Data laporan tidak ditemukan. diff --git a/resources/views/laporan/show.blade.php b/resources/views/laporan/show.blade.php index 6635c3ef..78e42f2b 100644 --- a/resources/views/laporan/show.blade.php +++ b/resources/views/laporan/show.blade.php @@ -7,8 +7,8 @@
    - - + + From 11e74b71cbc8289c44927455aa21dd48aec2e091 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 11 Nov 2025 00:30:54 +0700 Subject: [PATCH 10/24] login mantap --- app/Http/Controllers/Auth/LoginController.php | 15 +- public/images/background.jpg | Bin 0 -> 53118 bytes resources/views/auth/login.blade.php | 237 +++++++++++---- resources/views/auth/register.blade.php | 287 +++++++++++++----- resources/views/layouts/auth.blade.php | 36 +-- routes/web.php | 24 +- 6 files changed, 413 insertions(+), 186 deletions(-) create mode 100644 public/images/background.jpg diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 32a88f7c..68c1a71e 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -38,15 +38,28 @@ public function __construct() $this->middleware('auth')->only('logout'); } + /** + * Show the application's login form. + * Use the custom Blade view: resources/views/auth/login.blade.php + */ + public function showLoginForm() + { + return view('auth.login'); + } /** * Get the post-login redirect path. + * + * @return string */ public function redirectPath(): string { if (method_exists($this, 'redirectTo')) { return $this->redirectTo(); } - return property_exists($this, 'redirectTo') ? $this->redirectTo : '/admin'; + + return property_exists($this, 'redirectTo') + ? $this->redirectTo + : '/admin'; } } diff --git a/public/images/background.jpg b/public/images/background.jpg new file mode 100644 index 0000000000000000000000000000000000000000..087feac4e361eade8b7674b7a686810f1459ab66 GIT binary patch literal 53118 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 Zr7=L-c + :root { + --green-dark: #1f3d34; + --radius: 20px; + --shadow: 0 10px 30px rgba(0, 0, 0, 0.08), 0 2px 6px rgba(0, 0, 0, 0.06); + } + + body { + margin: 0; + height: 100vh; + background: url('{{ asset('images/background.jpg') }}') no-repeat center center fixed; + background-size: cover; + display: flex; + justify-content: center; + align-items: center; + font-family: "Poppins", sans-serif; + } + + .login-container { + text-align: center; + } + + /* Logo Pill */ + .logo-box { + background-color: var(--green-dark); + color: white; + width: 220px; + padding: 25px 0; + border-radius: 40px; + margin: 0 auto 30px auto; + box-shadow: var(--shadow); + } + + .logo-box h1 { + font-size: 42px; + font-weight: 700; + margin: 0; + letter-spacing: 1px; + } + + .logo-box span { + display: block; + font-size: 13px; + letter-spacing: 3px; + margin-top: 5px; + } + + /* Login Card */ + .login-box { + background: rgba(255, 255, 255, 0.85); + border: 1px solid #dfe6e2; + border-radius: var(--radius); + padding: 35px 40px; + box-shadow: var(--shadow); + width: 400px; + text-align: left; + backdrop-filter: blur(6px); + } + + .login-box h2 { + text-align: center; + font-weight: 700; + margin-bottom: 5px; + color: var(--green-dark); + } + + .login-box p { + text-align: center; + font-size: 13px; + color: #444; + margin-bottom: 25px; + } + + label { + font-weight: 600; + color: var(--green-dark); + font-size: 13px; + display: block; + margin-bottom: 6px; + } + + .form-control { + width: 100%; + border: 1px solid #ccc; + border-radius: 10px; + padding: 10px; + font-size: 14px; + margin-bottom: 15px; + transition: all 0.2s ease; + background: #f8f9f8; + } + + .form-control:focus { + border-color: var(--green-dark); + background: white; + outline: none; + box-shadow: 0 0 0 3px rgba(31, 61, 52, 0.1); + } + + .btn-login { + width: 100%; + background-color: var(--green-dark); + color: white; + border: none; + border-radius: 10px; + padding: 10px; + font-weight: 600; + cursor: pointer; + transition: 0.3s; + } + + .btn-login:hover { + background-color: #244f43; + } + + .register-link { + text-align: center; + margin-top: 18px; + font-size: 13px; + } + + .register-link a { + color: var(--green-dark); + font-weight: 600; + text-decoration: none; + transition: 0.2s; + } + + .register-link a:hover { + text-decoration: underline; + } + .invalid-feedback { - display: block + display: block; + font-size: 12px; + color: #d9534f; + margin-top: -8px; + margin-bottom: 10px; } @endsection @section('content') - - - - @csrf -
    - -
    - -
    -
    - -
    -
    -
    - @error('email') - - {{ $message }} - - @enderror -
    -
    - -
    - -
    -
    - -
    -
    -
    - @error('password') - - {{ $message }} - - @enderror +
    Kode Laporan{{ $laporan->id_laporan }}ID Laporan{{ $laporan->id_gaji }}
    Tanggal Cetak
    - - - - - - - - - - - - - - - @forelse ($absensis as $absensi) +
    +
    NoID AbsensiPegawai IDTanggalJam MasukJam KeluarShiftStatusAksi
    + - - - - - - - - - + + + + + + + + + - @empty - - - - @endforelse - -
    {{ $loop->iteration + ($absensis->currentPage() - 1) * $absensis->perPage() }}{{ $absensi->id_absensi }}{{ $absensi->pegawai_id }}{{ $absensi->tanggal }}{{ $absensi->jam_masuk }}{{ $absensi->jam_keluar }}{{ $absensi->shift }}{{ $absensi->status }} - Edit -
    - @csrf - @method('DELETE') - -
    -     		NOID ABSENSIPEGAWAI IDTANGGALJAM MASUKJAM KELUARSHIFTSTATUSAKSI
    Data tidak ditemukan.
    + + + @forelse ($absensis as $absensi) + @php + $tgl = \Carbon\Carbon::parse($absensi->tanggal)->format('Y-m-d'); + $jm = \Carbon\Carbon::parse($absensi->jam_masuk)->format('H:i'); + $jk = \Carbon\Carbon::parse($absensi->jam_keluar)->format('H:i'); + @endphp + + {{ $loop->iteration + ($absensis->currentPage() - 1) * $absensis->perPage() }} + {{ $absensi->id_absensi }} + {{ $absensi->pegawai_id }} + {{ $tgl }} + {{ $jm }} + {{ $jk }} + {{ $absensi->shift }} + + @if(Str::lower($absensi->status) === 'hadir') + Hadir + @else + {{ ucfirst($absensi->status) }} + @endif + + + + Ubah + +
    + @csrf @method('DELETE') + +
    + + Detail + + + + @empty + + Data tidak ditemukan. + + @endforelse + + +
    - + {{-- Pagination (Bootstrap 5) --}}
    -
    +
    Menampilkan {{ $absensis->firstItem() ?? 0 }} - {{ $absensis->lastItem() ?? 0 }} dari total {{ $absensis->total() }} data
    - - + {{ $absensis->links('pagination::bootstrap-5') }}
    @endsection diff --git a/resources/views/absensi/show.blade.php b/resources/views/absensi/show.blade.php index 01f359d4..4b4e159f 100644 --- a/resources/views/absensi/show.blade.php +++ b/resources/views/absensi/show.blade.php @@ -1,34 +1,48 @@ @extends('layouts.admin') +@section('title', 'Detail Absensi - Deeen Coffee') + +@section('css') + +@endsection + @section('content') -
    -

    Detail Absensi

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    ID{{ $absensi->id }}
    Pegawai ID{{ $absensi->pegawai_id }}
    Tanggal{{ $absensi->tanggal }}
    Jam Masuk{{ $absensi->jam_masuk }}
    Jam Keluar{{ $absensi->jam_keluar }}
    Status{{ ucfirst($absensi->status) }}
    - Kembali +
    +
    +
    +

    Detail Absensi

    +
    + + @php + $tgl = \Carbon\Carbon::parse($absensi->tanggal)->format('Y-m-d'); + $jm = \Carbon\Carbon::parse($absensi->jam_masuk)->format('H:i'); + $jk = \Carbon\Carbon::parse($absensi->jam_keluar)->format('H:i'); + @endphp + +
    ID Absensi{{ $absensi->id_absensi }}
    +
    Pegawai ID{{ $absensi->pegawai_id }}
    +
    Tanggal{{ $tgl }}
    +
    Jam Masuk{{ $jm }}
    +
    Jam Keluar{{ $jk }}
    +
    Shift{{ $absensi->shift }}
    +
    Status{{ ucfirst($absensi->status) }}
    + +
    + + Ubah + + + Kembali + +
    @endsection diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index c2e9c4d1..c1ffa92b 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -1,75 +1,155 @@ - @yield('title', config('app.name')) - - - + + - @vite(['resources/sass/app.scss', 'resources/js/app.js']) + @vite(['resources/sass/app.scss','resources/js/app.js']) @yield('css') + + + - -
    - - @include('layouts.partials.navbar') - @include('layouts.partials.sidebar') - - -
    - -
    -
    -
    -
    -

    @yield('content-header')

    -
    -
    - @yield('content-actions') -
    +
    + + @include('layouts.partials.navbar') + @include('layouts.partials.sidebar') + + +
    + +
    +
    +
    +
    +

    @yield('content-header')

    +
    +
    + @yield('content-actions')
    -
    -
    - - -
    - @include('layouts.partials.alert.success') - @include('layouts.partials.alert.error') - @yield('content') -
    -
    - - - @include('layouts.partials.footer') - - - - +
    +
    +
    + + +
    + @include('layouts.partials.alert.success') + @include('layouts.partials.alert.error') + @yield('content') +
    - - - + @include('layouts.partials.footer') - @yield('js') - @yield('model') - + +
    - \ No newline at end of file + + + +@yield('js') +@yield('model') + + diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index b4e3152a..99468d81 100644 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -1,98 +1,218 @@ -
    • - -
  • - -
    - - Products -
    -     -
    • - - -
  • - -
    - - Cart -
    -     -
    • - - -
  • - -
    - - Orders -
    -     -
    • - - -
  • - -
    - - Customers -
    -     -
    • - - -
  • - -
    - - Suppliers -
    -     -
    • - - -
  • - -
    - - Settings -
    -     -
    • -
  • From 4ea77a368f348f970b79100ddfec8e4139e262c7 Mon Sep 17 00:00:00 2001 From: Felix2254 <231712254@students.uajy.ac.id> Date: Tue, 11 Nov 2025 11:53:10 +0700 Subject: [PATCH 16/24] error message login --- app/Http/Controllers/Auth/LoginController.php | 47 +++++-- resources/views/auth/login.blade.php | 130 +++++++----------- 2 files changed, 89 insertions(+), 88 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 68c1a71e..116bbd89 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -4,6 +4,8 @@ use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class LoginController extends Controller { @@ -12,23 +14,22 @@ class LoginController extends Controller | Login Controller |-------------------------------------------------------------------------- | - | This controller handles authenticating users for the application and - | redirecting them to your home screen. The controller uses a trait - | to conveniently provide its functionality to your applications. + | Controller ini menangani proses autentikasi pengguna dan mengarahkan + | mereka ke halaman admin setelah berhasil login. | */ use AuthenticatesUsers; /** - * Where to redirect users after login. + * Ke mana pengguna diarahkan setelah login. * * @var string */ protected $redirectTo = '/admin'; /** - * Create a new controller instance. + * Membuat instance controller baru. * * @return void */ @@ -39,8 +40,9 @@ public function __construct() } /** - * Show the application's login form. - * Use the custom Blade view: resources/views/auth/login.blade.php + * Menampilkan form login kustom. + * + * @return \Illuminate\View\View */ public function showLoginForm() { @@ -48,7 +50,36 @@ public function showLoginForm() } /** - * Get the post-login redirect path. + * Menangani proses login. + * Jika gagal, kirim pesan error kustom ke halaman login. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse + */ + public function login(Request $request) + { + // Validasi sederhana (jangan ubah logika utamanya) + $request->validate([ + 'email' => 'required|string', + 'password' => 'required|string', + ]); + + $credentials = $request->only('email', 'password'); + + // Coba login + if (Auth::attempt($credentials, $request->filled('remember'))) { + $request->session()->regenerate(); + return redirect()->intended($this->redirectPath()); + } + + // Jika gagal, kembalikan ke login dengan error seperti di desain + return back() + ->withInput($request->only('email')) + ->with('error', 'Username & Password are incorrect'); + } + + /** + * Mengembalikan path redirect setelah login berhasil. * * @return string */ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 9cdd52a4..2fc82793 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -21,11 +21,9 @@ font-family: "Poppins", sans-serif; } - .login-container { - text-align: center; - } + .login-container { text-align: center; } - /* Logo Pill */ + /* Logo */ .logo-box { background-color: var(--green-dark); color: white; @@ -35,22 +33,10 @@ margin: 0 auto 30px auto; box-shadow: var(--shadow); } + .logo-box h1 { font-size: 42px; font-weight: 700; margin: 0; letter-spacing: 1px; } + .logo-box span { display: block; font-size: 13px; letter-spacing: 3px; margin-top: 5px; } - .logo-box h1 { - font-size: 42px; - font-weight: 700; - margin: 0; - letter-spacing: 1px; - } - - .logo-box span { - display: block; - font-size: 13px; - letter-spacing: 3px; - margin-top: 5px; - } - - /* Login Card */ + /* Box */ .login-box { background: rgba(255, 255, 255, 0.85); border: 1px solid #dfe6e2; @@ -61,28 +47,10 @@ text-align: left; backdrop-filter: blur(6px); } + .login-box h2 { text-align: center; font-weight: 700; margin-bottom: 5px; color: var(--green-dark); } + .login-box p { text-align: center; font-size: 13px; color: #444; margin-bottom: 25px; } - .login-box h2 { - text-align: center; - font-weight: 700; - margin-bottom: 5px; - color: var(--green-dark); - } - - .login-box p { - text-align: center; - font-size: 13px; - color: #444; - margin-bottom: 25px; - } - - label { - font-weight: 600; - color: var(--green-dark); - font-size: 13px; - display: block; - margin-bottom: 6px; - } + label { font-weight: 600; color: var(--green-dark); font-size: 13px; display: block; margin-bottom: 6px; } .form-control { width: 100%; @@ -94,7 +62,6 @@ transition: all 0.2s ease; background: #f8f9f8; } - .form-control:focus { border-color: var(--green-dark); background: white; @@ -102,6 +69,22 @@ box-shadow: 0 0 0 3px rgba(31, 61, 52, 0.1); } + /* Error state */ + .form-control.is-error{ + border: 2px solid #e74c3c !important; + background: #fff7f7 !important; + } + + /* Inline message */ + .error-inline{ + margin-top: 2px; + margin-bottom: 12px; + text-align: center; + font-size: 13px; + font-weight: 600; + color: #e74c3c; + } + .btn-login { width: 100%; background-color: var(--green-dark); @@ -113,39 +96,24 @@ cursor: pointer; transition: 0.3s; } + .btn-login:hover { background-color: #244f43; } - .btn-login:hover { - background-color: #244f43; - } - - .register-link { - text-align: center; - margin-top: 18px; - font-size: 13px; - } - - .register-link a { - color: var(--green-dark); - font-weight: 600; - text-decoration: none; - transition: 0.2s; - } - - .register-link a:hover { - text-decoration: underline; - } - - .invalid-feedback { - display: block; - font-size: 12px; - color: #d9534f; - margin-top: -8px; - margin-bottom: 10px; - } + .register-link { text-align: center; margin-top: 18px; font-size: 13px; } + .register-link a { color: var(--green-dark); font-weight: 600; text-decoration: none; transition: 0.2s; } + .register-link a:hover { text-decoration: underline; } @endsection @section('content') +@php + // Pesan error jika username/password salah + $loginError = session('error') ?? ( + ($errors->has('email') || $errors->has('password')) + ? 'Username & Password are required' + : null + ); +@endphp +