Skip to content

Commit 6cad49e

Browse files
committed
chore: replacing open modal calls with new functions
1 parent fde38d0 commit 6cad49e

4 files changed

Lines changed: 22 additions & 21 deletions

File tree

app/components/ClaimPackageModal.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ async function checkAvailability() {
3838
}
3939
}
4040
41+
function openConnectorModal() {
42+
const connectorModal = document.querySelector<HTMLDialogElement>('#connector-modal')
43+
if (connectorModal) {
44+
connectorModal.showModal()
45+
}
46+
}
47+
4148
async function handleClaim() {
4249
if (!checkResult.value?.available || !isConnected.value) return
4350
@@ -72,14 +79,14 @@ async function handleClaim() {
7279
if (completedOp.result?.requiresOtp) {
7380
// OTP is needed - open connector panel to handle it
7481
open.value = false
75-
connectorModalOpen.value = true
82+
openConnectorModal()
7683
} else {
7784
publishError.value = completedOp.result?.stderr || 'Failed to publish package'
7885
}
7986
} else {
8087
// Still pending/approved/running - open connector panel to show progress
8188
open.value = false
82-
connectorModalOpen.value = true
89+
openConnectorModal()
8390
}
8491
} catch (err) {
8592
publishError.value = err instanceof Error ? err.message : $t('claim.modal.failed_to_claim')
@@ -124,8 +131,6 @@ const previewPackageJson = computed(() => {
124131
...(access && { publishConfig: { access } }),
125132
}
126133
})
127-
128-
const connectorModalOpen = shallowRef(false)
129134
</script>
130135

131136
<template>
@@ -351,7 +356,7 @@ const connectorModalOpen = shallowRef(false)
351356
<button
352357
type="button"
353358
class="w-full px-4 py-2 font-mono text-sm text-bg bg-fg rounded-md transition-colors duration-200 hover:bg-fg/90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-fg/50"
354-
@click="connectorModalOpen = true"
359+
@click="openConnectorModal"
355360
>
356361
{{ $t('claim.modal.connect_button') }}
357362
</button>
@@ -420,7 +425,4 @@ const connectorModalOpen = shallowRef(false)
420425
</div>
421426
</Transition>
422427
</Teleport>
423-
424-
<!-- Connector modal -->
425-
<ConnectorModal v-model:open="connectorModalOpen" />
426428
</template>

app/components/MobileMenu.vue

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@ const isOpen = defineModel<boolean>('open', { default: false })
44
const { isConnected, npmUser, avatar: npmAvatar } = useConnector()
55
const { user: atprotoUser } = useAtproto()
66
7-
const showConnectorModal = shallowRef(false)
8-
const showAuthModal = shallowRef(false)
9-
107
function closeMenu() {
118
isOpen.value = false
129
}
1310
1411
function handleShowConnector() {
15-
showConnectorModal.value = true
16-
closeMenu()
12+
const connectorModal = document.querySelector<HTMLDialogElement>('#connector-modal')
13+
if (connectorModal) {
14+
closeMenu()
15+
connectorModal.showModal()
16+
}
1717
}
1818
1919
function handleShowAuth() {
20-
showAuthModal.value = true
21-
closeMenu()
20+
const authModal = document.querySelector<HTMLDialogElement>('#auth-modal')
21+
if (authModal) {
22+
closeMenu()
23+
authModal.showModal()
24+
}
2225
}
2326
2427
// Close menu on route change
@@ -270,9 +273,5 @@ watch(isOpen, open => (isLocked.value = open))
270273
</Transition>
271274
</div>
272275
</Transition>
273-
274-
<!-- Modals -->
275-
<ConnectorModal v-model:open="showConnectorModal" />
276-
<AuthModal v-model:open="showAuthModal" />
277276
</Teleport>
278277
</template>

app/components/Modal.client.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defineProps<{
44
}>()
55
66
function handleModalClose() {
7-
const modal = document.querySelector<HTMLDialogElement>('#modal')
7+
const modal = document.querySelector<HTMLDialogElement>('dialog[open]')
88
if (modal) {
99
modal.close()
1010
}

test/nuxt/components.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import CodeViewer from '~/components/CodeViewer.vue'
7474
import CodeDirectoryListing from '~/components/CodeDirectoryListing.vue'
7575
import CodeFileTree from '~/components/CodeFileTree.vue'
7676
import UserCombobox from '~/components/UserCombobox.vue'
77-
import ConnectorModal from '~/components/ConnectorModal.vue'
77+
import ConnectorModal from '~/components/ConnectorModal.client.vue'
7878
import HeaderAccountMenuServer from '~/components/HeaderAccountMenu.server.vue'
7979
import HeaderAccountMenuClient from '~/components/HeaderAccountMenu.client.vue'
8080
import ClaimPackageModal from '~/components/ClaimPackageModal.vue'

0 commit comments

Comments
 (0)