diff --git a/node_modules/.bin/clean-orphaned-assets b/node_modules/.bin/clean-orphaned-assets index 22d08a2..41eef6c 100644 --- a/node_modules/.bin/clean-orphaned-assets +++ b/node_modules/.bin/clean-orphaned-assets @@ -1 +1,16 @@ -../laravel-vite-plugin/bin/clean.js \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../laravel-vite-plugin/bin/clean.js" "$@" +else + exec node "$basedir/../laravel-vite-plugin/bin/clean.js" "$@" +fi diff --git a/node_modules/.bin/conc b/node_modules/.bin/conc index e9da687..1333ac0 100644 --- a/node_modules/.bin/conc +++ b/node_modules/.bin/conc @@ -1 +1,16 @@ -../concurrently/dist/bin/concurrently.js \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../concurrently/dist/bin/concurrently.js" "$@" +else + exec node "$basedir/../concurrently/dist/bin/concurrently.js" "$@" +fi diff --git a/node_modules/.bin/concurrently b/node_modules/.bin/concurrently index e9da687..1333ac0 100644 --- a/node_modules/.bin/concurrently +++ b/node_modules/.bin/concurrently @@ -1 +1,16 @@ -../concurrently/dist/bin/concurrently.js \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../concurrently/dist/bin/concurrently.js" "$@" +else + exec node "$basedir/../concurrently/dist/bin/concurrently.js" "$@" +fi diff --git a/node_modules/.bin/esbuild b/node_modules/.bin/esbuild index c83ac07..63bb6d4 100644 --- a/node_modules/.bin/esbuild +++ b/node_modules/.bin/esbuild @@ -1 +1,16 @@ -../esbuild/bin/esbuild \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../esbuild/bin/esbuild" "$@" +else + exec node "$basedir/../esbuild/bin/esbuild" "$@" +fi diff --git a/node_modules/.bin/jiti b/node_modules/.bin/jiti index 18f28cf..f4ef06f 100644 --- a/node_modules/.bin/jiti +++ b/node_modules/.bin/jiti @@ -1 +1,16 @@ -../jiti/lib/jiti-cli.mjs \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../jiti/lib/jiti-cli.mjs" "$@" +else + exec node "$basedir/../jiti/lib/jiti-cli.mjs" "$@" +fi diff --git a/node_modules/.bin/nanoid b/node_modules/.bin/nanoid index e2be547..46220bd 100644 --- a/node_modules/.bin/nanoid +++ b/node_modules/.bin/nanoid @@ -1 +1,16 @@ -../nanoid/bin/nanoid.cjs \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../nanoid/bin/nanoid.cjs" "$@" +else + exec node "$basedir/../nanoid/bin/nanoid.cjs" "$@" +fi diff --git a/node_modules/.bin/rollup b/node_modules/.bin/rollup index 5939621..998fc16 100644 --- a/node_modules/.bin/rollup +++ b/node_modules/.bin/rollup @@ -1 +1,16 @@ -../rollup/dist/bin/rollup \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../rollup/dist/bin/rollup" "$@" +else + exec node "$basedir/../rollup/dist/bin/rollup" "$@" +fi diff --git a/node_modules/.bin/tree-kill b/node_modules/.bin/tree-kill index 26dcd2c..6bcf984 100644 --- a/node_modules/.bin/tree-kill +++ b/node_modules/.bin/tree-kill @@ -1 +1,16 @@ -../tree-kill/cli.js \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../tree-kill/cli.js" "$@" +else + exec node "$basedir/../tree-kill/cli.js" "$@" +fi diff --git a/node_modules/.bin/vite b/node_modules/.bin/vite index 6d1e3be..014463f 100644 --- a/node_modules/.bin/vite +++ b/node_modules/.bin/vite @@ -1 +1,16 @@ -../vite/bin/vite.js \ No newline at end of file +#!/bin/sh +basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')") + +case `uname` in + *CYGWIN*|*MINGW*|*MSYS*) + if command -v cygpath > /dev/null 2>&1; then + basedir=`cygpath -w "$basedir"` + fi + ;; +esac + +if [ -x "$basedir/node" ]; then + exec "$basedir/node" "$basedir/../vite/bin/vite.js" "$@" +else + exec node "$basedir/../vite/bin/vite.js" "$@" +fi diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 918cab4..6423ae1 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,20 +1,20 @@ { - "name": "takeone", + "name": "takeone-Theme-updated", "lockfileVersion": 3, "requires": true, "packages": { - "node_modules/@esbuild/darwin-arm64": { + "node_modules/@esbuild/win32-x64": { "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", + "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">=18" @@ -76,18 +76,32 @@ "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==", "license": "MIT" }, - "node_modules/@rollup/rollup-darwin-arm64": { + "node_modules/@rollup/rollup-win32-x64-gnu": { "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.56.0.tgz", - "integrity": "sha512-EgxD1ocWfhoD6xSOeEEwyE7tDvwTgZc8Bss7wCWe+uc7wO8G34HHCUH+Q6cHqJubxIAnQzAsyUsClt0yFLu06w==", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.56.0.tgz", + "integrity": "sha512-FeCnkPCTHQJFbiGG49KjV5YGW/8b9rrXAM2Mz2kiIoktq2qsJxRD5giEMEOD2lPdgs72upzefaUvS+nc8E3UzQ==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.56.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz", + "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" ] }, "node_modules/@tailwindcss/node": { @@ -130,18 +144,18 @@ "@tailwindcss/oxide-win32-x64-msvc": "4.1.18" } }, - "node_modules/@tailwindcss/oxide-darwin-arm64": { + "node_modules/@tailwindcss/oxide-win32-x64-msvc": { "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.18.tgz", - "integrity": "sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.18.tgz", + "integrity": "sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 10" @@ -778,18 +792,18 @@ "lightningcss-win32-x64-msvc": "1.30.2" } }, - "node_modules/lightningcss-darwin-arm64": { + "node_modules/lightningcss-win32-x64-msvc": { "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz", - "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz", + "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==", "cpu": [ - "arm64" + "x64" ], "dev": true, "license": "MPL-2.0", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 12.0.0" @@ -874,6 +888,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -1117,6 +1132,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", diff --git a/node_modules/esbuild/bin/esbuild b/node_modules/esbuild/bin/esbuild index 8935f40..b705398 100644 Binary files a/node_modules/esbuild/bin/esbuild and b/node_modules/esbuild/bin/esbuild differ diff --git a/package-lock.json b/package-lock.json index 9a484fd..cc065d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "takeone", + "name": "takeone-Theme-updated", "lockfileVersion": 3, "requires": true, "packages": { @@ -2076,6 +2076,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -2319,6 +2320,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", diff --git a/resources/views/components/country-code-dropdown.blade.php b/resources/views/components/country-code-dropdown.blade.php index ba166c8..1da8975 100644 --- a/resources/views/components/country-code-dropdown.blade.php +++ b/resources/views/components/country-code-dropdown.blade.php @@ -211,17 +211,26 @@ }); } - // Detect user's country and set as default - detectUserCountry(function(defaultCode) { - const hiddenInput = document.getElementById(componentId); - if (hiddenInput) { - hiddenInput.value = defaultCode; - } - const initialCountry = countries.find(c => c.code === defaultCode); + // Set initial value from database or detect user's country as fallback + const hiddenInput = document.getElementById(componentId); + if (hiddenInput && hiddenInput.value) { + // Value already set from database, find and display the corresponding country + const initialCountry = countries.find(c => c.code === hiddenInput.value); if (initialCountry) { selectCountry(componentId, initialCountry.code, initialCountry.name, initialCountry.flag); } - }); + } else { + // No database value, detect user's country as default + detectUserCountry(function(defaultCode) { + if (hiddenInput) { + hiddenInput.value = defaultCode; + } + const initialCountry = countries.find(c => c.code === defaultCode); + if (initialCountry) { + selectCountry(componentId, initialCountry.code, initialCountry.name, initialCountry.flag); + } + }); + } } function selectCountry(componentId, code, name, flag) { diff --git a/resources/views/member/show.blade.php b/resources/views/member/show.blade.php index f73bc21..94b45d9 100644 --- a/resources/views/member/show.blade.php +++ b/resources/views/member/show.blade.php @@ -96,9 +96,15 @@ {{ $relationship->dependent->nationality }} - + {{ $relationship->dependent->gender == 'm' ? 'Male' : 'Female' }} + @if($relationship->dependent->marital_status) + + + {{ ucfirst($relationship->dependent->marital_status) }} + + @endif Age {{ $relationship->dependent->age }}