diff --git a/components.json b/components.json index 1496bca6..88dfd1d1 100644 --- a/components.json +++ b/components.json @@ -1,6 +1,6 @@ { "$schema": "https://shadcn-vue.com/schema.json", - "style": "default", + "style": "new-york-v4", "tailwind": { "config": "tailwind.config.js", "css": "resources/css/app.css", diff --git a/package-lock.json b/package-lock.json index e2246817..a8cba14e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,12 @@ "clsx": "^2.1.1", "laravel-vite-plugin": "^2.0.0", "lucide-vue-next": "^0.468.0", - "reka-ui": "^2.4.1", + "reka-ui": "^2.6.1", "tailwind-merge": "^3.2.0", "tailwindcss": "^4.1.1", "tw-animate-css": "^1.2.5", - "vue": "^3.5.13" + "vue": "^3.5.13", + "vue-input-otp": "^0.3.2" }, "devDependencies": { "@eslint/js": "^9.19.0", @@ -4320,9 +4321,9 @@ "license": "MIT" }, "node_modules/reka-ui": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.5.1.tgz", - "integrity": "sha512-QJGB3q21wQ1Kw28HhhNDpjfFe8qpePX1gK4FTBRd68XTh9aEnhR5bTJnlV0jxi8FBPh0xivZBeNFUc3jiGx7mQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/reka-ui/-/reka-ui-2.6.1.tgz", + "integrity": "sha512-XK7cJDQoNuGXfCNzBBo/81Yg/OgjPwvbabnlzXG2VsdSgNsT6iIkuPBPr+C0Shs+3bb0x0lbPvgQAhMSCKm5Ww==", "license": "MIT", "dependencies": { "@floating-ui/dom": "^1.6.13", @@ -5068,6 +5069,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/vue-input-otp": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/vue-input-otp/-/vue-input-otp-0.3.2.tgz", + "integrity": "sha512-QMl1842WB6uNAsK4+mZXIskb00TOfahH3AQt8rpRecbtQnOp+oHSUbL/Z3wekfy6pAl+hyN3e1rCUSkCMzbDLQ==", + "license": "MIT", + "dependencies": { + "@vueuse/core": "^12.8.2", + "reka-ui": "^2.6.1" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, "node_modules/vue-tsc": { "version": "2.2.12", "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.2.12.tgz", diff --git a/package.json b/package.json index d81648fd..396e5e16 100644 --- a/package.json +++ b/package.json @@ -36,11 +36,12 @@ "clsx": "^2.1.1", "laravel-vite-plugin": "^2.0.0", "lucide-vue-next": "^0.468.0", - "reka-ui": "^2.4.1", + "reka-ui": "^2.6.1", "tailwind-merge": "^3.2.0", "tailwindcss": "^4.1.1", "tw-animate-css": "^1.2.5", - "vue": "^3.5.13" + "vue": "^3.5.13", + "vue-input-otp": "^0.3.2" }, "optionalDependencies": { "@rollup/rollup-linux-x64-gnu": "4.9.5", diff --git a/resources/js/components/TwoFactorSetupModal.vue b/resources/js/components/TwoFactorSetupModal.vue index badf7123..3480a585 100644 --- a/resources/js/components/TwoFactorSetupModal.vue +++ b/resources/js/components/TwoFactorSetupModal.vue @@ -2,7 +2,6 @@ import AlertError from '@/components/AlertError.vue'; import InputError from '@/components/InputError.vue'; import { Button } from '@/components/ui/button'; -import { Spinner } from '@/components/ui/spinner'; import { Dialog, DialogContent, @@ -11,10 +10,11 @@ import { DialogTitle, } from '@/components/ui/dialog'; import { - PinInput, - PinInputGroup, - PinInputSlot, -} from '@/components/ui/pin-input'; + InputOTP, + InputOTPGroup, + InputOTPSlot, +} from '@/components/ui/input-otp'; +import { Spinner } from '@/components/ui/spinner'; import { useTwoFactorAuth } from '@/composables/useTwoFactorAuth'; import { confirm } from '@/routes/two-factor'; import { Form } from '@inertiajs/vue3'; @@ -35,8 +35,7 @@ const { qrCodeSvg, manualSetupKey, clearSetupData, fetchSetupData, errors } = useTwoFactorAuth(); const showVerificationStep = ref(false); -const code = ref([]); -const codeValue = computed(() => code.value.join('')); +const code = ref(''); const pinInputContainerRef = useTemplateRef('pinInputContainerRef'); @@ -91,7 +90,7 @@ const resetModalState = () => { } showVerificationStep.value = false; - code.value = []; + code.value = ''; }; watch( @@ -234,11 +233,11 @@ watch(
- +
- - - + - - + + Confirm diff --git a/resources/js/components/ui/avatar/Avatar.vue b/resources/js/components/ui/avatar/Avatar.vue index 1aa6462f..bb7e669f 100644 --- a/resources/js/components/ui/avatar/Avatar.vue +++ b/resources/js/components/ui/avatar/Avatar.vue @@ -1,10 +1,10 @@ diff --git a/resources/js/components/ui/avatar/AvatarFallback.vue b/resources/js/components/ui/avatar/AvatarFallback.vue index b0f33982..16b588ae 100644 --- a/resources/js/components/ui/avatar/AvatarFallback.vue +++ b/resources/js/components/ui/avatar/AvatarFallback.vue @@ -1,15 +1,13 @@